From a61bc8fc77d5b47f2d2b0128a7cb72ebe09bcd25 Mon Sep 17 00:00:00 2001 From: Suphonchai Phoonsawat Date: Wed, 3 Jan 2024 17:07:04 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=A7=E0=B8=B1?= =?UTF-8?q?=E0=B8=99=E0=B8=97=E0=B8=B5=E0=B9=88=E0=B9=83=E0=B8=99=E0=B8=A3?= =?UTF-8?q?=E0=B8=B2=E0=B8=A2=E0=B8=87=E0=B8=B2=E0=B8=99=E0=B9=80=E0=B8=9B?= =?UTF-8?q?=E0=B9=87=E0=B8=99=E0=B9=80=E0=B8=A5=E0=B8=82=E0=B9=84=E0=B8=97?= =?UTF-8?q?=E0=B8=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/LeaveReportController.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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,