diff --git a/src/components/information/Train.vue b/src/components/information/Train.vue
index cf6661128..d8b98f615 100644
--- a/src/components/information/Train.vue
+++ b/src/components/information/Train.vue
@@ -394,6 +394,7 @@
     </template>
   </HistoryTable>
 </template>
+
 <script setup lang="ts">
 import { onMounted, ref, watch } from "vue";
 import { useRoute } from "vue-router";
@@ -412,6 +413,7 @@ import HistoryTable from "@/components/TableHistory.vue";
 import http from "@/plugins/http";
 import config from "@/app.config";
 import type { QTableProps } from "quasar";
+import { calculateFiscalYear } from "@/utils/function";
 
 const props = defineProps({
   statusEdit: {
@@ -430,7 +432,7 @@ const route = useRoute();
 const id = ref<string>("");
 const name = ref<string>();
 const topic = ref<string>();
-const yearly = ref<number>(new Date().getFullYear());
+const yearly = ref<number>(calculateFiscalYear(new Date()));
 const place = ref<string>();
 const duration = ref<string>();
 const department = ref<string>();
@@ -1017,7 +1019,7 @@ const addData = () => {
   edit.value = true;
   name.value = "";
   topic.value = "";
-  yearly.value = new Date().getFullYear();
+  yearly.value = calculateFiscalYear(new Date());
   place.value = "";
   duration.value = "";
   department.value = "";
diff --git a/src/modules/01_masterdata/components/Indicators/indicatorByRole/DetailView.vue b/src/modules/01_masterdata/components/Indicators/indicatorByRole/DetailView.vue
index 7b0d923e7..f48834055 100644
--- a/src/modules/01_masterdata/components/Indicators/indicatorByRole/DetailView.vue
+++ b/src/modules/01_masterdata/components/Indicators/indicatorByRole/DetailView.vue
@@ -7,6 +7,7 @@ import config from "@/app.config";
 
 import { useCounterMixin } from "@/stores/mixin";
 import { useStructureTree } from "@/stores/structureTree";
+import { calculateFiscalYear } from "@/utils/function";
 
 import type { DataStructureTree } from "@/interface/main";
 import type { FormDataRole } from "@/modules/01_masterdata/interface/request/Main";
@@ -47,7 +48,7 @@ const isView = ref<boolean>(route.name === "KPIIndicatorByRoleView");
 const modalDialogSelect = ref<boolean>(false);
 const form = reactive<FormDataRole>({
   position: "", //ตำแหน่งในสายงาน
-  year: new Date().getFullYear(), //ปีงบประมาณ
+  year: calculateFiscalYear(new Date()), //ปีงบประมาณ
   round: "", //รอบการประเมิน
   org: "", //หน่วยงาน/ส่วนราชการ
   including: "", //รหัสตัวชี้วัด
diff --git a/src/modules/01_masterdata/views/Assignment.vue b/src/modules/01_masterdata/views/Assignment.vue
index 46e41a4f8..1e3d31c8e 100644
--- a/src/modules/01_masterdata/views/Assignment.vue
+++ b/src/modules/01_masterdata/views/Assignment.vue
@@ -8,6 +8,7 @@ import { useRouter } from "vue-router";
 import { useCounterMixin } from "@/stores/mixin";
 import { checkPermission } from "@/utils/permissions";
 import { usePagination } from "@/composables/usePagination";
+import { calculateFiscalYear } from "@/utils/function";
 
 /** importType*/
 import type {
@@ -63,7 +64,7 @@ const rows = ref<DataAssignment[]>([]);
 const formFilter = reactive<FormFilterAssignment>({
   keyword: "",
   period: "",
-  year: new Date().getFullYear(),
+  year: calculateFiscalYear(new Date()),
 });
 
 /** ฟังก์ชันดึงข้อมูลรายการงานอื่นๆ ที่ได้รับมอบหมาย*/
diff --git a/src/modules/01_masterdata/views/indicatorByPlan.vue b/src/modules/01_masterdata/views/indicatorByPlan.vue
index 7a867aa8a..7cd1374dc 100644
--- a/src/modules/01_masterdata/views/indicatorByPlan.vue
+++ b/src/modules/01_masterdata/views/indicatorByPlan.vue
@@ -9,6 +9,7 @@ import { useCounterMixin } from "@/stores/mixin";
 import { checkPermission } from "@/utils/permissions";
 import { useStructureTree } from "@/stores/structureTree";
 import { usePagination } from "@/composables/usePagination";
+import { calculateFiscalYear } from "@/utils/function";
 
 import type {
   DataOption,
@@ -70,7 +71,7 @@ const roundOp = ref<DataOption[]>([
   { id: "OCT", name: "รอบตุลาคม" },
 ]);
 
-const year = ref<number | null>(new Date().getFullYear());
+const year = ref<number | null>(calculateFiscalYear(new Date()));
 const nodeData = reactive<FormDataNodeData>({
   round: "",
   nodeId: null,
diff --git a/src/modules/01_masterdata/views/indicatorByRole.vue b/src/modules/01_masterdata/views/indicatorByRole.vue
index a51e82111..6a21c0030 100644
--- a/src/modules/01_masterdata/views/indicatorByRole.vue
+++ b/src/modules/01_masterdata/views/indicatorByRole.vue
@@ -8,6 +8,7 @@ import config from "@/app.config";
 import { useCounterMixin } from "@/stores/mixin";
 import { checkPermission } from "@/utils/permissions";
 import { usePagination } from "@/composables/usePagination";
+import { calculateFiscalYear } from "@/utils/function";
 
 import type { FormListMainByRole } from "@/modules/01_masterdata/interface/request/Main";
 import type {
@@ -65,7 +66,7 @@ const formFilter = reactive<FormListMainByRole>({
   position: "",
   round: "",
   keyword: "",
-  year: new Date().getFullYear(),
+  year: calculateFiscalYear(new Date()),
 });
 
 const indicatorTotal = ref<IndicatorTotal[]>([
diff --git a/src/modules/03_recruiting/interface/index/Main.ts b/src/modules/03_recruiting/interface/index/Main.ts
index b9a332915..9fd26f0e7 100644
--- a/src/modules/03_recruiting/interface/index/Main.ts
+++ b/src/modules/03_recruiting/interface/index/Main.ts
@@ -1,6 +1,6 @@
 import { ref } from "vue";
 interface Pagination {
-  page: number;
+  page?: number;
   rowsPerPage: number;
   sortBy?: string;
 }
diff --git a/src/modules/03_recruiting/views/01_compete/CompeteReport.vue b/src/modules/03_recruiting/views/01_compete/CompeteReport.vue
index 9d0422b86..d75dded2d 100644
--- a/src/modules/03_recruiting/views/01_compete/CompeteReport.vue
+++ b/src/modules/03_recruiting/views/01_compete/CompeteReport.vue
@@ -8,6 +8,7 @@ import http from "@/plugins/http";
 import config from "@/app.config";
 import { checkPermission } from "@/utils/permissions";
 import { useCounterMixin } from "@/stores/mixin";
+import { calculateFiscalYear } from "@/utils/function";
 
 import type { DataOption } from "@/modules/09_leave/interface/index/Main";
 
@@ -21,7 +22,7 @@ const { showLoader, hideLoader, messageError } = mixin;
 
 const isLoadPDF = ref<boolean>(false);
 
-const year = ref<number>(new Date().getFullYear());
+const year = ref<number>(calculateFiscalYear(new Date()));
 
 const reportSelect = ref<DataOption>({
   id: "",
@@ -145,7 +146,7 @@ function clearFilter() {
     name: "",
   };
   detailReport.value = undefined;
-  year.value = new Date().getFullYear();
+  year.value = calculateFiscalYear(new Date());
   pdfSrc.value = undefined;
   detailReport.value = undefined;
 }
diff --git a/src/modules/03_recruiting/views/01_compete/ImportData.vue b/src/modules/03_recruiting/views/01_compete/ImportData.vue
index f845e144b..99c113f7c 100644
--- a/src/modules/03_recruiting/views/01_compete/ImportData.vue
+++ b/src/modules/03_recruiting/views/01_compete/ImportData.vue
@@ -16,7 +16,7 @@ const $q = useQuasar(); // show dialog
 const router = useRouter();
 const file = ref<boolean>(true);
 const filter = ref<string>(""); //search data table
-  const initialPagination = ref<Pagination>({
+const initialPagination = ref<Pagination>({
   rowsPerPage: 0,
   sortBy: "year",
 });
diff --git a/src/modules/03_recruiting/views/01_compete/Period.vue b/src/modules/03_recruiting/views/01_compete/Period.vue
index 4a5c400aa..e590de582 100644
--- a/src/modules/03_recruiting/views/01_compete/Period.vue
+++ b/src/modules/03_recruiting/views/01_compete/Period.vue
@@ -10,6 +10,7 @@ import http from "@/plugins/http";
 import config from "@/app.config";
 import { checkPermission } from "@/utils/permissions";
 import { useCounterMixin } from "@/stores/mixin";
+import { calculateFiscalYear } from "@/utils/function";
 
 import type { Pagination } from "@/modules/03_recruiting/interface/index/Main";
 import type {
@@ -36,7 +37,7 @@ const {
 
 const router = useRouter();
 const name = ref<string>("");
-const year = ref<number>(new Date().getFullYear() + 543);
+const year = ref<number>(calculateFiscalYear(new Date()) + 543);
 const order = ref<number>(1);
 
 const files = ref<any>(null);
diff --git a/src/modules/03_recruiting/views/01_compete/PeriodAdd.vue b/src/modules/03_recruiting/views/01_compete/PeriodAdd.vue
index 27d6bfe46..bb49e4aa8 100644
--- a/src/modules/03_recruiting/views/01_compete/PeriodAdd.vue
+++ b/src/modules/03_recruiting/views/01_compete/PeriodAdd.vue
@@ -6,6 +6,7 @@ import { useRouter, useRoute } from "vue-router";
 import http from "@/plugins/http";
 import config from "@/app.config";
 import { useCounterMixin } from "@/stores/mixin";
+import { calculateFiscalYear } from "@/utils/function";
 
 import type { RequestPeriodCompete } from "@/modules/03_recruiting/interface/request/Period";
 import type {
@@ -36,7 +37,7 @@ const isFeeNotZero = computed(() => {
   return fee.value !== 0 && fee.value !== "0" && fee.value !== "";
 });
 const round = ref<number>(1);
-const yearly = ref<number>(new Date().getFullYear());
+const yearly = ref<number>(calculateFiscalYear(new Date()));
 const dateRegister = ref<[Date, Date] | null>(null); //วันที่สมัคร
 const datePayment = ref<[Date, Date] | null>(null); //วันที่จ่ายเงิน
 const dateAnnouncement = ref<[Date, Date] | null>(null); //วันที่ประกาศ
diff --git a/src/modules/03_recruiting/views/02_qualify/DisablePeriod.vue b/src/modules/03_recruiting/views/02_qualify/DisablePeriod.vue
index 59fdfe65d..72772c698 100644
--- a/src/modules/03_recruiting/views/02_qualify/DisablePeriod.vue
+++ b/src/modules/03_recruiting/views/02_qualify/DisablePeriod.vue
@@ -10,6 +10,7 @@ import http from "@/plugins/http";
 import config from "@/app.config";
 import { useCounterMixin } from "@/stores/mixin";
 import { checkPermission } from "@/utils/permissions";
+import { calculateFiscalYear } from "@/utils/function";
 
 import type {
   ResponseRecruitPeriod,
@@ -37,7 +38,7 @@ const {
 } = mixin;
 
 const name = ref<string>("");
-const year = ref<number>(new Date().getFullYear() + 543);
+const year = ref<number>(calculateFiscalYear(new Date()) + 543);
 const round = ref<number>(1);
 const files = ref<any>(null);
 const files_score = ref<any>(null);
diff --git a/src/modules/03_recruiting/views/02_qualify/DisablePeriodAdd.vue b/src/modules/03_recruiting/views/02_qualify/DisablePeriodAdd.vue
index 9bb694074..8267027ee 100644
--- a/src/modules/03_recruiting/views/02_qualify/DisablePeriodAdd.vue
+++ b/src/modules/03_recruiting/views/02_qualify/DisablePeriodAdd.vue
@@ -7,6 +7,7 @@ import { useRouter, useRoute } from "vue-router";
 import http from "@/plugins/http";
 import config from "@/app.config";
 import { useCounterMixin } from "@/stores/mixin";
+import { calculateFiscalYear } from "@/utils/function";
 
 import type { RequestPeriodDisable } from "@/modules/03_recruiting/interface/request/Period";
 import type {
@@ -33,7 +34,7 @@ const editor = ref<string>("");
 const announcementExam = ref<boolean>(true);
 const fee = ref<number>(0);
 const round = ref<number>(1);
-const yearly = ref<number>(new Date().getFullYear());
+const yearly = ref<number>(calculateFiscalYear(new Date()));
 const dateRegister = ref<[Date, Date] | null>(null); //วันที่สมัคร
 const datePayment = ref<[Date, Date] | null>(null); //วันที่จ่ายเงิน
 const dateAnnouncement = ref<[Date, Date] | null>(null); //วันที่ประกาศ
diff --git a/src/modules/03_recruiting/views/02_qualify/PeriodAdd.vue b/src/modules/03_recruiting/views/02_qualify/PeriodAdd.vue
index 27acd5c6b..7a08eca5a 100644
--- a/src/modules/03_recruiting/views/02_qualify/PeriodAdd.vue
+++ b/src/modules/03_recruiting/views/02_qualify/PeriodAdd.vue
@@ -8,6 +8,7 @@ import { useRouter, useRoute } from "vue-router";
 import http from "@/plugins/http";
 import config from "@/app.config";
 import { useCounterMixin } from "@/stores/mixin";
+import { calculateFiscalYear } from "@/utils/function";
 
 import type {
   RequestPosition,
@@ -74,7 +75,7 @@ const checkDocument = ref<boolean>(false);
 const checkDisability = ref<boolean>(false);
 const announcementExam = ref<boolean>(true);
 const round = ref<number>(1);
-const yearly = ref<number>(new Date().getFullYear());
+const yearly = ref<number>(calculateFiscalYear(new Date()));
 const nameRaw = ref<number | null>(null);
 const roundRaw = ref<number | null>(null);
 const yearlyRaw = ref<number | null>(null);
diff --git a/src/modules/04_registryPerson/components/TableView.vue b/src/modules/04_registryPerson/components/TableView.vue
index 01ad53316..284b6cd62 100644
--- a/src/modules/04_registryPerson/components/TableView.vue
+++ b/src/modules/04_registryPerson/components/TableView.vue
@@ -5,6 +5,7 @@ import { checkPermission } from "@/utils/permissions";
 import { useRoute, useRouter } from "vue-router";
 import { useRegistryNewDataStore } from "@/modules/04_registryPerson/store";
 import { useCounterMixin } from "@/stores/mixin";
+import { calculateFiscalYear } from "@/utils/function";
 
 /** importType*/
 import { useQuasar, type QTableProps } from "quasar";
@@ -44,7 +45,7 @@ const rangeAge = ref<RangeAge>({
 const objMarkerLabel = computed(() => {
   return { 39: `ช่วงอายุ ${rangeAge.value.min}-${rangeAge.value.max} ปี` };
 });
-const year = ref<number>(new Date().getFullYear());
+const year = ref<number>(calculateFiscalYear(new Date()));
 
 //ตัวแปร
 const modalHistory = ref<boolean>(false); //ประวัติถือครองตำแหน่ง
diff --git a/src/modules/04_registryPerson/components/detail/Achievement/05_ResultsPerformance.vue b/src/modules/04_registryPerson/components/detail/Achievement/05_ResultsPerformance.vue
index d1337c253..69b700660 100644
--- a/src/modules/04_registryPerson/components/detail/Achievement/05_ResultsPerformance.vue
+++ b/src/modules/04_registryPerson/components/detail/Achievement/05_ResultsPerformance.vue
@@ -7,6 +7,7 @@ import { checkPermission } from "@/utils/permissions";
 import { useCounterMixin } from "@/stores/mixin";
 import { useResultsPerformDataStore } from "@/modules/04_registryPerson/stores/ResultsPerformance";
 import { usePagination } from "@/composables/usePagination";
+import { calculateFiscalYear } from "@/utils/function";
 import http from "@/plugins/http";
 import config from "@/app.config";
 
@@ -45,7 +46,7 @@ const profileId = ref<string>(
   route.params.id ? route.params.id.toString() : ""
 );
 const empType = ref<string>(pathRegistryEmp(route.name?.toString() ?? ""));
-const year = ref<number | null>(new Date().getFullYear()); //ปีงบประมาณ
+const year = ref<number | null>(calculateFiscalYear(new Date())); //ปีงบประมาณ
 const id = ref<string>(""); //id ที่ต้องการแก้ไข
 const typeIDP = ref<string>("");
 const isEdit = ref<boolean>(false); //สถานะการแก้ไขข้อมูล
@@ -494,7 +495,7 @@ function clearData() {
   resPerformForm.pointSumTotal = 0;
   resPerformForm.pointSum = 0;
   resPerformForm.date = null;
-  year.value = new Date().getFullYear();
+  year.value = calculateFiscalYear(new Date());
 }
 
 /**
diff --git a/src/modules/05_placement/components/probation/MainSurvey.vue b/src/modules/05_placement/components/probation/MainSurvey.vue
index 24947a245..d765c76c3 100644
--- a/src/modules/05_placement/components/probation/MainSurvey.vue
+++ b/src/modules/05_placement/components/probation/MainSurvey.vue
@@ -6,6 +6,7 @@ import http from "@/plugins/http";
 import config from "@/app.config";
 import { useCounterMixin } from "@/stores/mixin";
 import { usePagination } from "@/composables/usePagination";
+import { calculateFiscalYear } from "@/utils/function";
 
 import type { MainData } from "@/modules/05_placement/interface/index/Survey";
 
@@ -14,7 +15,7 @@ const mixin = useCounterMixin();
 const { showLoader, hideLoader, messageError, date2Thai } = mixin;
 const { pagination, params, onRequest } = usePagination("", getData);
 
-const year = ref<number | null>(new Date().getFullYear()); //ปีงบประมาณ
+const year = ref<number | null>(calculateFiscalYear(new Date())); //ปีงบประมาณ
 
 const rows = ref<MainData[]>([]);
 const filterKeyword = ref<string>("");
diff --git a/src/modules/05_placement/views/09_reportMain.vue b/src/modules/05_placement/views/09_reportMain.vue
index 0031a4dc4..faa55bb04 100644
--- a/src/modules/05_placement/views/09_reportMain.vue
+++ b/src/modules/05_placement/views/09_reportMain.vue
@@ -7,6 +7,7 @@ import axios from "axios";
 import { useRoute } from "vue-router";
 import { useCounterMixin } from "@/stores/mixin";
 import { useStructureTree } from "@/stores/structureTree";
+import { calculateFiscalYear } from "@/utils/function";
 import http from "@/plugins/http";
 import config from "@/app.config";
 
@@ -56,7 +57,7 @@ const optionReport = ref<DataTypeReport[]>([
     type: "probation",
   },
 ]);
-const year = ref<number>(new Date().getFullYear());
+const year = ref<number>(calculateFiscalYear(new Date()));
 const dateStart = ref<Date>(new Date(year.value - 1, 9, 1));
 const dateEnd = ref<Date>(new Date(year.value + 1, 8, 30));
 
@@ -188,7 +189,7 @@ function clearFilter() {
   detailReport.value = undefined;
   pdfSrc.value = undefined;
 
-  year.value = new Date().getFullYear();
+  year.value = calculateFiscalYear(new Date());
   dateStart.value = new Date(year.value - 1, 9, 1);
   dateEnd.value = new Date(year.value + 1, 8, 30);
 }
diff --git a/src/modules/06_retirement/views/07_report.vue b/src/modules/06_retirement/views/07_report.vue
index 1d64952ed..03dc8ad12 100644
--- a/src/modules/06_retirement/views/07_report.vue
+++ b/src/modules/06_retirement/views/07_report.vue
@@ -7,6 +7,7 @@ import axios from "axios";
 import { useRoute } from "vue-router";
 import { useStructureTree } from "@/stores/structureTree";
 import { useCounterMixin } from "@/stores/mixin";
+import { calculateFiscalYear } from "@/utils/function";
 import http from "@/plugins/http";
 import config from "@/app.config";
 import genReportXLSX from "@/plugins/genreportxlsx";
@@ -48,7 +49,7 @@ const filterTypeOption = ref<DataOption[]>([
   { id: "MONTH", name: "รายเดือน" },
   { id: "YEAR", name: "รายปี" },
 ]);
-const year = ref<number>(new Date().getFullYear());
+const year = ref<number>(calculateFiscalYear(new Date()));
 const dateMonth = ref<DataDateMonthObject>({
   month: new Date().getMonth(),
   year: new Date().getFullYear(),
@@ -203,7 +204,7 @@ function clearFilter() {
   reportType.value = "";
 
   filterType.value = "MONTH";
-  year.value = new Date().getFullYear();
+  year.value = calculateFiscalYear(new Date());
   dateMonth.value = {
     month: new Date().getMonth(),
     year: new Date().getFullYear(),
diff --git a/src/modules/09_leave/components/07_LeaveHistory/DialogForm.vue b/src/modules/09_leave/components/07_LeaveHistory/DialogForm.vue
index c266a250c..7d25bfc43 100644
--- a/src/modules/09_leave/components/07_LeaveHistory/DialogForm.vue
+++ b/src/modules/09_leave/components/07_LeaveHistory/DialogForm.vue
@@ -7,6 +7,7 @@ import http from "@/plugins/http";
 import config from "@/app.config";
 import { useCounterMixin } from "@/stores/mixin";
 import { useLeaveHistoryDataStore } from "@/modules/09_leave/stores/LeaveHistoryStore";
+import { calculateFiscalYear } from "@/utils/function";
 
 import type { QTableColumn } from "quasar";
 import type {
@@ -78,7 +79,7 @@ const profileId = ref<string>("");
 const rowId = ref<string>("");
 const formData = reactive({
   leaveTypeId: "", //ประเภทการลา
-  leaveYear: findYear(new Date()), //ปี
+  leaveYear: calculateFiscalYear(new Date()), //ปี
   leaveDays: "", //วันลาที่ยกมา
   leaveDaysUsed: "", //วันลาที่ใช้ไป
 });
@@ -191,7 +192,7 @@ function onClose() {
   formFilter.page = 1;
   formFilter.pageSize = 10;
   formData.leaveTypeId = "";
-  formData.leaveYear = new Date().getFullYear();
+  formData.leaveYear = calculateFiscalYear(new Date());
   formData.leaveDays = "";
   formData.leaveDaysUsed = "";
   rows.value = [];
diff --git a/src/modules/09_leave/stores/LeaveStore.ts b/src/modules/09_leave/stores/LeaveStore.ts
index 9b91b6ed9..7bfaeb85f 100644
--- a/src/modules/09_leave/stores/LeaveStore.ts
+++ b/src/modules/09_leave/stores/LeaveStore.ts
@@ -5,6 +5,7 @@ import type { QTableProps } from "quasar";
 import http from "@/plugins/http";
 import config from "@/app.config";
 import { useCounterMixin } from "@/stores/mixin";
+import { calculateFiscalYear } from "@/utils/function";
 
 /** importType*/
 import type { DataProfilePosition } from "@/interface/response/main";
@@ -28,7 +29,7 @@ export const useLeavelistDataStore = defineStore("leave", () => {
   const tabView = ref<string>("list");
   /** filter*/
   const filter = reactive<DateFilter>({
-    year: new Date().getFullYear(), //*ปีในการยื่นขอใบลา(ใช้เป็น คศ.)
+    year: calculateFiscalYear(new Date()), //*ปีในการยื่นขอใบลา(ใช้เป็น คศ.)
     type: "00000000-0000-0000-0000-000000000000", //*Id ประเภทการลา
     status: "ALL", //*สถานะการของลา
     keyword: "", //keyword ค้นหา
diff --git a/src/modules/09_leave/views/06_ReportMain.vue b/src/modules/09_leave/views/06_ReportMain.vue
index 5dd4c3f23..45712cace 100644
--- a/src/modules/09_leave/views/06_ReportMain.vue
+++ b/src/modules/09_leave/views/06_ReportMain.vue
@@ -8,6 +8,7 @@ import { useRoute } from "vue-router";
 import { checkPermission } from "@/utils/permissions";
 import { useCounterMixin } from "@/stores/mixin";
 import { useStructureTree } from "@/stores/structureTree";
+import { calculateFiscalYear } from "@/utils/function";
 
 import genReportXLSX from "@/plugins/genreportxlsx";
 import http from "@/plugins/http";
@@ -39,7 +40,7 @@ const {
   hideLoader,
 } = useCounterMixin();
 
-const year = ref<number>(new Date().getFullYear());
+const year = ref<number>(calculateFiscalYear(new Date()));
 const dateStart = ref<Date>(new Date(year.value - 1, 9, 1));
 const dateEnd = ref<Date>(new Date(year.value + 1, 8, 30));
 
@@ -354,7 +355,7 @@ function clearData() {
   pdfSrc.value = undefined;
   detailReport.value = undefined;
 
-  year.value = new Date().getFullYear();
+  year.value = calculateFiscalYear(new Date());
   dateMonth.value = {
     month: new Date().getMonth(),
     year: new Date().getFullYear(),
diff --git a/src/modules/09_leave/views/07_LeaveHistoryMain.vue b/src/modules/09_leave/views/07_LeaveHistoryMain.vue
index 93aaec70e..4c511a799 100644
--- a/src/modules/09_leave/views/07_LeaveHistoryMain.vue
+++ b/src/modules/09_leave/views/07_LeaveHistoryMain.vue
@@ -9,6 +9,7 @@ import { checkPermission } from "@/utils/permissions";
 import { updateCurrentPage } from "@/utils/function";
 import { useCounterMixin } from "@/stores/mixin";
 import { useLeaveHistoryDataStore } from "@/modules/09_leave/stores/LeaveHistoryStore";
+import { calculateFiscalYear } from "@/utils/function";
 
 import type { QTableColumn } from "quasar";
 import type { DataPagination } from "@/modules/09_leave/interface/index/Main";
@@ -26,7 +27,7 @@ const { showLoader, hideLoader, messageError, dialogRemove, success } =
   useCounterMixin();
 
 const formFilter = reactive({
-  year: findYear(new Date()),
+  year: calculateFiscalYear(new Date()),
   type: "00000000-0000-0000-0000-000000000000",
   page: 1,
   pageSize: 10,
diff --git a/src/modules/11_discipline/components/4_Result/Form.vue b/src/modules/11_discipline/components/4_Result/Form.vue
index 02496968d..db7733034 100644
--- a/src/modules/11_discipline/components/4_Result/Form.vue
+++ b/src/modules/11_discipline/components/4_Result/Form.vue
@@ -8,6 +8,7 @@ import config from "@/app.config";
 import { useCounterMixin } from "@/stores/mixin";
 import { useDisciplineResultStore } from "@/modules/11_discipline/store/ResultStore";
 import { useDisciplineMainStore } from "@/modules/11_discipline/store/Main";
+import { calculateFiscalYear } from "@/utils/function";
 
 import type {
   FormData,
@@ -106,7 +107,7 @@ const formData = reactive<FormData>({
   oc: "",
   file: null,
   disciplineDisciplinary_DocResults: [],
-  year: new Date().getFullYear(),
+  year: calculateFiscalYear(new Date()),
 });
 
 /** maping ref เข้าตัวแปรเพื่อเตรียมตรวจสอบ */
@@ -826,10 +827,7 @@ watch(
     @update:modal="updatemodalPersonal"
   />
 
-  <DialogHistory
-    v-model:modal="modalHistory"
-    v-model:person-id="personalId"
-  />
+  <DialogHistory v-model:modal="modalHistory" v-model:person-id="personalId" />
 </template>
 
 <style scoped>
diff --git a/src/modules/11_discipline/components/8_AppealComplain/Form.vue b/src/modules/11_discipline/components/8_AppealComplain/Form.vue
index 122d1add7..dea819eea 100644
--- a/src/modules/11_discipline/components/8_AppealComplain/Form.vue
+++ b/src/modules/11_discipline/components/8_AppealComplain/Form.vue
@@ -9,6 +9,7 @@ import config from "@/app.config";
 import { useCounterMixin } from "@/stores/mixin";
 import { useAppealComplainStore } from "@/modules/11_discipline/store/AppealComplainStore";
 import { useDisciplineMainStore } from "@/modules/11_discipline/store/Main";
+import { calculateFiscalYear } from "@/utils/function";
 
 import type {
   MyObjectAppealRef,
@@ -75,7 +76,7 @@ const formData = reactive<any>({
   file: null,
   disciplineComplaint_Appeal_Docs: [],
   historyStatus: historyStatusOb,
-  year: new Date().getFullYear().toString(),
+  year: calculateFiscalYear(new Date()).toString(),
 });
 
 /** ตัวแปร validate */
diff --git a/src/modules/11_discipline/components/8_AppealComplain/MainPage.vue b/src/modules/11_discipline/components/8_AppealComplain/MainPage.vue
index 946073216..b19836225 100644
--- a/src/modules/11_discipline/components/8_AppealComplain/MainPage.vue
+++ b/src/modules/11_discipline/components/8_AppealComplain/MainPage.vue
@@ -8,6 +8,7 @@ import { useQuasar } from "quasar";
 import { useCounterMixin } from "@/stores/mixin";
 import { useAppealComplainStore } from "@/modules/11_discipline/store/AppealComplainStore";
 import { checkPermission } from "@/utils/permissions";
+import { calculateFiscalYear } from "@/utils/function";
 
 import type { QTableProps } from "quasar";
 import type { RowList } from "@/modules/11_discipline/interface/response/appealComplain";
@@ -36,7 +37,7 @@ const dataRow = ref<RowList[]>([]);
 const formData = reactive<any>({
   type: "ALL",
   status: "NEW",
-  year: new Date().getFullYear().toString(),
+  year: calculateFiscalYear(new Date()).toString(),
 });
 
 const total = ref<number>(0);
diff --git a/src/modules/12_evaluatePersonal/views/MainPage.vue b/src/modules/12_evaluatePersonal/views/MainPage.vue
index 7335357d4..98676a9fa 100644
--- a/src/modules/12_evaluatePersonal/views/MainPage.vue
+++ b/src/modules/12_evaluatePersonal/views/MainPage.vue
@@ -8,6 +8,7 @@ import genReportXLSX from "@/plugins/genreportxlsx";
 import http from "@/plugins/http";
 import config from "@/app.config";
 import { usePagination } from "@/composables/usePagination";
+import { calculateFiscalYear } from "@/utils/function";
 
 /** importType*/
 import type {
@@ -36,7 +37,7 @@ const organization = ref<string>("");
 const organizationOpsMain = ref<DataOption[]>([]);
 const organizationOps = ref<DataOption[]>([]);
 
-const year = ref<number>(new Date().getFullYear());
+const year = ref<number>(calculateFiscalYear(new Date()));
 const modalReport = ref<boolean>(false); //ตัวแปร popup report
 const loadingBtn = ref<boolean>(false); //ตัวแปร popup report
 const filter = ref<string>(""); //คำค้นหา
diff --git a/src/modules/13_salary/views/03_salaryRound.vue b/src/modules/13_salary/views/03_salaryRound.vue
index 12672c075..00e7d8a8c 100644
--- a/src/modules/13_salary/views/03_salaryRound.vue
+++ b/src/modules/13_salary/views/03_salaryRound.vue
@@ -6,6 +6,7 @@ import { checkPermission } from "@/utils/permissions";
 import { updateCurrentPage } from "@/utils/function";
 import { useCounterMixin } from "@/stores/mixin";
 import { useSalaryDataStore } from "@/modules/13_salary/store/SalaryStore";
+import { calculateFiscalYear } from "@/utils/function";
 import config from "@/app.config";
 import http from "@/plugins/http";
 
@@ -249,7 +250,7 @@ watch(
 
 /** Hooklifecycle */
 onMounted(async () => {
-  year.value = new Date().getFullYear();
+  year.value = calculateFiscalYear(new Date());
   dataStore.visibleColumns = visibleColumns.value;
   dataStore.columns = columns.value;
   getData();
diff --git a/src/modules/13_salary/views/04_salaryLists.vue b/src/modules/13_salary/views/04_salaryLists.vue
index 020e2c4f5..29281be7b 100644
--- a/src/modules/13_salary/views/04_salaryLists.vue
+++ b/src/modules/13_salary/views/04_salaryLists.vue
@@ -11,6 +11,7 @@ import {
 } from "@/utils/permissions";
 import config from "@/app.config";
 import http from "@/plugins/http";
+import { calculateFiscalYear } from "@/utils/function";
 
 /** importType*/
 import type {
@@ -36,7 +37,7 @@ const { messageError, showLoader, hideLoader, success, dialogConfirm } =
   useCounterMixin();
 
 /** ตัวแปร*/
-const year = ref<number>(new Date().getFullYear()); //ปีงบประมาณ
+const year = ref<number>(calculateFiscalYear(new Date())); //ปีงบประมาณ
 const roundFilter = ref<any>(); //รอบการขึ้นเงินเดือน
 const agencyFilter = ref<string>(""); //หน่วยงาน
 const snapFilter = ref<string>(""); //รอบ
diff --git a/src/modules/13_salary/views/05_salaryListsEmployee.vue b/src/modules/13_salary/views/05_salaryListsEmployee.vue
index db0483cea..559ad3e2f 100644
--- a/src/modules/13_salary/views/05_salaryListsEmployee.vue
+++ b/src/modules/13_salary/views/05_salaryListsEmployee.vue
@@ -11,6 +11,7 @@ import {
 } from "@/utils/permissions";
 import config from "@/app.config";
 import http from "@/plugins/http";
+import { calculateFiscalYear } from "@/utils/function";
 
 /** importType*/
 import type {
@@ -35,7 +36,7 @@ const $q = useQuasar();
 const { messageError, showLoader, hideLoader } = useCounterMixin();
 
 /** ตัวแปร*/
-const year = ref<number>(new Date().getFullYear()); //ปีงบประมาณ
+const year = ref<number>(calculateFiscalYear(new Date())); //ปีงบประมาณ
 const roundFilter = ref<any>(); //รอบการขึ้นเงินเดือน
 const agencyFilter = ref<string>(""); //หน่วยงาน
 const snapFilter = ref<string>(""); //รอบ
diff --git a/src/modules/14_KPI/components/Tab/Dialog/DialogEvalute.vue b/src/modules/14_KPI/components/Tab/Dialog/DialogEvalute.vue
index 93fce96a5..9b14cc91a 100644
--- a/src/modules/14_KPI/components/Tab/Dialog/DialogEvalute.vue
+++ b/src/modules/14_KPI/components/Tab/Dialog/DialogEvalute.vue
@@ -8,6 +8,7 @@ import http from "@/plugins/http";
 import { useRouter } from "vue-router";
 import { useCounterMixin } from "@/stores/mixin";
 import { useRoute } from "vue-router";
+import { calculateFiscalYear } from "@/utils/function";
 
 import type {
   DataOption,
@@ -47,7 +48,7 @@ const typeOps = ref<typeOp[]>([
 ]);
 
 const modalDialog = defineModel<boolean>("modal", { required: true });
-const yearDialog = ref<number | any>(new Date().getFullYear());
+const yearDialog = ref<number | any>(calculateFiscalYear(new Date())); //ปีงบประมาณ
 const roundDialgOp = ref<DataOption[]>([]);
 const isRoundClose = ref<boolean>(false);
 
@@ -144,7 +145,7 @@ const columnsRespondent = ref<QTableProps["columns"]>([
 function onCloseDialog() {
   modalDialog.value = false;
   formRound.kpiPeriodId = { id: "", name: "", isClosed: false };
-  yearDialog.value = new Date().getFullYear();
+  yearDialog.value = calculateFiscalYear(new Date());
   rows.value = [];
   formRound.evaluatorId = "";
   formRound.commanderId = "";
diff --git a/src/modules/14_KPI/components/results/tableIndividual.vue b/src/modules/14_KPI/components/results/tableIndividual.vue
index 6fd5ca836..2ac8741d8 100644
--- a/src/modules/14_KPI/components/results/tableIndividual.vue
+++ b/src/modules/14_KPI/components/results/tableIndividual.vue
@@ -7,6 +7,7 @@ import config from "@/app.config";
 import { useCounterMixin } from "@/stores/mixin";
 import { useKpiDataStore } from "@/modules/14_KPI/store";
 import { checkPermission } from "@/utils/permissions";
+import { calculateFiscalYear } from "@/utils/function";
 
 /** importType*/
 import type { QTableProps } from "quasar";
@@ -133,7 +134,7 @@ const pagination = ref({
 });
 
 /** ตัวแปร*/
-const year = ref<number | null>(new Date().getFullYear()); //ปีงบประมาณ
+const year = ref<number | null>(calculateFiscalYear(new Date())); //ปีงบประมาณ
 const roundOp = ref<DataOption[]>([]); // รายการรอบการประเมิน
 
 /** function fetch รายการแผนพัฒนาการปฏิบัติราชการรายบุคคลย้อนหลัง*/
diff --git a/src/modules/14_KPI/components/results/tableResults.vue b/src/modules/14_KPI/components/results/tableResults.vue
index 90c599756..3c298ba39 100644
--- a/src/modules/14_KPI/components/results/tableResults.vue
+++ b/src/modules/14_KPI/components/results/tableResults.vue
@@ -7,6 +7,7 @@ import config from "@/app.config";
 import { useCounterMixin } from "@/stores/mixin";
 import { useKpiDataStore } from "@/modules/14_KPI/store";
 import { checkPermission } from "@/utils/permissions";
+import { calculateFiscalYear } from "@/utils/function";
 
 /** importType*/
 import type { QTableProps } from "quasar";
@@ -167,7 +168,7 @@ const pagination = ref({
 });
 
 /** ตัวแปร*/
-const year = ref<number | null>(new Date().getFullYear()); //ปีงบประมาณ
+const year = ref<number | null>(calculateFiscalYear(new Date())); //ปีงบประมาณ
 const roundOp = ref<DataOption[]>([]); // รายการรอบการประเมิน
 const resultOp = ref<DataOption[]>(store.resultsOptions);
 
diff --git a/src/modules/14_KPI/views/01_kpiRound.vue b/src/modules/14_KPI/views/01_kpiRound.vue
index c13ba9dad..5dd8d4ff9 100644
--- a/src/modules/14_KPI/views/01_kpiRound.vue
+++ b/src/modules/14_KPI/views/01_kpiRound.vue
@@ -6,6 +6,7 @@ import { useCounterMixin } from "@/stores/mixin";
 import { checkPermission } from "@/utils/permissions";
 import http from "@/plugins/http";
 import config from "@/app.config";
+import { calculateFiscalYear } from "@/utils/function";
 
 /** importType*/
 import type {
@@ -102,7 +103,7 @@ const visibleColumns = ref<string[]>([
 const formQuery = reactive<FormQueryRound>({
   page: 1, //หน้า
   pageSize: 10, //จำนวนหน้า
-  year: new Date().getFullYear(), //ปีงประมาณ
+  year: calculateFiscalYear(new Date()), //ปีงประมาณ
   keyword: "",
 });
 const modalDialog = ref<boolean>(false); //modal เพิ่มรอบการประเมินผลการปฏิบัติหน้าที่ราชการ
diff --git a/src/modules/14_KPI/views/02_kpiLists.vue b/src/modules/14_KPI/views/02_kpiLists.vue
index 6c3f8b0ce..4395810b1 100644
--- a/src/modules/14_KPI/views/02_kpiLists.vue
+++ b/src/modules/14_KPI/views/02_kpiLists.vue
@@ -6,6 +6,7 @@ import { useRouter } from "vue-router";
 import { useCounterMixin } from "@/stores/mixin";
 import { useKpiDataStore } from "@/modules/14_KPI/store";
 import { checkPermission } from "@/utils/permissions";
+import { calculateFiscalYear } from "@/utils/function";
 import config from "@/app.config";
 import http from "@/plugins/http";
 
@@ -22,7 +23,7 @@ const router = useRouter();
 const store = useKpiDataStore();
 const { showLoader, hideLoader, messageError, date2Thai } = useCounterMixin();
 
-const year = ref<number | null>(new Date().getFullYear()); //ปีงบประมาณ
+const year = ref<number | null>(calculateFiscalYear(new Date())); //ปีงบประมาณ
 const formQuery = reactive({
   page: 1, //หน้า
   pageSize: 10, //จำนวนแถวต่อหน้า
diff --git a/src/modules/14_KPI/views/report.vue b/src/modules/14_KPI/views/report.vue
index af487406c..f723dd697 100644
--- a/src/modules/14_KPI/views/report.vue
+++ b/src/modules/14_KPI/views/report.vue
@@ -7,6 +7,7 @@ import http from "@/plugins/http";
 import axios from "axios";
 import genReport from "@/plugins/genreport";
 import LoadView from "@/components/LoadView.vue";
+import { calculateFiscalYear } from "@/utils/function";
 /**
  * importType
  */
@@ -45,7 +46,7 @@ const route = useRoute();
  */
 const fullNameShow = ref<string>("");
 const isLoadPDF = ref<boolean>(false);
-const year = ref<number | null>(new Date().getFullYear());
+const year = ref<number | null>(calculateFiscalYear(new Date())); //ปีงบประมาณ
 const round = ref<string>("");
 const organization = ref<string>("");
 const roundOp = ref<DataOption[]>([]);
@@ -487,7 +488,7 @@ watch(
 
 function clearFilter() {
   organization.value = "";
-  year.value = new Date().getFullYear();
+  year.value = calculateFiscalYear(new Date());
   typeReport.value = "KPI1";
   pdfSrc.value = undefined;
   dataDownload.value = undefined;
diff --git a/src/modules/15_development/components/BasicInfo.vue b/src/modules/15_development/components/BasicInfo.vue
index 9efe1d268..797e03d9b 100644
--- a/src/modules/15_development/components/BasicInfo.vue
+++ b/src/modules/15_development/components/BasicInfo.vue
@@ -7,6 +7,7 @@ import http from "@/plugins/http";
 import config from "@/app.config";
 import { useStructureTree } from "@/stores/structureTree";
 import { useCounterMixin } from "@/stores/mixin";
+import { calculateFiscalYear } from "@/utils/function";
 
 /** importType*/
 import type { FormBasicinfo } from "@/modules/15_development/interface/request/Main";
@@ -34,7 +35,7 @@ const checkRoutePermission = ref<boolean>(
 ); // check ชื่อ route
 
 const formData = reactive<FormBasicinfo>({
-  year: new Date().getFullYear(), //ปี
+  year: calculateFiscalYear(new Date()), //ปี
   projectName: "", //ชืื่อ
   reason: "", //หลักการเเละเหตุผล
   objective: "", //วัตถุประสงค์
@@ -47,7 +48,7 @@ const orgName = ref<string>(""); //ชื่อ หน่วยงาน/ส่
 const node = ref<any[]>([]); //โครงสร้าง หน่วยงาน/ส่วนราชการ
 const filter = ref<string>(""); //input ค้นหา
 const expanded = ref<string[]>([]);
-const nodeDnaId = ref<string>('');
+const nodeDnaId = ref<string>("");
 
 /**
  * function fetch ข้อมูลเบื้องต้น
@@ -67,7 +68,7 @@ async function fetchData(id: string) {
       formData.nodeId = data.nodeId;
       formData.node = data.node;
       formData.orgRevisionId = data.revisionId;
-      nodeDnaId.value = data.nodeDnaId
+      nodeDnaId.value = data.nodeDnaId;
 
       const arrayExpanded = [
         data.root,
@@ -126,7 +127,7 @@ function updateSelected(data: DataTree) {
   formData.node = data.orgLevel;
   formData.nodeId = data.orgTreeId;
   formData.orgRevisionId = data.orgRevisionId;
-  nodeDnaId.value = data.orgTreeDnaId
+  nodeDnaId.value = data.orgTreeDnaId;
   props.onCheckChangeData();
 }
 
diff --git a/src/modules/15_development/store/developmentStore.ts b/src/modules/15_development/store/developmentStore.ts
index 7acee6851..e5ab608ae 100644
--- a/src/modules/15_development/store/developmentStore.ts
+++ b/src/modules/15_development/store/developmentStore.ts
@@ -1,6 +1,8 @@
 import { defineStore } from "pinia";
 import { reactive, ref } from "vue";
 
+import { calculateFiscalYear } from "@/utils/function";
+
 import type { QTableProps } from "quasar";
 import type { FormAddProject } from "@/modules/15_development/interface/request/Main";
 
@@ -12,7 +14,7 @@ export const useDevelopmentDataStore = defineStore(
     const projectStatus = ref<string>("ONGOING");
     const statusEdit = ref<boolean>(false);
     const formAddProject = reactive<FormAddProject>({
-      year: new Date().getFullYear(), //ปีงบประมาณ*
+      year: calculateFiscalYear(new Date()), //ปีงบประมาณ*
       projectName: "", //ชื่อโครงการ/กิจกรรม/หลักสูตร*
       reason: "", //หลักการและเหตุผล
       objective: "", //วัตถุประสงค์
@@ -65,7 +67,7 @@ export const useDevelopmentDataStore = defineStore(
 
     function clearFormAddProject() {
       /** ข้อมูลเบื้องต้น*/
-      formAddProject.year = new Date().getFullYear();
+      formAddProject.year = calculateFiscalYear(new Date());
       formAddProject.projectName = "";
       formAddProject.reason = " ";
       formAddProject.objective = "";
diff --git a/src/modules/15_development/views/EmployeeHistory.vue b/src/modules/15_development/views/EmployeeHistory.vue
index 51d8ffb1d..a0f99a578 100644
--- a/src/modules/15_development/views/EmployeeHistory.vue
+++ b/src/modules/15_development/views/EmployeeHistory.vue
@@ -9,6 +9,7 @@ import { useRoute, useRouter } from "vue-router";
 import { useDevelopmentDataStore } from "@/modules/15_development/store/developmentStore";
 import { useCounterMixin } from "@/stores/mixin";
 import { checkPermission } from "@/utils/permissions";
+import { calculateFiscalYear } from "@/utils/function";
 
 import type {
   NewPagination,
@@ -29,7 +30,7 @@ const formFilter = reactive({
   page: 1,
   pageSize: 10,
   keyword: "",
-  year: new Date().getFullYear(),
+  year: calculateFiscalYear(new Date()), //ปีงบประมาณ
 });
 
 const pagination = ref({
@@ -195,7 +196,7 @@ function onEdit(id: string) {
 /** ดึงข้อมูล */
 async function getData() {
   showLoader();
-  formFilter.keyword = formFilter.keyword.trim()
+  formFilter.keyword = formFilter.keyword.trim();
   await http
     .post(config.API.developmentHistoryList("employee"), formFilter)
     .then((res) => {
diff --git a/src/modules/15_development/views/History.vue b/src/modules/15_development/views/History.vue
index faebe564c..ed327ce9e 100644
--- a/src/modules/15_development/views/History.vue
+++ b/src/modules/15_development/views/History.vue
@@ -9,6 +9,7 @@ import genReportXLSX from "@/plugins/genreportxlsx";
 import { useDevelopmentDataStore } from "@/modules/15_development/store/developmentStore";
 import { useCounterMixin } from "@/stores/mixin";
 import { checkPermission } from "@/utils/permissions";
+import { calculateFiscalYear } from "@/utils/function";
 
 /**
  * importType
@@ -32,7 +33,7 @@ const formFilter = reactive({
   page: 1,
   pageSize: 10,
   keyword: "",
-  year: new Date().getFullYear(),
+  year: calculateFiscalYear(new Date()), //ปีงบประมาณ
 });
 const agencyOp = ref<DataOption[]>([]); // หน่วยงาน
 
diff --git a/src/modules/15_development/views/MainPage.vue b/src/modules/15_development/views/MainPage.vue
index f91aa3800..781561949 100644
--- a/src/modules/15_development/views/MainPage.vue
+++ b/src/modules/15_development/views/MainPage.vue
@@ -11,6 +11,7 @@ import genReportXLSX from "@/plugins/genreportxlsx";
 import { useDevelopmentDataStore } from "@/modules/15_development/store/developmentStore";
 import { useCounterMixin } from "@/stores/mixin";
 import { updateCurrentPage } from "@/utils/function";
+import { calculateFiscalYear } from "@/utils/function";
 
 /**importType*/
 import type {
@@ -107,7 +108,7 @@ const formProject = reactive<FormProject>({
 
 /** formQuery */
 const formQuery = reactive<FormQueryListProject>({
-  year: new Date().getFullYear(),
+  year: calculateFiscalYear(new Date()), //ปีงบประมาณ
   page: 1,
   pageSize: 10,
   org: "1",
diff --git a/src/modules/15_development/views/Scholarship.vue b/src/modules/15_development/views/Scholarship.vue
index 67f82ea12..db79f7dc8 100644
--- a/src/modules/15_development/views/Scholarship.vue
+++ b/src/modules/15_development/views/Scholarship.vue
@@ -8,6 +8,7 @@ import config from "@/app.config";
 import { checkPermission } from "@/utils/permissions";
 import { useCounterMixin } from "@/stores/mixin";
 import genReportXLSX from "@/plugins/genreportxlsx";
+import { calculateFiscalYear } from "@/utils/function";
 
 import type {
   DataOption,
@@ -143,7 +144,7 @@ const scholarshipTypeOp = ref<DataOption[]>([
 const formQuery = reactive({
   page: 1,
   pageSize: 10,
-  year: new Date().getFullYear(),
+  year: calculateFiscalYear(new Date()), //ปีงบประมาณ
   type: "DOMESTICE",
   keyword: "",
 });
diff --git a/src/modules/18_command/views/lists.vue b/src/modules/18_command/views/lists.vue
index afc20262d..7df375d27 100644
--- a/src/modules/18_command/views/lists.vue
+++ b/src/modules/18_command/views/lists.vue
@@ -6,6 +6,7 @@ import { checkPermission } from "@/utils/permissions";
 import { useCounterMixin } from "@/stores/mixin";
 import { useCommandListStore } from "@/modules/18_command/store/ListStore";
 import { usePagination } from "@/composables/usePagination";
+import { calculateFiscalYear } from "@/utils/function";
 import http from "@/plugins/http";
 import config from "@/app.config";
 
@@ -36,7 +37,7 @@ const tabsManu = ref<ItemTabs[]>([
 ]);
 //ฟอร์มช้อมูลการค้นหา
 const queryParams = reactive<FormQuery>({
-  year: new Date().getFullYear(), //ปีงบประมาณ
+  year: calculateFiscalYear(new Date()), //ปีงบประมาณ
   keyword: "", //คำค้นหา
   commandTypeId: "",
 });
diff --git a/src/modules/21_report/views/03_reportDevelopment.vue b/src/modules/21_report/views/03_reportDevelopment.vue
index 7f9ddb9f9..cc5f3574d 100644
--- a/src/modules/21_report/views/03_reportDevelopment.vue
+++ b/src/modules/21_report/views/03_reportDevelopment.vue
@@ -10,6 +10,7 @@ import http from "@/plugins/http";
 import config from "@/app.config";
 import { checkPermission } from "@/utils/permissions";
 import { useCounterMixin } from "@/stores/mixin";
+import { calculateFiscalYear } from "@/utils/function";
 
 import type {
   OptionData,
@@ -23,7 +24,7 @@ const route = useRoute();
 
 const { messageError, showLoader, hideLoader } = useCounterMixin();
 const loadingBtn = ref<boolean>(false);
-const year = ref<number>(new Date().getFullYear());
+const year = ref<number>(calculateFiscalYear(new Date())); //ปีงบประมาณ
 
 const organization = ref<string>("");
 const organizationOpsMain = ref<OptionData[]>([]);
@@ -194,7 +195,7 @@ async function getOrg(id: string) {
 }
 
 function clearFilter() {
-  year.value = new Date().getFullYear();
+  year.value = calculateFiscalYear(new Date());
   organization.value = "";
   typeReport.value = "";
   pdfSrc.value = undefined;
@@ -323,7 +324,8 @@ onMounted(async () => {
                       option-value="id"
                       option-label="name"
                       @update:model-value="
-                        (organization = ''), (year = new Date().getFullYear())
+                        (organization = ''),
+                          (year = calculateFiscalYear(new Date()))
                       "
                     />
                   </div>
diff --git a/src/modules/21_report/views/04_reportEvaluate.vue b/src/modules/21_report/views/04_reportEvaluate.vue
index a2e2b674d..0388de897 100644
--- a/src/modules/21_report/views/04_reportEvaluate.vue
+++ b/src/modules/21_report/views/04_reportEvaluate.vue
@@ -9,6 +9,7 @@ import config from "@/app.config";
 import genReportXLSX from "@/plugins/genreportxlsx";
 import { useStructureTree } from "@/stores/structureTree";
 import { checkPermission } from "@/utils/permissions";
+import { calculateFiscalYear } from "@/utils/function";
 
 import { useCounterMixin } from "@/stores/mixin";
 
@@ -39,7 +40,7 @@ const organizationName = computed(() => {
   );
 });
 
-const year = ref<number>(new Date().getFullYear());
+const year = ref<number>(calculateFiscalYear(new Date())); //ปีงบประมาณ
 
 const detailReport = ref<any>();
 
@@ -157,7 +158,7 @@ function nextPage() {
 function clearFilter() {
   pdfSrc.value = undefined;
   detailReport.value = undefined;
-  year.value = new Date().getFullYear();
+  year.value = calculateFiscalYear(new Date());
   // org.value = "";
   nodeId.value = "";
   // nodeName.value = "";
diff --git a/src/modules/21_report/views/05_reportSalary.vue b/src/modules/21_report/views/05_reportSalary.vue
index 0cd90d6ed..dafbfd3be 100644
--- a/src/modules/21_report/views/05_reportSalary.vue
+++ b/src/modules/21_report/views/05_reportSalary.vue
@@ -9,6 +9,7 @@ import { useCounterMixin } from "@/stores/mixin";
 import { useSalaryListSDataStore } from "@/modules/13_salary/store/SalaryListsStore";
 import { useSalaryEmployeeListSDataStore } from "@/modules/13_salary/store/SalaryEmployeeListsStore";
 import genReportXLSX from "@/plugins/genreportxlsx";
+import { calculateFiscalYear } from "@/utils/function";
 import config from "@/app.config";
 import http from "@/plugins/http";
 
@@ -27,7 +28,7 @@ const checkId = ref<string>("");
 const isLoadStructureTree = ref<boolean>(true);
 // const expandedModal = ref<boolean>(false);
 // const org = ref<string>("");
-const year = ref<number>(new Date().getFullYear());
+const year = ref<number>(calculateFiscalYear(new Date())); //ปีงบประมาณ
 const isLoadFilePdf = ref<boolean>(false);
 const employeeClass = ref<string>("officer");
 const employeeClassOption = ref<DataOption[]>([
@@ -327,7 +328,7 @@ function nextPage() {
 
 function clearFilter() {
   checkId.value = "";
-  year.value = new Date().getFullYear();
+  year.value = calculateFiscalYear(new Date());
   round.value = "";
   group.value = "GROUP1";
   report.value = null;
@@ -538,7 +539,9 @@ onMounted(() => {
                           <q-tooltip>
                             <div v-if="group === 'GROUP1'">
                               <div>ทั่วไป: ปฏิบัติงาน, ชำนาญงาน, อาวุโส</div>
-                              <div>วิชาการ: ปฏิบัติการ, ชำนาญการ, ชำนาญการพิเศษ</div>
+                              <div>
+                                วิชาการ: ปฏิบัติการ, ชำนาญการ, ชำนาญการพิเศษ
+                              </div>
                               <div>อำนวยการ: ต้น</div>
                             </div>
                             <div v-else>
diff --git a/src/router/index.ts b/src/router/index.ts
index 770e57f63..3fc48e205 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -105,6 +105,13 @@ const router = createRouter({
       name: "auth",
       component: () => import("@/views/auth.vue"),
     },
+    {
+      path: "/test-times",
+      name: "test-times",
+      component: () => {
+        return import("@/views/TestTimes.vue");
+      },
+    },
   ],
 
   scrollBehavior(to, from, savedPosition) {
diff --git a/src/utils/function.ts b/src/utils/function.ts
index cab7df1ed..445aaee30 100644
--- a/src/utils/function.ts
+++ b/src/utils/function.ts
@@ -17,3 +17,14 @@ export async function updateCurrentPage(
   }
   return page;
 }
+
+/**
+ * คำนวณปีงบประมาณ
+ *
+ * @param date วันที่ปัจจุบัน
+ * @returns ปีงบประมาณ
+ */
+export function calculateFiscalYear(date: Date) {
+  const month = date.getMonth() + 1;
+  return month >= 10 ? date.getFullYear() + 1 : date.getFullYear();
+}