diff --git a/BMA.EHR.Leave.Service/Controllers/LeaveReportController.cs b/BMA.EHR.Leave.Service/Controllers/LeaveReportController.cs
index 46f6b427..fbd9774b 100644
--- a/BMA.EHR.Leave.Service/Controllers/LeaveReportController.cs
+++ b/BMA.EHR.Leave.Service/Controllers/LeaveReportController.cs
@@ -883,8 +883,8 @@ namespace BMA.EHR.Leave.Service.Controllers
                     reportName = "LeaveHalfYear-Officer",
                     data = new
                     {
-                        leaveDateStart = req.StartDate.Date.ToThaiShortDate(),
-                        leaveDateEnd = req.EndDate.Date.ToThaiShortDate(),
+                        leaveDateStart = req.StartDate.Date.ToThaiShortDate().ToThaiNumber(),
+                        leaveDateEnd = req.EndDate.Date.ToThaiShortDate().ToThaiNumber(),
                         organizationName = profile.First().Oc ?? "",
                         leaveTitleType = req.Type == "FULL" ? "หนึ่งปี" : "ครึ่งปี",
                         employees = employees
@@ -1051,8 +1051,8 @@ namespace BMA.EHR.Leave.Service.Controllers
                     reportName = "LeaveHalfYear-Employee",
                     data = new
                     {
-                        leaveDateStart = req.StartDate.Date.ToThaiShortDate(),
-                        leaveDateEnd = req.EndDate.Date.ToThaiShortDate(),
+                        leaveDateStart = req.StartDate.Date.ToThaiShortDate().ToThaiNumber(),
+                        leaveDateEnd = req.EndDate.Date.ToThaiShortDate().ToThaiNumber(),
                         organizationName = profile.First().Oc ?? "",
                         leaveTitleType = req.Type == "FULL" ? "หนึ่งปี" : "ครึ่งปี",
                         employees = employees
@@ -1137,7 +1137,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                 {
                     DateTimeStamp = date.Date.ToThaiFullDate(),
                     officerTotal = profile.Count,
-                    workTotal = count - 1,
+                    workTotal = (count - 1),
                     restTotal = 0,
                     sickTotal = 0,
                     lateTotal = 0,