diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts
index 35c378a..a191b7d 100644
--- a/src/controllers/ReportController.ts
+++ b/src/controllers/ReportController.ts
@@ -456,7 +456,7 @@ export class ReportController extends Controller {
             Extension.ToThaiFullDate(new Date(`${salaryPeriod.year}-03-01`)),
           ),
           year: Extension.ToThaiNumber(String(Extension.ToThaiYear(salaryPeriod.year))),
-          dateNow: Extension.ToThaiNumber(Extension.ToThaiFullDate(new Date())),
+          dateNow: Extension.ToThaiNumber(Extension.ToThaiShortDate(new Date())),
           agency: agency,
           data1: formattedData1,
           data2: formattedData2,
@@ -925,7 +925,7 @@ export class ReportController extends Controller {
             Extension.ToThaiFullDate(new Date(`${salaryPeriod.year}-03-01`)),
           ),
           year: Extension.ToThaiNumber(String(Extension.ToThaiYear(salaryPeriod.year))),
-          dateNow: Extension.ToThaiNumber(Extension.ToThaiFullDate(new Date())),
+          dateNow: Extension.ToThaiNumber(Extension.ToThaiShortDate(new Date())),
           agency: agency,
           data1: formattedData1,
           data2: formattedData2,
diff --git a/src/interfaces/extension.ts b/src/interfaces/extension.ts
index 1355587..48975b6 100644
--- a/src/interfaces/extension.ts
+++ b/src/interfaces/extension.ts
@@ -30,6 +30,37 @@ class Extension {
     }
   }
 
+  public static ToThaiShortMonth(value: number) {
+    switch (value) {
+      case 1:
+        return "ม.ค.";
+      case 2:
+        return "ก.พ.";
+      case 3:
+        return "มี.ค.";
+      case 4:
+        return "เม.ย.";
+      case 5:
+        return "พ.ค.";
+      case 6:
+        return "มิ.ย.";
+      case 7:
+        return "ก.ค.";
+      case 8:
+        return "ส.ค.";
+      case 9:
+        return "ก.ย.";
+      case 10:
+        return "ต.ค.";
+      case 11:
+        return "พ.ย.";
+      case 12:
+        return "ธ.ค.";
+      default:
+        return "";
+    }
+  }
+
   public static ToThaiYear(value: number) {
     if (value < 2400) return value + 543;
     else return value;
@@ -67,6 +98,18 @@ class Extension {
     );
   }
 
+  public static ToThaiShortDate(value: Date) {
+    let yy = value.getFullYear() < 2400 ? value.getFullYear() + 543 : value.getFullYear();
+    return (
+      "วันที่ " + 
+      value.getDate() +
+      " " +
+      Extension.ToThaiShortMonth(value.getMonth() + 1) +
+      " " +
+      yy.toString().slice(-2)
+    );
+  }
+
   public static sumObjectValues(array: any, propertyName: any) {
     let sum = 0;
     for (let i = 0; i < array.length; i++) {