diff --git a/src/modules/05_placement/components/Main.vue b/src/modules/05_placement/components/Main.vue
index b76da2dc1..a1c513c89 100644
--- a/src/modules/05_placement/components/Main.vue
+++ b/src/modules/05_placement/components/Main.vue
@@ -135,17 +135,18 @@ const fetchPlacementData = async (val: number) => {
 
       // rows.value = DataStore.DataMainOrig;
       DataStore.DataMainOrig.map((e: any) => {
-        // rows.value.push({
-        //   examRound: e.examRound,
-        //   examOrder: e.examOrder,
-        //   examTypeName: e.examTypeName,
-        //   examTypeValue: e.examTypeValue,
-        //   accountEndDate: date2Thai(e.accountEndDate),
-        //   accountExpirationDate: date2Thai(e.accountExpirationDate),
-        //   accountStartDate: date2Thai(e.accountStartDate),
-        //   fiscalYear: e.fiscalYear,
-        //   numberOfCandidates: e.numberOfCandidates,
-        // });
+        rows.value.push({
+          id: e.id,
+          examRound: e.examRound,
+          examOrder: e.examOrder,
+          examTypeName: e.examTypeName,
+          examTypeValue: e.examTypeValue,
+          accountEndDate: date2Thai(e.accountEndDate),
+          accountExpirationDate: date2Thai(e.accountExpirationDate),
+          accountStartDate: date2Thai(e.accountStartDate),
+          fiscalYear: e.fiscalYear,
+          numberOfCandidates: e.numberOfCandidates,
+        });
       });
 
       examTypeFilter();
@@ -244,17 +245,18 @@ const searchFilterTable = async () => {
     );
     // rows.value = DataStore.DataMainUpdate;
     DataStore.DataMainUpdate.map((e: any) => {
-      //   rows.value.push({
-      //     examRound: e.examRound,
-      //     examOrder: e.examOrder,
-      //     examTypeName: e.examTypeName,
-      //     examTypeValue: e.examTypeValue,
-      //     accountEndDate: date2Thai(e.accountEndDate),
-      //     accountExpirationDate: date2Thai(e.accountExpirationDate),
-      //     accountStartDate: date2Thai(e.accountStartDate),
-      //     fiscalYear: e.fiscalYear,
-      //     numberOfCandidates: e.numberOfCandidates,
-      //   });
+      rows.value.push({
+        id: e.id,
+        examRound: e.examRound,
+        examOrder: e.examOrder,
+        examTypeName: e.examTypeName,
+        examTypeValue: e.examTypeValue,
+        accountEndDate: date2Thai(e.accountEndDate),
+        accountExpirationDate: date2Thai(e.accountExpirationDate),
+        accountStartDate: date2Thai(e.accountStartDate),
+        fiscalYear: e.fiscalYear,
+        numberOfCandidates: e.numberOfCandidates,
+      });
     });
   }
 };
diff --git a/src/modules/05_placement/components/pass/Table.vue b/src/modules/05_placement/components/pass/Table.vue
index 7b573e7e1..f0e0fb7ee 100644
--- a/src/modules/05_placement/components/pass/Table.vue
+++ b/src/modules/05_placement/components/pass/Table.vue
@@ -143,9 +143,11 @@ const getTable = async () => {
         const rowData = {
           personalId: data.personalId,
           idCard: data.idCard,
-          fullName: data.fullName,
+          fullName: data.fullName + ' ' + data.idCard,
+          name: data.fullName,
           profilePhoto: data.profilePhoto,
-          organizationName: data.organizationName,
+          organizationName: data.organizationName + ' ' + data.organizationShortName + ' ' + data.positionNumber + ' ' + data.positionPath,
+          orgName: data.organizationName,
           organizationShortName: data.organizationShortName,
           positionNumber: data.positionNumber,
           positionPath: data.positionPath,
@@ -423,30 +425,29 @@ const pagination = ref({
                 />
                 <img v-else :src="props.row.avatar" class="col-4 img-info" />
                 <div class="col-4">
-                  <div class="text-weight-medium">{{ props.row.fullName }}</div>
-                  <div class="text-weight-light">{{ props.row.idCard }}</div>
+                        <div class="text-weight-medium">{{ props.row.name }}</div>
+                    <div class="text-weight-light">{{ props.row.idCard }}</div>
+                  </div>
                 </div>
-              </div>
-            </template>
-            <template v-else-if="col.name === 'number'">
-              <div class="text-weight-medium">
-                {{ props.row.number !== null ? props.row.number : "-" }}
-              </div>
-            </template>
+              </template>
+              <template v-else-if="col.name === 'number'">
+                <div class="text-weight-medium">
+                  {{ props.row.number !== null ? props.row.number : "-" }}
+                </div>
+              </template>
 
-            <template v-else-if="col.name === 'organizationName'">
-              <div
-                v-if="
-                  props.row.organizationName !== null ||
-                  props.row.positionPath !== null
-                "
-              >
-                <div class="col-4">
-                  <div class="text-weight-medium">
-                    {{
-                      props.row.organizationName !== null
-                        ? props.row.organizationName
-                        : "-"
+              <template v-else-if="col.name === 'organizationName'">
+                <div
+                  v-if="props.row.orgName !== null ||
+                    props.row.positionPath !== null
+                    "
+                >
+                  <div class="col-4">
+                    <div class="text-weight-medium">
+                      {{
+                        props.row.orgName !== null
+                        ? props.row.orgName
+                                              : "-"
                     }}
                     {{
                       props.row.organizationShortName !== null