From 1379dab5567abac23d4fd0b005c683457a5b077c Mon Sep 17 00:00:00 2001 From: Suphonchai Phoonsawat Date: Tue, 28 Apr 2026 15:42:41 +0700 Subject: [PATCH 1/2] fix issue #2441 --- .../Controllers/LeaveReportController.cs | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/BMA.EHR.Leave/Controllers/LeaveReportController.cs b/BMA.EHR.Leave/Controllers/LeaveReportController.cs index e726aabd..1d9bf465 100644 --- a/BMA.EHR.Leave/Controllers/LeaveReportController.cs +++ b/BMA.EHR.Leave/Controllers/LeaveReportController.cs @@ -1533,17 +1533,21 @@ namespace BMA.EHR.Leave.Service.Controllers coupleCount = coupleCount, therapyCount = therapyCount, - leaveTotal = sickCount + - maternityCount + - wifeCount + - personalCount + - restCount + - ordainCount + - absentCount + - studyCount + - agencyCount + - coupleCount + - therapyCount + // ระบบนับจำนวนครั้ง วันลาพักผ่อนด้วย ซึ่งตามระเบียบไม่ให้นับจำนวนครั้งวันลาพักผ่อนครับ จำนวนครั้งนับเฉพาะ ป่วย กับ กิจ + leaveTotal = sickCount + + personalCount + + // leaveTotal = sickCount + + // maternityCount + + // wifeCount + + // personalCount + + // restCount + + // ordainCount + + // absentCount + + // studyCount + + // agencyCount + + // coupleCount + + // therapyCount }; From 361ded207836eda891b2b1d283b6115f3cc0f01f Mon Sep 17 00:00:00 2001 From: Suphonchai Phoonsawat Date: Tue, 28 Apr 2026 15:56:19 +0700 Subject: [PATCH 2/2] fix issue #2444 --- .../Leaves/LeaveRequests/LeaveRequestRepository.cs | 2 +- BMA.EHR.Leave/Controllers/LeaveReportController.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs b/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs index 54f1488d..751011b1 100644 --- a/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs +++ b/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs @@ -1877,7 +1877,7 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests .Include(x => x.Type) .Where(x => x.KeycloakUserId == keycloakUserId) .Where(x => x.Type.Id == leaveTypeId) - .Where(x => (x.DateSendLeave ?? x.CreatedAt).Date >= startDate && (x.DateSendLeave ??x.CreatedAt).Date < endDate) + .Where(x => ((x.DateSendLeave ?? x.CreatedAt).Date >= startDate && (x.DateSendLeave ??x.CreatedAt).Date < endDate)) //.Where(x => x.LeaveStartDate.Date >= startDate.Date && x.LeaveStartDate.Date <= endDate.Date) .Where(x => x.LeaveStatus == "APPROVE" || x.LeaveStatus == "DELETING") .ToListAsync(); diff --git a/BMA.EHR.Leave/Controllers/LeaveReportController.cs b/BMA.EHR.Leave/Controllers/LeaveReportController.cs index 1d9bf465..8ced9487 100644 --- a/BMA.EHR.Leave/Controllers/LeaveReportController.cs +++ b/BMA.EHR.Leave/Controllers/LeaveReportController.cs @@ -156,8 +156,8 @@ namespace BMA.EHR.Leave.Service.Controllers await _leaveRequestRepository.GetLastLeaveRequestByTypeForUserAsync2(data.KeycloakUserId, data.Type.Id, data.CreatedAt); - var startFiscalYear = new DateTime(data.LeaveStartDate.Year - 1, 10, 1); - var endFiscalYear = data.CreatedAt; + var startFiscalYear = (new DateTime(data.LeaveStartDate.Year - 1, 10, 1)).Date; + var endFiscalYear = (data.DateSendLeave ?? data.CreatedAt).Date; var thisYear = data.LeaveStartDate.Year; var toDay = data.LeaveStartDate.Date;