diff --git a/src/modules/05_placement/components/PersonalList/Table.vue b/src/modules/05_placement/components/PersonalList/Table.vue
index f1bd72119..bb19d36fa 100644
--- a/src/modules/05_placement/components/PersonalList/Table.vue
+++ b/src/modules/05_placement/components/PersonalList/Table.vue
@@ -253,7 +253,10 @@ const getTable = async () => {
         : rowsAll.value.filter((x: any) => x.statusId != "CONTAIN");
 
       rowsFilter.value = rows.value.filter(
-        (e: any) => e.draft == "รอส่งตัว" && e.positionNumber !== null
+        (e: any) =>
+          e.draft == "รอส่งตัว" &&
+          e.positionNumber !== null &&
+          e.statusName == " เตรียมบรรจุ"
       );
       console.log(rowsFilter.value);
     })
@@ -703,7 +706,7 @@ const paginationLabel = (start: number, end: number, total: number) => {
                   <q-item
                     v-if="
                       (roleAdmin && props.row.statusId === 'UN-CONTAIN') ||
-                      props.row.draft === 'รอส่งตัว'
+                      props.row.draft === 'รอส่งตัว' && props.row.statusId !== 'DISCLAIM'
                     "
                     clickable
                     v-close-popup