From f3d74681f3b2adbdfaaf9f83b6b06a9de2fc1e6c Mon Sep 17 00:00:00 2001 From: Suphonchai Phoonsawat Date: Wed, 7 May 2025 15:35:34 +0700 Subject: [PATCH] fix #1512 --- .../Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs b/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs index 8ecec94a..0968b3b6 100644 --- a/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs +++ b/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs @@ -1299,7 +1299,7 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests .Include(x => x.Type) //.Where(x => x.LeaveStartDate.Year == year) .Where(x => x.LeaveStartDate.Date >= startFiscalDate && x.LeaveStartDate.Date <= endFiscalDate) // fix issue : #729 - .Where(x => x.LeaveStatus == "DELETE") + .Where(x => x.LeaveStatus == "DELETE" && x.LeaveCancelStatus == "APPROVE") .ToListAsync(); var res = (from d in data