diff --git a/src/components/Dialogs/AddPersonal.vue b/src/components/Dialogs/AddPersonal.vue
index efc590ed2..cb80e4c3c 100644
--- a/src/components/Dialogs/AddPersonal.vue
+++ b/src/components/Dialogs/AddPersonal.vue
@@ -46,7 +46,7 @@ const typeOps = ref<typeOp[]>([
 const visibleColumns = ref<string[]>([
   "no",
   "idcard",
-  "fullName",
+  "name",
   "posNo",
   "position",
   "positionLevel",
@@ -75,11 +75,11 @@ const columns = ref<QTableProps["columns"]>([
     style: "font-size: 14px",
   },
   {
-    name: "fullName",
+    name: "name",
     align: "left",
     label: "ชื่อ - นามสกุล",
     sortable: true,
-    field: "fullName",
+    field: "name",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
@@ -210,7 +210,7 @@ async function searchInput() {
           prefix: e.prefix,
           firstName: e.firstName,
           lastName: e.lastName,
-          fullName: `${e.prefix}${e.firstName}  ${e.lastName}`,
+          name: `${e.prefix}${e.firstName}  ${e.lastName}`,
           posNo: e.posNo ?? "-",
           position: e.position ?? "-",
           positionLevel: e.positionLevel ?? "-",
diff --git a/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue b/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
index 4662da39a..b5152cde1 100644
--- a/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
+++ b/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
@@ -498,7 +498,7 @@ onMounted(async () => {
   <q-card flat class="q-mt-sm">
     <form @submit.prevent="validateForm">
       <div class="q-pa-md q-col-gutter-md">
-        <div class="col-xs-12 row items-center q-col-gutter-md">
+        <div class="col-xs-12 row items-start q-col-gutter-md">
           <!-- <div class="col-6">
             <q-select
               for="#fault"
@@ -556,7 +556,8 @@ onMounted(async () => {
               </template>
             </q-select>
           </div> -->
-          <q-select
+          <div class="col-xs-12 col-sm-3">
+            <q-select
             for="SelectrespondentType"
             v-model="formData.respondentType"
             ref="respondentTypeRef"
@@ -583,7 +584,35 @@ onMounted(async () => {
               </q-item>
             </template>
           </q-select>
-          <q-select
+          </div>
+
+
+          <div
+            class="col-xs-12 col-sm-3"
+            v-if="formData.respondentType === 'ORGANIZATION'"
+            id="organizationId"
+          >
+            <q-select
+              for="inputOffice"
+              name="organizationId"
+              ref="organizationIdRef"
+              dense
+              hide-bottom-space
+              :readonly="formData.status !== 'NEW' && formData.status !== ''"
+              outlined
+              option-label="name"
+              option-value="id"
+              emit-value
+              map-options
+              v-model="formData.organizationId"
+              :options="investigateFactStore.organizationIdOp"
+              label="เลือกสำนักงาน"
+              :rules="[(val) => !!val || `${'กรุณาเลือกสำนักงาน'}`]"
+              lazy-rules
+            />
+          </div>
+          <div class="col-xs-12 col-sm-3">
+            <q-select
             :readonly="statusStep"
             :disable="statusStep"
             for="#investigationDetail"
@@ -610,30 +639,8 @@ onMounted(async () => {
               </q-item>
             </template>
           </q-select>
-          <div
-            class="col-xs-12 col-sm-3"
-            v-if="formData.respondentType === 'ORGANIZATION'"
-            id="organizationId"
-          >
-            <q-select
-              for="inputOffice"
-              name="organizationId"
-              ref="organizationIdRef"
-              dense
-              hide-bottom-space
-              :readonly="formData.status !== 'NEW' && formData.status !== ''"
-              outlined
-              option-label="name"
-              option-value="id"
-              emit-value
-              map-options
-              v-model="formData.organizationId"
-              :options="investigateFactStore.organizationIdOp"
-              label="เลือกสำนักงาน"
-              :rules="[(val) => !!val || `${'กรุณาเลือกสำนักงาน'}`]"
-              lazy-rules
-            />
           </div>
+
           <div class="row col-12" v-if="formData.respondentType === 'PERSON'">
             <q-card
               bordered