diff --git a/src/components/Table.vue b/src/components/Table.vue
index b81e171..4c9fa59 100644
--- a/src/components/Table.vue
+++ b/src/components/Table.vue
@@ -13,7 +13,7 @@
       :editData="editData"
     />
     <q-space />
-    <div class="items-center q-col-gutter-x-sm" style="display: flex">
+    <div class="items-center q-col-gutter-x-sm" style="display: flex" v-if="isShowfilter">
       <!-- ค้นหาข้อความใน table -->
       <q-input
         standout
@@ -118,8 +118,12 @@ const props = defineProps({
   },
   editData: {
     type: Boolean,
-    defualt: true,
+    default: true,
     required: true
+  },
+  isShowfilter: {
+    type: Boolean,
+    default: true
   }
 })
 
diff --git a/src/modules/01_exam/components/ExamCard.vue b/src/modules/01_exam/components/ExamCard.vue
index 80309ae..c26bcfe 100644
--- a/src/modules/01_exam/components/ExamCard.vue
+++ b/src/modules/01_exam/components/ExamCard.vue
@@ -217,7 +217,7 @@ const fetchStatus = async () => {
     .get(config.API.candidateCard(examId.value, positionId.value))
     .then((res) => {
       const data = res.data.result
-      fullName.value = data.prefix + data.firstName + ' ' + data.lastName
+      fullName.value = data.prefix ? data.prefix : '' + data.firstName + ' ' + data.lastName
       examNumber.value = data.examIdenNumber
       citizenId.value = data.citizenId
       examSeat.value = data.seatNumber
diff --git a/src/modules/01_exam/components/ExamFinished.vue b/src/modules/01_exam/components/ExamFinished.vue
index 45135de..9094828 100644
--- a/src/modules/01_exam/components/ExamFinished.vue
+++ b/src/modules/01_exam/components/ExamFinished.vue
@@ -38,7 +38,7 @@
       <ExamCard :isSubmit="isSubmit" @updateIsSubmit="updateIsSubmit" />
     </div>
   </div>
-  <q-dialog v-model="dialog" persistent>
+  <!-- <q-dialog v-model="dialog" persistent>
     <q-card>
       <q-card-section class="row items-center q-pa-sm">
         <div class="text-bold">แบบสอบถามความพึงพอใจ</div>
@@ -80,7 +80,7 @@
         <q-btn label="ส่งแบบสอบถาม" class="full-width" color="blue-5" @click="sendRating" />
       </q-card-actions>
     </q-card>
-  </q-dialog>
+  </q-dialog> -->
 </template>
 
 <script setup lang="ts">
@@ -124,7 +124,7 @@ const scoreSumFull = ref<number | null>(null)
 const scoreSum = ref<number | null>(null)
 const examResultinscore = ref<string>('')
 const avatar = ref<string>('')
-const dialog = ref<boolean>(false)
+// const dialog = ref<boolean>(false)
 const rating = ref<number>(5)
 const text = ref<string>('')
 const isSubmit = ref<boolean>(false)
@@ -158,7 +158,7 @@ const fetchStatus = async () => {
       scoreC.value = data.pointC
       examResultinscore.value = data.pass
       avatar.value = data.avatar
-      if (data.reviewPoint == null) dialog.value = true
+      // if (data.reviewPoint == null) dialog.value = true
     })
     .catch((e) => {
       messageError($q, e)
@@ -183,7 +183,7 @@ const sendRating = async () => {
     })
     .finally(() => {
       loaderPage(false)
-      dialog.value = false
+      // dialog.value = false
     })
 }
 
diff --git a/src/modules/01_exam/components/ExamForm.vue b/src/modules/01_exam/components/ExamForm.vue
index c8cfc78..f0414d5 100644
--- a/src/modules/01_exam/components/ExamForm.vue
+++ b/src/modules/01_exam/components/ExamForm.vue
@@ -186,6 +186,8 @@ const dialogClose = () => {
 }
 
 const dialogOpen = () => {
+  console.log(defaultInformation.value)
+
   dialog.value = true
 }
 
@@ -257,8 +259,8 @@ const saveData = async () => {
                           loaderPage(true)
                           await http
                             .post(config.API.candidateId(examId.value, positionId.value), {
-                              prefixId: defaultInformation.value.prefixId,
-                              prefixName: defaultInformation.value.prefixId,
+                              // prefixId: defaultInformation.value.prefixId,
+                              prefixName: defaultInformation.value.prefix,
                               lastName: defaultInformation.value.lastname,
                               dateOfBirth:
                                 defaultInformation.value.birthDate == null
@@ -266,7 +268,8 @@ const saveData = async () => {
                                   : dateToISO(defaultInformation.value.birthDate),
                               citizenId: defaultInformation.value.cardid,
                               firstName: defaultInformation.value.firstname,
-                              religionId: defaultInformation.value.religionId,
+                              // religionId: defaultInformation.value.religionId,
+                              religionName: defaultInformation.value.religionName,
                               nationality: defaultInformation.value.nationality,
                               email: defaultInformation.value.email,
                               mobilePhone: defaultInformation.value.phone,
@@ -307,7 +310,8 @@ const saveData = async () => {
                               educationScores: defaultEducation.value.educationScores,
                               educationLevelHighId: defaultEducation.value.educationLevelHighId,
 
-                              contactprefixId: defaultContact.value.contactprefixId,
+                              // contactprefixId: defaultContact.value.contactprefixId,
+                              contactprefixName: defaultContact.value.contactprefixName,
                               contactfirstname: defaultContact.value.contactfirstname,
                               contactlastname: defaultContact.value.contactlastname,
                               contactrelations: defaultContact.value.contactrelations,
diff --git a/src/modules/01_exam/components/Form/Address.vue b/src/modules/01_exam/components/Form/Address.vue
index 3a626c1..6d59cf1 100644
--- a/src/modules/01_exam/components/Form/Address.vue
+++ b/src/modules/01_exam/components/Form/Address.vue
@@ -68,7 +68,7 @@
           :class="getClass(status == 'register' || status == 'rejectRegister')"
           :readonly="!(status == 'register' || status == 'rejectRegister')"
           :borderless="!(status == 'register' || status == 'rejectRegister')"
-          :rules="[(val) => !!val || `${'กรุณาเลือก ตำบล / แขวง'}`]"
+          :rules="[(val) => !!val || `${'กรุณาเลือก แขวง / ตำบล'}`]"
           :outlined="status == 'register' || status == 'rejectRegister'"
           dense
           lazy-rules
@@ -78,7 +78,7 @@
           option-label="name"
           :options="subdistrictOptions"
           option-value="id"
-          :label="`${'ตำบล / แขวง'}`"
+          :label="`${'แขวง / ตำบล'}`"
           @update:model-value="(value) => selectSubDistrict(value, '1')"
         />
       </div>
@@ -180,7 +180,7 @@
           :class="getClass(status == 'register' || status == 'rejectRegister')"
           :readonly="!(status == 'register' || status == 'rejectRegister')"
           :borderless="!(status == 'register' || status == 'rejectRegister')"
-          :rules="[(val) => !!val || `${'กรุณาเลือก ตำบล / แขวง'}`]"
+          :rules="[(val) => !!val || `${'กรุณาเลือก แขวง / ตำบล'}`]"
           :outlined="status == 'register' || status == 'rejectRegister'"
           dense
           lazy-rules
@@ -190,7 +190,7 @@
           option-label="name"
           :options="subdistrictCOptions"
           option-value="id"
-          :label="`${'ตำบล / แขวง'}`"
+          :label="`${'แขวง / ตำบล'}`"
           @update:model-value="(value) => selectSubDistrict(value, '2')"
         />
       </div>
diff --git a/src/modules/01_exam/components/Form/Career.vue b/src/modules/01_exam/components/Form/Career.vue
index 223f684..8fe8913 100644
--- a/src/modules/01_exam/components/Form/Career.vue
+++ b/src/modules/01_exam/components/Form/Career.vue
@@ -18,6 +18,7 @@
       :editData="status == 'register' || status == 'rejectRegister'"
       name="ประวัติการทำงาน (ตั้งแต่เริ่มปฏิบัติงานกับกรุงเทพมหานคร - ปัจจุบัน)"
       icon="mdi-briefcase"
+      :is-showfilter="false"
     >
       <template #columns="props">
         <q-tr :props="props">
@@ -80,8 +81,8 @@
                 :readonly="!edit"
                 :borderless="!edit"
                 v-model="position"
-                :rules="[(val) => !!val || `${'กรุณากรอกตำแหน่ง/ลักษณะงาน'}`]"
-                :label="`${'ตำแหน่ง/ลักษณะงาน'}`"
+                :rules="[(val) => !!val || `${'กรุณากรอกตำแหน่ง'}`]"
+                :label="`${'ตำแหน่ง'}`"
                 @update:modelValue="clickEditRowPosition"
                 hide-bottom-space
               />
diff --git a/src/modules/01_exam/components/Form/Contact.vue b/src/modules/01_exam/components/Form/Contact.vue
index a8e8cfc..15a9365 100644
--- a/src/modules/01_exam/components/Form/Contact.vue
+++ b/src/modules/01_exam/components/Form/Contact.vue
@@ -1,17 +1,17 @@
 <!-- card บุคคลที่สามารถติดต่อได้ -->
 <template>
-	<HeaderTop
-		v-model:edit="edit"
-		header="บุคคลที่สามารถติดต่อได้"
-		icon="mdi-account-circle"
-		:addData="true"
-		:editOnly="false"
-		:editData="false"
-	/>
-	<q-form ref="myform">
-		<div class="row col-12 items-center q-col-gutter-x-sm q-col-gutter-y-xs">
-			<div class="col-xs-12 col-sm-3 col-md-2">
-				<q-select
+  <HeaderTop
+    v-model:edit="edit"
+    header="บุคคลที่สามารถติดต่อได้"
+    icon="mdi-account-circle"
+    :addData="true"
+    :editOnly="false"
+    :editData="false"
+  />
+  <q-form ref="myform">
+    <div class="row col-12 items-center q-col-gutter-x-sm q-col-gutter-y-xs">
+      <div class="col-xs-12 col-sm-3 col-md-2">
+        <!-- <q-select
 					:class="getClass(status == 'register' || status == 'rejectRegister')"
 					:readonly="!(status == 'register' || status == 'rejectRegister')"
 					:borderless="!(status == 'register' || status == 'rejectRegister')"
@@ -26,71 +26,88 @@
 					:options="prefixOptions"
 					option-value="id"
 					:label="`${'คำนำหน้า'}`"
-				/>
-			</div>
-			<div class="col-xs-12 col-sm-3 col-md-3">
-				<q-input
-					:class="getClass(status == 'register' || status == 'rejectRegister')"
-					:outlined="status == 'register' || status == 'rejectRegister'"
-					dense
-					lazy-rules
-					:readonly="!(status == 'register' || status == 'rejectRegister')"
-					:borderless="!(status == 'register' || status == 'rejectRegister')"
-					v-model="defaultContact.contactfirstname"
-					:rules="[(val) => !!val || `${'กรุณากรอก ชื่อ'}`]"
-					:label="`${'ชื่อ'}`"
-				/>
-			</div>
-			<div class="col-xs-12 col-sm-3 col-md-3">
-				<q-input
-					:class="getClass(status == 'register' || status == 'rejectRegister')"
-					:outlined="status == 'register' || status == 'rejectRegister'"
-					dense
-					lazy-rules
-					:readonly="!(status == 'register' || status == 'rejectRegister')"
-					:borderless="!(status == 'register' || status == 'rejectRegister')"
-					v-model="defaultContact.contactlastname"
-					:rules="[(val) => !!val || `${'กรุณากรอก นามสกุล'}`]"
-					:label="`${'นามสกุล'}`"
-				/>
-			</div>
-			<div class="col-xs-12 col-sm-3 col-md-4">
-				<q-input
-					:class="getClass(status == 'register' || status == 'rejectRegister')"
-					:outlined="status == 'register' || status == 'rejectRegister'"
-					dense
-					lazy-rules
-					:readonly="!(status == 'register' || status == 'rejectRegister')"
-					:borderless="!(status == 'register' || status == 'rejectRegister')"
-					v-model="defaultContact.contactrelations"
-					:rules="[(val) => !!val || `${'กรุณากรอกความสัมพันธ์'}`]"
-					:label="`${'เกี่ยวข้องเป็น'}`"
-				/>
-			</div>
-			<div class="col-xs-12 col-sm-3 col-md-4">
-				<q-input
-					:outlined="status == 'register' || status == 'rejectRegister'"
-					dense
-					:counter="status == 'register' || status == 'rejectRegister' ? true : false"
-					lazy-rules
-					type="tel"
-					mask="##########"
-					maxlength="10"
-					:class="getClass(status == 'register' || status == 'rejectRegister')"
-					:readonly="!(status == 'register' || status == 'rejectRegister')"
-					:borderless="!(status == 'register' || status == 'rejectRegister')"
-					v-model="defaultContact.contacttel"
-					:label="`${'โทรศัพท์'}`"
-					:rules="[
-						(val) => !!val || '* กรุณากรอกข้อมูลหมายเลขโทรศัพท์',
-						(val) =>
-							(val.length >= 9 && val.length <= 10 && val.startsWith('0')) ||
-							'กรุณากรอกข้อมูลหมายเลขโทรศัพท์ให้ถูกต้อง'
-					]"
-				/>
-			</div>
-		</div>
-	</q-form>
+				/> -->
+        <q-select
+          :class="getClass(status == 'register' || status == 'rejectRegister')"
+          :readonly="!(status == 'register' || status == 'rejectRegister')"
+          :borderless="!(status == 'register' || status == 'rejectRegister')"
+          :rules="[(val) => !!val || `${'กรุณาเลือก คำนำหน้า'}`]"
+          :outlined="status == 'register' || status == 'rejectRegister'"
+          dense
+          lazy-rules
+          v-model="defaultContact.contactprefixName"
+          :label="`${'คำนำหน้า'}`"
+          :options="filteredPrefixOptions"
+          use-input
+          fill-input
+          input-debounce="0"
+          @filter="filterPrefix"
+          @input-value="setModel"
+          hide-selected
+          hide-dropdown-icon
+        />
+      </div>
+      <div class="col-xs-12 col-sm-3 col-md-3">
+        <q-input
+          :class="getClass(status == 'register' || status == 'rejectRegister')"
+          :outlined="status == 'register' || status == 'rejectRegister'"
+          dense
+          lazy-rules
+          :readonly="!(status == 'register' || status == 'rejectRegister')"
+          :borderless="!(status == 'register' || status == 'rejectRegister')"
+          v-model="defaultContact.contactfirstname"
+          :rules="[(val) => !!val || `${'กรุณากรอก ชื่อ'}`]"
+          :label="`${'ชื่อ'}`"
+        />
+      </div>
+      <div class="col-xs-12 col-sm-3 col-md-3">
+        <q-input
+          :class="getClass(status == 'register' || status == 'rejectRegister')"
+          :outlined="status == 'register' || status == 'rejectRegister'"
+          dense
+          lazy-rules
+          :readonly="!(status == 'register' || status == 'rejectRegister')"
+          :borderless="!(status == 'register' || status == 'rejectRegister')"
+          v-model="defaultContact.contactlastname"
+          :rules="[(val) => !!val || `${'กรุณากรอก นามสกุล'}`]"
+          :label="`${'นามสกุล'}`"
+        />
+      </div>
+      <div class="col-xs-12 col-sm-3 col-md-4">
+        <q-input
+          :class="getClass(status == 'register' || status == 'rejectRegister')"
+          :outlined="status == 'register' || status == 'rejectRegister'"
+          dense
+          lazy-rules
+          :readonly="!(status == 'register' || status == 'rejectRegister')"
+          :borderless="!(status == 'register' || status == 'rejectRegister')"
+          v-model="defaultContact.contactrelations"
+          :rules="[(val) => !!val || `${'กรุณากรอกความสัมพันธ์'}`]"
+          :label="`${'เกี่ยวข้องเป็น'}`"
+        />
+      </div>
+      <div class="col-xs-12 col-sm-3 col-md-4">
+        <q-input
+          :outlined="status == 'register' || status == 'rejectRegister'"
+          dense
+          lazy-rules
+          :class="getClass(status == 'register' || status == 'rejectRegister')"
+          :readonly="!(status == 'register' || status == 'rejectRegister')"
+          :borderless="!(status == 'register' || status == 'rejectRegister')"
+          v-model="defaultContact.contacttel"
+          :label="`${'โทรศัพท์'}`"
+          :rules="[(val) => !!val || '* กรุณากรอกข้อมูลหมายเลขโทรศัพท์']"
+        />
+        <!-- (val) =>
+              (val.length >= 9 && val.length <= 10 && val.startsWith('0')) ||
+              'กรุณากรอกข้อมูลหมายเลขโทรศัพท์ให้ถูกต้อง' -->
+        <!-- type="tel" -->
+        <!-- mask="##########" -->
+        <!-- maxlength="10" -->
+        <!-- :counter="status == 'register' || status == 'rejectRegister' ? true : false" -->
+      </div>
+    </div>
+  </q-form>
 </template>
 <script setup lang="ts">
 import { ref, onMounted, watch, PropType } from 'vue'
@@ -106,18 +123,18 @@ import HeaderTop from '@/components/top.vue'
 import { DataOption } from '../../interface/index/Main'
 
 const props = defineProps({
-	status: {
-		type: String,
-		required: true
-	},
-	form: {
-		type: Object,
-		required: true
-	},
-	prefixOptions: {
-		type: Array as PropType<DataOption[]>,
-		required: true
-	}
+  status: {
+    type: String,
+    required: true
+  },
+  form: {
+    type: Object,
+    required: true
+  },
+  prefixOptions: {
+    type: Array as PropType<DataOption[]>,
+    required: true
+  }
 })
 const emit = defineEmits(['update:form'])
 
@@ -133,43 +150,63 @@ const examId = ref<string>(route.params.id.toString())
 const positionId = ref<string>(route.params.positionId.toString())
 
 watch(myform, async (count: any, prevCount: any) => {
-	emit('update:form', count)
+  emit('update:form', count)
 })
 
 watch(defaultContact, async (count: Contact, prevCount: Contact) => {
-	await changeData('contact', count)
+  await changeData('contact', count)
 })
 
 onMounted(async () => {
-	await fetchData()
+  await fetchData()
 })
 
 const fetchData = async () => {
-	loaderPage(true)
-	await http
-		.get(config.API.candidateContact(examId.value, positionId.value))
-		.then((res) => {
-			const data = res.data.result
-			if (data != null) {
-				defaultContact.value.contactprefixId = data.contactPrefixId
-				defaultContact.value.contactfirstname = data.contactFirstname
-				defaultContact.value.contactlastname = data.contactLastname
-				defaultContact.value.contactrelations = data.contactRelations
-				defaultContact.value.contacttel = data.contactTel
-			}
-		})
-		.catch((e) => {
-			//   messageError($q, e)
-		})
-		.finally(() => {
-			loaderPage(false)
-		})
+  loaderPage(true)
+  await http
+    .get(config.API.candidateContact(examId.value, positionId.value))
+    .then((res) => {
+      const data = res.data.result
+      if (data != null) {
+        defaultContact.value.contactprefixId = data.contactPrefixId
+        defaultContact.value.contactfirstname = data.contactFirstname
+        defaultContact.value.contactlastname = data.contactLastname
+        defaultContact.value.contactrelations = data.contactRelations
+        defaultContact.value.contacttel = data.contactTel
+        defaultContact.value.contactprefixName = data.contactPrefixName
+      }
+    })
+    .catch((e) => {
+      //   messageError($q, e)
+    })
+    .finally(() => {
+      loaderPage(false)
+    })
+}
+
+const filteredPrefixOptions = ref<string[]>([])
+
+const filterPrefix = (val: string, update: (fn: () => void) => void) => {
+  update(() => {
+    if (val === '') {
+      filteredPrefixOptions.value = []
+    } else {
+      const needle = val.toLowerCase()
+      filteredPrefixOptions.value = props.prefixOptions
+        .filter((v) => v.name.toLowerCase().indexOf(needle) > -1)
+        .map((v) => v.name)
+    }
+  })
+}
+
+const setModel = (val: string) => {
+  defaultContact.value.contactprefixName = val
 }
 
 const getClass = (val: boolean) => {
-	return {
-		'full-width inputgreen cursor-pointer': val,
-		'full-width cursor-pointer': !val
-	}
+  return {
+    'full-width inputgreen cursor-pointer': val,
+    'full-width cursor-pointer': !val
+  }
 }
 </script>
diff --git a/src/modules/01_exam/components/Form/Education.vue b/src/modules/01_exam/components/Form/Education.vue
index 9430fdd..2908722 100644
--- a/src/modules/01_exam/components/Form/Education.vue
+++ b/src/modules/01_exam/components/Form/Education.vue
@@ -98,7 +98,7 @@
             autoApply
             :enableTimePicker="false"
             week-start="0"
-            :max-date="new Date()"
+            :max-date="dateCondition"
             :disabled="!(status == 'register' || status == 'rejectRegister')"
           >
             <template #year="{ year }">
@@ -176,7 +176,7 @@
   </q-form>
 </template>
 <script setup lang="ts">
-import { ref, onMounted, watch, PropType } from 'vue'
+import { ref, onMounted, watch, PropType, computed } from 'vue'
 import http from '@/plugins/http'
 import config from '@/app.config'
 import type { DataOption, Education } from '@/modules/01_exam/interface/index/Main'
@@ -184,10 +184,13 @@ import { defaultEducation, changeData } from '@/modules/01_exam/interface/index/
 import HeaderTop from '@/components/top.vue'
 import { useRoute } from 'vue-router'
 
+import { useExamDataStore } from '@/modules/01_exam/store'
 import { useCounterMixin } from '@/stores/mixin'
 import { useDataStore } from '@/stores/data'
 import { useQuasar } from 'quasar'
 
+const storeExam = useExamDataStore()
+
 const props = defineProps({
   status: {
     type: String,
@@ -258,7 +261,7 @@ const fetchData = async () => {
       checkInputName()
     })
     .catch((e) => {
-      //   messageError($q, e)
+      // messageError($q, e)
     })
     .finally(() => {
       loaderPage(false)
@@ -282,4 +285,16 @@ const getClass = (val: boolean) => {
     'full-width cursor-pointer': !val
   }
 }
+
+const dateCondition = computed(() => {
+  const date =
+    storeExam.examInfo?.registerEndDate == null
+      ? new Date()
+      : new Date(storeExam.examInfo.registerEndDate)
+  if (date === null) {
+    return null
+  }
+  date.setFullYear(date.getFullYear() - (Number(storeExam.examInfo?.graduationYearLock) || 0))
+  return date
+})
 </script>
diff --git a/src/modules/01_exam/components/Form/Information.vue b/src/modules/01_exam/components/Form/Information.vue
index a17a932..9c2b059 100644
--- a/src/modules/01_exam/components/Form/Information.vue
+++ b/src/modules/01_exam/components/Form/Information.vue
@@ -67,7 +67,7 @@
         /> -->
       </div>
       <div class="col-xs-12 col-sm-3 col-md-2">
-        <q-select
+        <!-- <q-select
           :class="getClass(status == 'register' || status == 'rejectRegister')"
           :readonly="!(status == 'register' || status == 'rejectRegister')"
           :borderless="!(status == 'register' || status == 'rejectRegister')"
@@ -83,6 +83,26 @@
           option-value="id"
           :label="`${'คำนำหน้า'}`"
           @update:model-value="(value) => selectPrefix()"
+        /> -->
+
+        <q-select
+          :class="getClass(status == 'register' || status == 'rejectRegister')"
+          :readonly="!(status == 'register' || status == 'rejectRegister')"
+          :borderless="!(status == 'register' || status == 'rejectRegister')"
+          :rules="[(val) => !!val || `${'กรุณาเลือก คำนำหน้า'}`]"
+          :outlined="status == 'register' || status == 'rejectRegister'"
+          dense
+          lazy-rules
+          v-model="defaultInformation.prefix"
+          :label="`${'คำนำหน้า'}`"
+          :options="filteredPrefixOptions"
+          use-input
+          fill-input
+          input-debounce="0"
+          @filter="filterPrefix"
+          @input-value="setModel"
+          hide-selected
+          hide-dropdown-icon
         />
       </div>
       <div class="col-xs-12 col-sm-3 col-md-3">
@@ -127,7 +147,7 @@
         />
       </div>
       <div class="col-xs-12 col-sm-3 col-md-3">
-        <q-select
+        <!-- <q-select
           :class="getClass(status == 'register' || status == 'rejectRegister')"
           :readonly="!(status == 'register' || status == 'rejectRegister')"
           :borderless="!(status == 'register' || status == 'rejectRegister')"
@@ -142,6 +162,25 @@
           :options="religionOptions"
           option-value="id"
           :label="`${'ศาสนา'}`"
+        /> -->
+        <q-select
+          :class="getClass(status == 'register' || status == 'rejectRegister')"
+          :readonly="!(status == 'register' || status == 'rejectRegister')"
+          :borderless="!(status == 'register' || status == 'rejectRegister')"
+          :rules="[(val) => !!val || `${'กรุณาเลือก ศาสนา'}`]"
+          :outlined="status == 'register' || status == 'rejectRegister'"
+          dense
+          lazy-rules
+          v-model="defaultInformation.religionName"
+          :label="`${'ศาสนา'}`"
+          :options="filteredReligionOptions"
+          use-input
+          fill-input
+          input-debounce="0"
+          @filter="filterReligion"
+          @input-value="setModelReligionId"
+          hide-selected
+          hide-dropdown-icon
         />
       </div>
       <div class="col-xs-12 col-sm-3 col-md-3">
@@ -214,23 +253,21 @@
         <q-input
           :outlined="status == 'register' || status == 'rejectRegister'"
           dense
-          :counter="status == 'register' || status == 'rejectRegister' ? true : false"
           lazy-rules
-          type="tel"
-          mask="##########"
-          maxlength="10"
           :class="getClass(status == 'register' || status == 'rejectRegister')"
           :readonly="!(status == 'register' || status == 'rejectRegister')"
           :borderless="!(status == 'register' || status == 'rejectRegister')"
           v-model="defaultInformation.tel"
           :label="`${'โทรศัพท์'}`"
-          :rules="[
-            (val) => !!val || '* กรุณากรอกข้อมูลหมายเลขโทรศัพท์',
-            (val) =>
-              (val.length >= 9 && val.length <= 10 && val.startsWith('0')) ||
-              'กรุณากรอกข้อมูลหมายเลขโทรศัพท์ให้ถูกต้อง'
-          ]"
+          :rules="[(val) => !!val || '* กรุณากรอกข้อมูลหมายเลขโทรศัพท์']"
         />
+        <!-- :counter="status == 'register' || status == 'rejectRegister' ? true : false" -->
+        <!-- type="tel" -->
+        <!-- mask="##########" -->
+        <!-- maxlength="10" -->
+        <!-- (val) =>
+              (val.length >= 9 && val.length <= 10 && val.startsWith('0')) ||
+              'กรุณากรอกข้อมูลหมายเลขโทรศัพท์ให้ถูกต้อง' -->
       </div>
       <!-- <div class="col-xs-12 col-sm-3 col-md-3">
         <q-input
@@ -374,9 +411,10 @@
   </q-dialog>
 </template>
 <script setup lang="ts">
-import { ref, onMounted, watch } from 'vue'
+import { ref, onMounted, watch, computed } from 'vue'
 import { useCounterMixin } from '@/stores/mixin'
 import { useDataStore } from '@/stores/data'
+import { useExamDataStore } from '@/modules/01_exam/store'
 import http from '@/plugins/http'
 import config from '@/app.config'
 import type { PropType } from 'vue'
@@ -387,6 +425,8 @@ import type { Information, DataOption } from '@/modules/01_exam/interface/index/
 import { defaultInformation, changeData } from '@/modules/01_exam/interface/index/Main'
 import HeaderTop from '@/components/top.vue'
 
+const storeExam = useExamDataStore()
+
 const props = defineProps({
   prefixOptions: {
     type: Array as PropType<DataOption[]>,
@@ -427,7 +467,7 @@ const img = ref<string>('')
 const fileProfile = ref<File[]>([])
 const cardid1 = ref<string | null>('')
 const cardid2 = ref<string | null>('')
-const registerEndDate = ref<Date>(new Date())
+// const registerEndDate = ref<Date>(new Date())
 
 const opNat = ref(['ไทย'])
 const idModel = ref<boolean>(false)
@@ -445,7 +485,7 @@ onMounted(async () => {
   await fetchImgData()
   if (defaultInformation.value.provinceId != null)
     await fetchDistrict(defaultInformation.value.provinceId)
-  candidateCheck()
+  // candidateCheck()
 })
 
 const fetchData = async () => {
@@ -480,6 +520,8 @@ const fetchData = async () => {
       defaultInformation.value.phone = data.mobilePhone
       defaultInformation.value.tel = data.telephone
       defaultInformation.value.knowledge = data.knowledge
+      defaultInformation.value.prefix = data.prefixName
+      defaultInformation.value.religionName = data.religionName
     })
     .catch(() => {
       defaultInformation.value.email =
@@ -536,22 +578,28 @@ const selectBirthDate = async () => {
   }
 }
 
-const candidateCheck = async () => {
-  loaderPage(true)
-  await http
-    .get(config.API.candidateCheckCreate(examId.value, positionId.value))
-    .then(async (res) => {
-      const data = res.data.result
-      registerEndDate.value =
-        data.registerEndDate == null ? new Date() : new Date(data.registerEndDate)
-    })
-    .catch((e) => {
-      messageError($q, e)
-    })
-    .finally(() => {
-      loaderPage(false)
-    })
-}
+const registerEndDate = computed<Date>(() => {
+  return storeExam.examInfo?.registerEndDate == null
+    ? new Date()
+    : new Date(storeExam.examInfo?.registerEndDate)
+})
+
+// const candidateCheck = async () => {
+//   loaderPage(true)
+//   await http
+//     .get(config.API.candidateCheckCreate(examId.value, positionId.value))
+//     .then(async (res) => {
+//       const data = res.data.result
+//       registerEndDate.value =
+//         data.registerEndDate == null ? new Date() : new Date(data.registerEndDate)
+//     })
+//     .catch((e) => {
+//       messageError($q, e)
+//     })
+//     .finally(() => {
+//       loaderPage(false)
+//     })
+// }
 
 const fetchImgData = async () => {
   loaderPage(true)
@@ -636,6 +684,44 @@ function getMaxBirthDate(registerEndDate: Date | string): Date {
   date.setFullYear(date.getFullYear() - 18)
   return date
 }
+
+const filteredPrefixOptions = ref<string[]>([])
+
+const filterPrefix = (val: string, update: (fn: () => void) => void) => {
+  update(() => {
+    if (val === '') {
+      filteredPrefixOptions.value = []
+    } else {
+      const needle = val.toLowerCase()
+      filteredPrefixOptions.value = props.prefixOptions
+        .filter((v) => v.name.toLowerCase().indexOf(needle) > -1)
+        .map((v) => v.name)
+    }
+  })
+}
+
+const setModel = (val: string) => {
+  defaultInformation.value.prefix = val
+}
+
+const filteredReligionOptions = ref<string[]>([])
+
+const filterReligion = (val: string, update: (fn: () => void) => void) => {
+  update(() => {
+    if (val === '') {
+      filteredReligionOptions.value = []
+    } else {
+      const needle = val.toLowerCase()
+      filteredReligionOptions.value = props.religionOptions
+        .filter((v) => v.name.toLowerCase().indexOf(needle) > -1)
+        .map((v) => v.name)
+    }
+  })
+}
+
+const setModelReligionId = (val: string) => {
+  defaultInformation.value.religionName = val
+}
 </script>
 
 <style>
diff --git a/src/modules/01_exam/components/Form/Profile.vue b/src/modules/01_exam/components/Form/Profile.vue
index 234daa1..ff3a34a 100644
--- a/src/modules/01_exam/components/Form/Profile.vue
+++ b/src/modules/01_exam/components/Form/Profile.vue
@@ -55,6 +55,7 @@ import http from '@/plugins/http'
 import config from '@/app.config'
 import { useCounterMixin } from '@/stores/mixin'
 import { useDataStore } from '@/stores/data'
+import { useExamDataStore } from '@/modules/01_exam/store'
 import { useQuasar } from 'quasar'
 import type { DataOption } from '@/modules/01_exam/interface/index/Main'
 import Information from '@/modules/01_exam/components/Form/Information.vue'
@@ -102,6 +103,7 @@ const emit = defineEmits([
 
 const $q = useQuasar()
 const dataStore = useDataStore()
+const examStore = useExamDataStore()
 const { loaderPage } = dataStore
 const mixin = useCounterMixin()
 const { messageError } = mixin
@@ -164,7 +166,17 @@ const fetchPerson = async () => {
       provinceOptions.value = optionProvince
 
       let optionEducationLevel: DataOption[] = []
-      data.educationLevels.map((r: any) => {
+      let filterEducationLevels = data.educationLevels
+
+      if (examStore.educationLevel === 'BACHELOR') {
+        filterEducationLevels = data.educationLevels.filter((level: any) => level.rank === 7)
+      } else if (examStore.educationLevel === 'LOW_BACHELOR') {
+        filterEducationLevels = data.educationLevels.filter(
+          (level: any) => level.rank >= 4 && level.rank <= 6
+        )
+      }
+
+      filterEducationLevels.map((r: any) => {
         optionEducationLevel.push({ id: r.id.toString(), name: r.name.toString() })
       })
       educationLevelOptions.value = optionEducationLevel
diff --git a/src/modules/01_exam/interface/index/Main.ts b/src/modules/01_exam/interface/index/Main.ts
index 528217e..fbf9b6a 100644
--- a/src/modules/01_exam/interface/index/Main.ts
+++ b/src/modules/01_exam/interface/index/Main.ts
@@ -37,6 +37,9 @@ interface Information {
   statusId: string | null
   knowledge: string | null
   profileImg: string | null
+  contactprefixName: string | null
+  prefixName: string | null
+  religionName: string | null
 }
 
 interface Family {
@@ -77,6 +80,7 @@ interface Contact {
   contactlastname: string | null
   contactrelations: string | null
   contacttel: string | null
+  contactprefixName: string | null
 }
 
 interface Education {
@@ -170,7 +174,10 @@ const defaultInformation = ref<Information>({
   districtId: null,
   provinceId: null,
   statusId: null,
-  profileImg: null
+  profileImg: null,
+  contactprefixName: null,
+  prefixName: null,
+  religionName: null
 })
 
 const defaultFamily = ref<Family>({
@@ -210,7 +217,8 @@ const defaultContact = ref<Contact>({
   contactfirstname: null,
   contactlastname: null,
   contactrelations: null,
-  contacttel: null
+  contacttel: null,
+  contactprefixName: null
 })
 
 const defaultEducation = ref<Education>({
diff --git a/src/modules/01_exam/store.ts b/src/modules/01_exam/store.ts
index d238c79..86c9c16 100644
--- a/src/modules/01_exam/store.ts
+++ b/src/modules/01_exam/store.ts
@@ -8,12 +8,30 @@ export const useExamDataStore = defineStore('exam', () => {
     career: { columns: String[] }
   }
 
+  interface DataExam {
+    bank: boolean
+    canRegister: boolean
+    consend: boolean
+    editorCondition: string
+    editorConfirm: string
+    payment: boolean
+    position: boolean
+    positionExam: boolean
+    registerEndDate: string
+    registerStartDate: string
+    status: string
+    graduationYearLock: number
+  }
+
   const examData = ref<exam>({
     main: { columns: [] },
     education: { columns: [] },
     career: { columns: [] }
   })
 
+  const examInfo = ref<DataExam>()
+  const educationLevel = ref<string>('')
+
   const consend = ref<boolean>(false)
   const status = ref<string>('')
 
@@ -37,6 +55,8 @@ export const useExamDataStore = defineStore('exam', () => {
     changeExamColumns,
     consend,
     status,
-    changeStatus
+    changeStatus,
+    examInfo,
+    educationLevel
   }
 })
diff --git a/src/modules/01_exam/views/ExamDetail.vue b/src/modules/01_exam/views/ExamDetail.vue
index 4fdf970..88ae342 100644
--- a/src/modules/01_exam/views/ExamDetail.vue
+++ b/src/modules/01_exam/views/ExamDetail.vue
@@ -82,10 +82,30 @@
     <q-card :style="$q.screen.gt.xs ? 'min-width: 30vw' : 'min-width: 80vw'" class="q-pa-sm">
       <q-card-section class="row items-center col-12">
         <div class="column col-12 text-center">
-          <div><q-icon name="mdi-alert-outline" size="50px" :color="isBeforeToday && timeout ? 'amber-7':'pink'" /></div>
+          <div>
+            <q-icon
+              name="mdi-alert-outline"
+              size="50px"
+              :color="isBeforeToday && timeout ? 'amber-7' : 'pink'"
+            />
+          </div>
 
-          <div :class="isBeforeToday && timeout ? 'text-bold text-amber-7 text-subtitle1 q-mb-md':'text-bold text-pink text-subtitle1 q-mb-md'">{{isBeforeToday && timeout ? 'ยังไม่ถึงรอบรับสมัครสอบ':'หมดเขตรับสมัครสอบ'}} !</div>
-           {{`ไม่สามารถทำรายการได้ ${isBeforeToday && timeout ? 'เนื่องจากยังไม่ถึงรอบรับสมัครสอบ':'เนื่องจากหมดเขตรับสมัครแล้ว'}`}} 
+          <div
+            :class="
+              isBeforeToday && timeout
+                ? 'text-bold text-amber-7 text-subtitle1 q-mb-md'
+                : 'text-bold text-pink text-subtitle1 q-mb-md'
+            "
+          >
+            {{ isBeforeToday && timeout ? 'ยังไม่ถึงรอบรับสมัครสอบ' : 'หมดเขตรับสมัครสอบ' }} !
+          </div>
+          {{
+            `ไม่สามารถทำรายการได้ ${
+              isBeforeToday && timeout
+                ? 'เนื่องจากยังไม่ถึงรอบรับสมัครสอบ'
+                : 'เนื่องจากหมดเขตรับสมัครแล้ว'
+            }`
+          }}
           <!-- {{ dateThaiRange([registerEndDate, registerStartDate]) }} -->
         </div>
       </q-card-section>
@@ -149,6 +169,7 @@ const candidateCheck = async () => {
     .get(config.API.candidateCheckCreate(examId.value, positionId.value))
     .then(async (res) => {
       const data = res.data.result
+      storeExam.examInfo = data
       storeExam.consend = data.consend
       editorCondition.value = data.editorCondition
       editorConfirm.value = data.editorConfirm
@@ -262,6 +283,7 @@ const fetchPeriodExam = async () => {
       yearly.value = data.year
       position.value = data.position
       positionLevel.value = data.positionLevel
+      storeExam.educationLevel = data.educationLevel || ''
     })
     .catch((e) => {
       messageError($q, e)