diff --git a/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs b/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs
index 54107021..130dba3b 100644
--- a/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs
+++ b/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs
@@ -569,6 +569,22 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
             return data;
         }
 
+        public async Task<LeaveRequest?> GetLastLeaveRequestByTypeForUserAsync2(Guid keycloakUserId, Guid leaveTypeId, DateTime beforeDate)
+        {
+            var data = await _dbContext.Set<LeaveRequest>().AsQueryable().AsNoTracking()
+                            .Include(x => x.Type)
+                            //.Where(x => x.LeaveStartDate.Date < beforeDate.Date)
+                            .Where(x => x.CreatedAt < beforeDate)
+                            .Where(x => x.KeycloakUserId == keycloakUserId)
+                            .Where(x => x.Type.Id == leaveTypeId)
+                            .Where(x => x.LeaveStatus == "APPROVE" || x.LeaveStatus == "DELETING")
+                            //.Where(x => x.LeaveStatus != "REJECT" && x.LeaveStatus != "DELETE")
+                            .OrderByDescending(x => x.LeaveStartDate.Date)
+                            .FirstOrDefaultAsync();
+
+            return data;
+        }
+
         public async Task<List<LeaveRequest>> GetCancelLeaveRequestForAdminAsync(int year, Guid type, string status, string role, string? nodeId, int? node)
         {
             var rawData = _dbContext.Set<LeaveRequest>().AsNoTracking()
diff --git a/BMA.EHR.Leave/Controllers/LeaveReportController.cs b/BMA.EHR.Leave/Controllers/LeaveReportController.cs
index 96ff61ee..2b555e73 100644
--- a/BMA.EHR.Leave/Controllers/LeaveReportController.cs
+++ b/BMA.EHR.Leave/Controllers/LeaveReportController.cs
@@ -152,8 +152,8 @@ namespace BMA.EHR.Leave.Service.Controllers
             
 
             var lastLeaveRequest =
-                await _leaveRequestRepository.GetLastLeaveRequestByTypeForUserAsync(data.KeycloakUserId,
-                    data.Type.Id, data.LeaveStartDate.Date);
+                await _leaveRequestRepository.GetLastLeaveRequestByTypeForUserAsync2(data.KeycloakUserId,
+                    data.Type.Id, data.CreatedAt);
 
             var startFiscalYear = new DateTime(data.LeaveStartDate.Year - 1, 10, 1);
             var endFiscalYear = data.CreatedAt;