diff --git a/src/modules/12_evaluatePersonal/components/Director/Form.vue b/src/modules/12_evaluatePersonal/components/Director/Form.vue
index a3df356ab..9ca77e7da 100644
--- a/src/modules/12_evaluatePersonal/components/Director/Form.vue
+++ b/src/modules/12_evaluatePersonal/components/Director/Form.vue
@@ -79,6 +79,7 @@ const rows = ref<tableType[]>([]);
 const visibleColumnsRespondent = ref<string[]>([
   "info",
   "no",
+  "citizenId",
   "name",
   "position",
   "organization",
@@ -102,6 +103,15 @@ const columnsRespondent = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
+  {
+    name: "citizenId",
+    align: "left",
+    label: "เลขประจำตัวประชาชน",
+    sortable: false,
+    field: "citizenId",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
   {
     name: "name",
     align: "left",
@@ -162,7 +172,7 @@ function searchInput() {
     showLoader();
     const body = {
       fieldName: type.value,
-      keyword: search.value,
+      keyword: search.value ? search.value.trim() : "",
     };
     http
       .post(
@@ -190,6 +200,7 @@ function searchInput() {
           organization: e.organization ?? "-",
           phone: e.phone ?? "-",
           email: e.email ?? "-",
+          citizenId: e.citizenId ?? "-",
         }));
 
         rows.value = list;
@@ -296,7 +307,6 @@ onMounted(async () => {
                   hide-bottom-space
                   dense
                   label="คำค้น"
-                  :rules="[(val:string) => !!val || `กรุณากรอกคำค้น`]"
                 >
                   <template v-slot:after>
                     <q-btn
@@ -305,7 +315,7 @@ onMounted(async () => {
                       outline
                       label="ค้นหา"
                       class="full-width q-py-sm q-px-md"
-                      @click="searchInput()"
+                      @click="(pagination.page = 1), searchInput()"
                     >
                     </q-btn>
                   </template>