diff --git a/src/modules/07_insignia/storeResult.ts b/src/modules/07_insignia/storeResult.ts
index c207e75e0..4d90aab16 100644
--- a/src/modules/07_insignia/storeResult.ts
+++ b/src/modules/07_insignia/storeResult.ts
@@ -56,28 +56,45 @@ export const useResultDataStore = defineStore("insigniaResult", () => {
     }));
     rows.value = alllist
     listInsignia.value = alllist
-    selectInvoice(invoiceType.value)
+    // selectInvoice(invoiceType.value)
+    // console.log(invoiceType.value, employeeClass.value);
+    searchData(invoiceType.value, employeeClass.value);
 
   }
-  const selectInvoice = (invoice: string) => {
-    console.log(invoice);
-    if (invoice === "noDate") {
-      let list = listInsignia.value.filter((e: any) => e.datepay === null)
+  const searchData = (invoice: string, employeeClass: string) => {
+    if (invoice !== 'all' && employeeClass !== 'all') {
+      let list = listInsignia.value.filter((e: any) => convertDatepay(e.datepay) === invoice && e.employeeType === profileType(employeeClass))
       rows.value = list
-    } else if (invoice === "haveDate") {
-      let list = listInsignia.value.filter((e: any) => e.datepay !== null)
+    } else if (invoice !== 'all' && employeeClass === 'all') {
+      let list = listInsignia.value.filter((e: any) => convertDatepay(e.datepay) === invoice)
       rows.value = list
-    } else rows.value = listInsignia.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
+    } else if (invoice === 'all' && employeeClass !== 'all') {
+      let list = listInsignia.value.filter((e: any) => e.employeeType === profileType(employeeClass))
+      rows.value = list
+    }
   }
+  // const selectInvoice = (invoice: string) => {
+  //   if (employeeClass.value !== 'all') {
+  //     if (invoice !== "all") {
+  //       let list = listInsignia.value.filter((e: any) => convertDatepay(e.datepay) === invoice && e.employeeType === profileType(employeeClass.value))
+  //       rows.value = list
+  //     } else rows.value = listInsignia.value.filter((e: any) => e.employeeType === profileType(employeeClass.value))
+  //   }
+  //   else {
+  //     if (invoice !== 'all') {
+  //       rows.value = listInsignia.value.filter((e: any) => convertDatepay(e.datepay) === invoice)
+  //     } else rows.value = listInsignia.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
+  // }
   const status = (val: string) => {
     switch (val) {
       case "PENDING":
@@ -98,6 +115,14 @@ export const useResultDataStore = defineStore("insigniaResult", () => {
         return "ลูกจ้างประจำ";
     }
   }
+  const convertDatepay = (val: any) => {
+    switch (val) {
+      case null:
+        return "noDate";
+      default:
+        return "haveDate";
+    }
+  }
   return {
     rows,
     insignia,
@@ -113,7 +138,8 @@ export const useResultDataStore = defineStore("insigniaResult", () => {
     status,
     profileType,
     fetchlistinsignia,
-    selectInvoice,
-    selectEmployeeClass,
+    searchData,
+    // selectInvoice,
+    // selectEmployeeClass,
   };
 });
diff --git a/src/modules/07_insignia/views/ResultPage.vue b/src/modules/07_insignia/views/ResultPage.vue
index f5c0b008c..d417d843d 100644
--- a/src/modules/07_insignia/views/ResultPage.vue
+++ b/src/modules/07_insignia/views/ResultPage.vue
@@ -540,7 +540,7 @@ const paginationLabel = (start: number, end: number, total: number) => {
                 :borderless="false"
                 style="min-width: 150px"
                 @update:model-value="
-                  DataStore.selectInvoice(DataStore.invoiceType)
+                  DataStore.searchData(DataStore.invoiceType,DataStore.employeeClass)
                 "
               />
             </div>
@@ -561,7 +561,7 @@ const paginationLabel = (start: number, end: number, total: number) => {
                 :borderless="false"
                 style="min-width: 150px"
                 @update:model-value="
-                  DataStore.selectEmployeeClass(DataStore.employeeClass)
+                  DataStore.searchData(DataStore.invoiceType,DataStore.employeeClass)
                 "
               />
             </div>