diff --git a/src/modules/06_retirement/views/Main.vue b/src/modules/06_retirement/views/Main.vue
index 39f6afdee..7fe3ef386 100644
--- a/src/modules/06_retirement/views/Main.vue
+++ b/src/modules/06_retirement/views/Main.vue
@@ -76,6 +76,7 @@ const yearOptions = ref<any>([{ id: "", year: "ทั้งหมด" }]);
 
 onMounted(async () => {
   await fetchRetirement(type.value, currentYear);
+  // fiscalyear.value = currentYear + 543
   //   await fetchRetirement(type.value, currentYear);
 });
 // หาปีปัจจุบัน
@@ -116,7 +117,11 @@ const fetchRetirement = async (type: string, year: any) => {
       yearOptions.value.push(...option);
 
       yearOptionsFilter.value = yearOptions.value;
-
+      if (yearOptionsFilter.value.length == 1) {
+        fiscalyear.value = yearOptionsFilter.value[0].id;
+      } else {
+        fiscalyear.value = year;
+      }
       actionOption.value = rows.value;
       rows.value.sort((a, b) => a.round - b.round); // เรียงรอบมากไปน้อย
       checkststus(rows.value);