diff --git a/src/modules/07_insignia/store.ts b/src/modules/07_insignia/store.ts
index eb93af4e0..f229b8450 100644
--- a/src/modules/07_insignia/store.ts
+++ b/src/modules/07_insignia/store.ts
@@ -84,24 +84,46 @@ export const useInsigniaDataStore = defineStore("insignia", () => {
   };
 
   const searchFilterTable = async () => {
-    if (typeinsignia.value !== undefined && typeinsignia.value !== null) {
-      if (typeinsignia.value === "all") {
-        rows.value = listinsignia.value;
-      } else {
-        rows.value = listinsignia.value.filter(
-          (e: any) => e.insigniaSend === typeinsignia.value
-        );
+    console.log(employeeClass.value);
+    if (employeeClass.value === "all") {
+      if (typeinsignia.value !== undefined && typeinsignia.value !== null) {
+        if (typeinsignia.value === "all") {
+          rows.value = listinsignia.value;
+        } else {
+          rows.value = listinsignia.value.filter(
+            (e: any) => e.insigniaSend === typeinsignia.value
+          );
+        }
+      }
+    } else {
+      if (typeinsignia.value !== undefined && typeinsignia.value !== null) {
+        if (typeinsignia.value === "all") {
+          rows.value = listinsignia.value.filter((e: any) => e.employeeType === profileType(employeeClass.value))
+        } else {
+          rows.value = listinsignia.value.filter(
+            (e: any) => e.insigniaSend === typeinsignia.value && e.employeeType === profileType(employeeClass.value)
+          );
+        }
       }
     }
   };
   const selectEmployeeClass = (employeeClass: string) => {
-    if (employeeClass == "officer") {
-      let list = listinsignia.value.filter((e: any) => e.employeeType === "ข้าราชการ กทม.สามัญ")
-      rows.value = list
-    } else if (employeeClass === "perm") {
-      let list = listinsignia.value.filter((e: any) => e.employeeType === "ลูกจ้างประจำ")
-      rows.value = list
-    } else rows.value = listinsignia.value
+    if (typeinsignia.value !== "all") {
+      if (employeeClass !== "all") {
+        let list = listinsignia.value.filter((e: any) => e.employeeType === profileType(employeeClass) && e.insigniaSend === typeinsignia.value)
+        rows.value = list
+      } else {
+        let list = listinsignia.value.filter((e: any) => e.insigniaSend === typeinsignia.value)
+        rows.value = list
+      }
+    } else if (typeinsignia.value == "all") {
+      if (employeeClass !== "all") {
+        let list = listinsignia.value.filter((e: any) => e.employeeType === profileType(employeeClass))
+        rows.value = list
+      } else {
+        rows.value = listinsignia.value
+      }
+    }
   }
   const convertOcid = (oc: string) => {
     let ocdata = optionsTypeOc.value.find((e: any) => e.name === oc)
diff --git a/src/modules/08_registryEmployee/views/Main.vue b/src/modules/08_registryEmployee/views/Main.vue
index d74ddafcd..29475e603 100644
--- a/src/modules/08_registryEmployee/views/Main.vue
+++ b/src/modules/08_registryEmployee/views/Main.vue
@@ -1364,6 +1364,7 @@ const getPosition = async (id: string) => {
       }
 
       rowsPosition.value = data;
+      modal.value = true;
     })
     .catch((e) => {
       messageError($q, e);
@@ -1500,7 +1501,7 @@ const editDetail = async (row: any) => {
   await getPosition(row.id);
   console.log(row);
   id.value = row.id;
-  modal.value = true;
+  // modal.value = true;
 };
 
 const clickDelete = (id: string) => {