diff --git a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs
index ac1d8364..1211a88d 100644
--- a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs
+++ b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs
@@ -1000,7 +1000,11 @@ namespace BMA.EHR.Leave.Service.Controllers
             var sumApproveLeave = await _leaveRequestRepository.GetSumApproveLeaveByTypeForUserAsync(userId, req.Type, req.StartLeaveDate.Year);
 
             // อ่านค่าจากตาราง beginning ทั้ง limit และ usage
-            var sumLeaveDay = await _leaveBeginningRepository.GetByYearAndTypeIdForUserAsync(req.StartLeaveDate.Year, req.Type, userId);
+            var fiscalYear  = req.StartLeaveDate.Year;
+            if(req.StartLeaveDate.Date >= new DateTime(DateTime.Now.Year,10,1) && req.EndLeaveDate.Date <= new DateTime(DateTime.Now.Year,12,31))
+                fiscalYear = req.StartLeaveDate.Year + 1;
+
+            var sumLeaveDay = await _leaveBeginningRepository.GetByYearAndTypeIdForUserAsync(fiscalYear, req.Type, userId);
 
 
             var minLeave = (await _context.Set<LeaveRequest>().Where(x => x.Type.Id == req.Type &&