diff --git a/src/modules/05_placement/components/Main.vue b/src/modules/05_placement/components/Main.vue
index 7b8b5209f..4ab957331 100644
--- a/src/modules/05_placement/components/Main.vue
+++ b/src/modules/05_placement/components/Main.vue
@@ -231,10 +231,11 @@ const searchFilterTable = async () => {
 //----------------|บัญชีหมดอายุ|-----------------------------//
 const expiredAccount = ref<boolean>(false);
 const expiredAccountFilter = async () => {
-  const currentDate = new Date();
+  // const currentDate = new Date();
   const updatedRows = dataPlacement.value.map((data: any) => {
-    let expirationDate = new Date(data.accountExpirationDate);
-    let isExpired = currentDate > expirationDate;
+    // let expirationDate = new Date(data.accountExpirationDate);
+    // let isExpired = currentDate > expirationDate;
+    let isExpired = data.isExpired == expiredAccount;
 
     return { ...data, isExpired };
   });