diff --git a/BMA.EHR.Leave/Controllers/LeaveReportController.cs b/BMA.EHR.Leave/Controllers/LeaveReportController.cs
index f8c22956..eb59f663 100644
--- a/BMA.EHR.Leave/Controllers/LeaveReportController.cs
+++ b/BMA.EHR.Leave/Controllers/LeaveReportController.cs
@@ -332,7 +332,10 @@ namespace BMA.EHR.Leave.Service.Controllers
 
             //var sumLeave = await _leaveRequestRepository.GetSumApproveLeaveTotalByTypeAndRangeForUser(data.KeycloakUserId, data.Type.Id, startFiscalYear, endFiscalYear);
 
-            var sumLeave = leaveData == null ? 0.0 : leaveData.LeaveDaysUsed;
+            
+            var sumLeave = await _leaveRequestRepository.GetSumApproveLeaveTotalByTypeAndRangeForUser(data.KeycloakUserId, data.Type.Id, startFiscalYear, endFiscalYear);
+
+            //var sumLeave = leaveData == null ? 0.0 : leaveData.LeaveDaysUsed;
             var leaveLimit = leaveData == null ? 0.0 : leaveData.LeaveDays;
             var extendLeave = leaveLimit - 10;
             var Oc = profile.isCommission == false 
diff --git a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs
index dc3afc62..d8da2c15 100644
--- a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs
+++ b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs
@@ -2388,8 +2388,10 @@ namespace BMA.EHR.Leave.Service.Controllers
                     }
                 }
             }
-            var thisYear = DateTime.Now.Year;
-            var toDay = DateTime.Now.Date;
+            var thisYear = rawData.LeaveStartDate.Year;
+            var toDay = rawData.LeaveStartDate.Date;
+            // var thisYear = DateTime.Now.Year;
+            // var toDay = DateTime.Now.Date;
             if (toDay >= new DateTime(toDay.Year, 10, 1) && toDay <= new DateTime(toDay.Year, 12, 31))
                 thisYear = thisYear + 1;
 
@@ -2441,7 +2443,11 @@ namespace BMA.EHR.Leave.Service.Controllers
                 orgName += $" {rawData.Root}";
 
             var leaveData = await _leaveBeginningRepository.GetByYearAndTypeIdForUser2Async(thisYear, rawData.Type.Id, rawData.KeycloakUserId);
-            var leaveSummary = leaveData == null ? 0.0 : leaveData.LeaveDaysUsed;
+
+            var startFiscalYear = new DateTime(rawData.LeaveStartDate.Year - 1, 10, 1);
+            var endFiscalYear = rawData.LeaveStartDate.Date.AddDays(-1); // นับจากวันที่ยื่นลา
+            var leaveSummary = await _leaveRequestRepository.GetSumApproveLeaveTotalByTypeAndRangeForUser(rawData.KeycloakUserId, rawData.Type.Id, startFiscalYear, endFiscalYear);
+            //var leaveSummary = leaveData == null ? 0.0 : leaveData.LeaveDaysUsed;
 
             var extendLeave = 0.0;
             var leaveLimit = (double)rawData.Type.Limit;