diff --git a/src/modules/03_recruiting/views/02_qualify/PeriodAdd.vue b/src/modules/03_recruiting/views/02_qualify/PeriodAdd.vue
index f33f90ddb..58d81888c 100644
--- a/src/modules/03_recruiting/views/02_qualify/PeriodAdd.vue
+++ b/src/modules/03_recruiting/views/02_qualify/PeriodAdd.vue
@@ -385,10 +385,8 @@
                         <template v-slot:option="scope">
                           <q-item v-bind="scope.itemProps">
                             <q-item-section>
-                              <q-item-label>{{
-                                scope.opt.positionName
-                              }}</q-item-label>
-                              <q-item-label caption>
+                              <q-item-label>{{ scope.opt.name }}</q-item-label>
+                              <!-- <q-item-label caption>
                                 <q-icon
                                   class="q-mr-sm"
                                   size="15px"
@@ -401,7 +399,7 @@
                                 {{
                                   scope.opt.positionExecutiveSide
                                 }}</q-item-label
-                              >
+                              > -->
                             </q-item-section>
                           </q-item>
                         </template>
@@ -412,9 +410,9 @@
                             square
                             class="q-my-none q-ml-xs q-mr-none"
                           >
-                            {{ scope.opt.positionName }}
+                            {{ scope.opt.name }}
                           </q-chip>
-                          <q-item-label caption>
+                          <!-- <q-item-label caption>
                             <q-icon
                               class="q-mr-sm"
                               size="15px"
@@ -425,7 +423,7 @@
                             {{ scope.opt.positionType }}
                             {{ scope.opt.positionExecutive }}
                             {{ scope.opt.positionExecutiveSide }}</q-item-label
-                          >
+                          > -->
                         </template>
                       </selector>
                     </q-td>
@@ -1021,8 +1019,8 @@ const myFormPayment = ref<any>();
 const myFormPosition = ref<any>();
 const positionPathOptions = ref<DataOption[]>([]);
 const governmentCodeOption = ref<DataOption[]>([]);
-const organizationShortName = ref<DataOption>({ id: "", name: "" });
-const organizationName = ref<DataOption>({ id: "", name: "" });
+const organizationShortName = ref<DataOption>();
+const organizationName = ref<DataOption>();
 const organizationNameOptions = ref<DataOption[]>([]);
 const examTypeOptions = [
   { name: "ทั่วไป", id: "normol" },
@@ -1221,14 +1219,18 @@ const fetchData = async () => {
         data.paymentStartDate != null && data.paymentEndDate != null
           ? [new Date(data.paymentStartDate), new Date(data.paymentEndDate)]
           : null;
-      organizationShortName.value = {
-        id: data.organizationCodeId,
-        name: data.organizationCodeName,
-      };
-      organizationName.value = {
-        id: data.organizationId,
-        name: data.organizationName,
-      };
+      if (data.organizationCodeId != null) {
+        organizationShortName.value = {
+          id: data.organizationCodeId,
+          name: data.organizationCodeName,
+        };
+      }
+      if (data.organizationId != null) {
+        organizationName.value = {
+          id: data.organizationId,
+          name: data.organizationName,
+        };
+      }
       rowsPosition.value = positionData;
       pay.value = data.paymentKrungThai;
       rowsPayment.value = bankData;
@@ -1369,7 +1371,7 @@ const sendData = () => {
       highDegree: r.highDegree ? true : false,
     });
   });
-  const valueData: RequestPeriodExam = {
+  const valueData: any = {
     announcementDate:
       dateAnnounce.value != null ? dateToISO(dateAnnounce.value) : null,
     announcementEndDate: