diff --git a/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs b/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs
index ca34cbab..18641ec8 100644
--- a/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs
+++ b/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs
@@ -324,10 +324,14 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
                                     .Where(x => x.LeaveStatus != "DRAFT")
                                     .OrderByDescending(x => x.CreatedAt)
                                     .AsQueryable();
-
+            // fix issue : 1830
             if (year != 0)
-                rawData = rawData.Where(x => x.LeaveStartDate.Year == year);
-
+            {
+                var startFiscalDate = new DateTime(year - 1, 10, 1);
+                var endFiscalDate = new DateTime(year, 9, 30);
+                rawData = rawData.Where(x => x.LeaveStartDate >= startFiscalDate && x.LeaveStartDate <= endFiscalDate);
+            }
+                
             if (type != Guid.Empty)
                 rawData = rawData.Where(x => x.Type.Id == type);
 
diff --git a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs
index 1211a88d..c3c1ef99 100644
--- a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs
+++ b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs
@@ -2591,6 +2591,9 @@ namespace BMA.EHR.Leave.Service.Controllers
             var userId = UserId == null ? Guid.Empty : Guid.Parse(UserId);
             var leaveTypes = await _leaveTypeRepository.GetAllAsync();
             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;      
 
             var sendList = await _leaveRequestRepository.GetSumSendLeaveAsync(thisYear);
             //var approveList = await _leaveRequestRepository.GetSumApproveLeaveAsync(thisYear);