diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts
index a92cf18..9e511f3 100644
--- a/src/controllers/ReportController.ts
+++ b/src/controllers/ReportController.ts
@@ -556,11 +556,12 @@ export class ReportController extends Controller {
         template: "gov1-02",
         reportName: "gov1-02",
         data: {
-          date: Extension.ToThaiNumber(
-            Extension.ToThaiFullDate2(new Date(`${salaryPeriod.year}-03-01`)),
-          ),
+          // date: Extension.ToThaiNumber(
+          //   Extension.ToThaiFullDate2(new Date(`${salaryPeriod.year}-03-01`)), 
+          // ),
           year: Extension.ToThaiNumber(String(Extension.ToThaiYear(salaryPeriod.year))),
-          dateNow: Extension.ToThaiNumber(Extension.ToThaiShortDate(new Date())),
+          yearSlice: Extension.ToThaiNumber(String(Extension.ToThaiYear(salaryPeriod.year)).slice(-2)),
+          // dateNow: Extension.ToThaiNumber(Extension.ToThaiShortDate(new Date())),
           agency: agency,
           data1: formattedData1,
           data2: formattedData2,
@@ -1025,11 +1026,12 @@ export class ReportController extends Controller {
         template: "gov2-02",
         reportName: "gov2-02",
         data: {
-          date: Extension.ToThaiNumber(
-            Extension.ToThaiFullDate2(new Date(`${salaryPeriod.year}-03-01`)),
-          ),
+          // date: Extension.ToThaiNumber(
+          //   Extension.ToThaiFullDate2(new Date(`${salaryPeriod.year}-03-01`)),
+          // ),
           year: Extension.ToThaiNumber(String(Extension.ToThaiYear(salaryPeriod.year))),
-          dateNow: Extension.ToThaiNumber(Extension.ToThaiShortDate(new Date())),
+          yearSlice: Extension.ToThaiNumber(String(Extension.ToThaiYear(salaryPeriod.year)).slice(-2)),
+          // dateNow: Extension.ToThaiNumber(Extension.ToThaiShortDate(new Date())),
           agency: agency,
           data1: formattedData1,
           data2: formattedData2,