diff --git a/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveBeginingRepository.cs b/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveBeginingRepository.cs
index c98ca11e..c2ba8abb 100644
--- a/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveBeginingRepository.cs
+++ b/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveBeginingRepository.cs
@@ -172,11 +172,15 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
                 var prev = _dbContext.Set<LeaveBeginning>()
                     .Include(x => x.LeaveType)
                     .FirstOrDefault(x => x.LeaveYear == year - 1 && x.LeaveTypeId == typeId && x.ProfileId == pf.Id);
+                
+                // คำนวณปีงบประมาณจาก startDate (ปีงบประมาณเริ่ม 1 ต.ค. และสิ้นสุด 30 ก.ย.)
+                var isCurrentYear = DateTime.Now.Year == year;
+                
 
                 var prevRemain = 0.0;
                 if (prev != null)
                 {
-                    prevRemain = prev.LeaveDays - (prev.LeaveDaysUsed ?? 0.0);
+                    prevRemain = isCurrentYear ? prev.LeaveDays - (prev.LeaveDaysUsed ?? 0.0) : 0.0;
                 }
 
                 if (govAge >= 180)
@@ -239,6 +243,9 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
                 .FirstOrDefault(x => x.LeaveYear == year - 1 && x.LeaveTypeId == typeId && x.ProfileId == pf.Id);
 
             var prevRemain = 0.0;
+            
+            
+            
             if (prev != null)
             {
                 prevRemain = prev.LeaveDays - (prev.LeaveDaysUsed ?? 0.0);
diff --git a/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs b/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs
index 3070ee88..05737cfa 100644
--- a/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs
+++ b/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs
@@ -1937,12 +1937,17 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
 
         public async Task<double> GetSumApproveLeaveTotalByTypeAndRangeForUser2(Guid keycloakUserId, Guid leaveTypeId, DateTime startDate, DateTime endDate)
         {
+            // คำนวณปีงบประมาณจาก startDate (ปีงบประมาณเริ่ม 1 ต.ค. และสิ้นสุด 30 ก.ย.)
+            var fiscalYear = startDate.Month >= 10 ? startDate.Year + 1 : startDate.Year;
+            var fiscalStart = new DateTime(fiscalYear - 1, 10, 1);
+            var fiscalEnd = new DateTime(fiscalYear, 9, 30);
+
             var data = await _dbContext.Set<LeaveRequest>().AsQueryable().AsNoTracking()
                             .Include(x => x.Type)
                             .Where(x => x.KeycloakUserId == keycloakUserId)
                             .Where(x => x.Type.Id == leaveTypeId)
-                            .Where(x => ((x.DateSendLeave ?? x.CreatedAt) >= startDate && (x.DateSendLeave ??x.CreatedAt) <= endDate))
-                            //.Where(x => x.LeaveStartDate.Date >= startDate.Date && x.LeaveStartDate.Date <= endDate.Date)
+                            .Where(x => ((x.DateSendLeave ?? x.CreatedAt) >= startDate && (x.DateSendLeave ?? x.CreatedAt) <= endDate))
+                            .Where(x => x.LeaveStartDate.Date >= fiscalStart.Date && x.LeaveStartDate.Date <= fiscalEnd.Date)
                             .Where(x => x.LeaveStatus == "APPROVE" || x.LeaveStatus == "DELETING")
                             .ToListAsync();
 
@@ -1954,12 +1959,17 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
         
         public async Task<double> GetSumApproveLeaveTotalByTypeAndRangeForUserBefore(Guid keycloakUserId, Guid leaveTypeId, DateTime startDate, DateTime endDate)
         {
+            // คำนวณปีงบประมาณจาก startDate (ปีงบประมาณเริ่ม 1 ต.ค. และสิ้นสุด 30 ก.ย.)
+            var fiscalYear = startDate.Month >= 10 ? startDate.Year + 1 : startDate.Year;
+            var fiscalStart = new DateTime(fiscalYear - 1, 10, 1);
+            var fiscalEnd = new DateTime(fiscalYear, 9, 30);
+            
             var data = await _dbContext.Set<LeaveRequest>().AsQueryable().AsNoTracking()
                 .Include(x => x.Type)
                 .Where(x => x.KeycloakUserId == keycloakUserId)
                 .Where(x => x.Type.Id == leaveTypeId)
                 .Where(x => ((x.DateSendLeave ?? x.CreatedAt) >= startDate && (x.DateSendLeave ?? x.CreatedAt) < endDate))
-                //.Where(x => x.LeaveStartDate.Date >= startDate.Date && x.LeaveStartDate.Date <= endDate.Date)
+                .Where(x => x.LeaveStartDate.Date >= fiscalStart.Date && x.LeaveStartDate.Date <= fiscalEnd.Date)
                 .Where(x => x.LeaveStatus == "APPROVE" || x.LeaveStatus == "DELETING")
                 .ToListAsync();
 
@@ -1971,12 +1981,17 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
         
         public async Task<double> GetSumApproveLeaveTotalByTypeAndRangeForUserByProfile(Guid profileId, Guid leaveTypeId, DateTime startDate, DateTime endDate)
         {
+            // คำนวณปีงบประมาณจาก startDate (ปีงบประมาณเริ่ม 1 ต.ค. และสิ้นสุด 30 ก.ย.)
+            var fiscalYear = startDate.Month >= 10 ? startDate.Year + 1 : startDate.Year;
+            var fiscalStart = new DateTime(fiscalYear - 1, 10, 1);
+            var fiscalEnd = new DateTime(fiscalYear, 9, 30);
+            
             var data = await _dbContext.Set<LeaveRequest>().AsQueryable().AsNoTracking()
                 .Include(x => x.Type)
                 .Where(x => x.ProfileId == profileId)
                 .Where(x => x.Type.Id == leaveTypeId)
                 .Where(x => ((x.DateSendLeave ?? x.CreatedAt) >= startDate && (x.DateSendLeave ??x.CreatedAt) <= endDate))
-                //.Where(x => x.LeaveStartDate.Date >= startDate.Date && x.LeaveStartDate.Date <= endDate.Date)
+                .Where(x => x.LeaveStartDate.Date >= fiscalStart.Date && x.LeaveStartDate.Date <= fiscalEnd.Date)
                 .Where(x => x.LeaveStatus == "APPROVE" || x.LeaveStatus == "DELETING")
                 .ToListAsync();
 
@@ -1988,12 +2003,17 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
         
         public async Task<int> GetSumApproveLeaveCountByTypeAndRangeForUserByProfile(Guid profileId, Guid leaveTypeId, DateTime startDate, DateTime endDate)
         {
+            // คำนวณปีงบประมาณจาก startDate (ปีงบประมาณเริ่ม 1 ต.ค. และสิ้นสุด 30 ก.ย.)
+            var fiscalYear = startDate.Month >= 10 ? startDate.Year + 1 : startDate.Year;
+            var fiscalStart = new DateTime(fiscalYear - 1, 10, 1);
+            var fiscalEnd = new DateTime(fiscalYear, 9, 30);
+            
             var data = await _dbContext.Set<LeaveRequest>().AsQueryable().AsNoTracking()
                 .Include(x => x.Type)
                 .Where(x => x.ProfileId == profileId)
                 .Where(x => x.Type.Id == leaveTypeId)
                 .Where(x => ((x.DateSendLeave ?? x.CreatedAt) >= startDate && (x.DateSendLeave ??x.CreatedAt) <= endDate))
-                //.Where(x => x.LeaveStartDate.Date >= startDate.Date && x.LeaveStartDate.Date <= endDate.Date)
+                .Where(x => x.LeaveStartDate.Date >= fiscalStart.Date && x.LeaveStartDate.Date <= fiscalEnd.Date)
                 .Where(x => x.LeaveStatus == "APPROVE" || x.LeaveStatus == "DELETING")
                 .ToListAsync();
 
@@ -2002,12 +2022,17 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
         
         public async Task<int> GetSumApproveLeaveCountByTypeAndRangeForUser2(Guid keycloakUserId, Guid leaveTypeId, DateTime startDate, DateTime endDate)
         {
+            // คำนวณปีงบประมาณจาก startDate (ปีงบประมาณเริ่ม 1 ต.ค. และสิ้นสุด 30 ก.ย.)
+            var fiscalYear = startDate.Month >= 10 ? startDate.Year + 1 : startDate.Year;
+            var fiscalStart = new DateTime(fiscalYear - 1, 10, 1);
+            var fiscalEnd = new DateTime(fiscalYear, 9, 30);
+            
             var data = await _dbContext.Set<LeaveRequest>().AsQueryable().AsNoTracking()
                 .Include(x => x.Type)
                 .Where(x => x.KeycloakUserId == keycloakUserId)
                 .Where(x => x.Type.Id == leaveTypeId)
                 .Where(x => ((x.DateSendLeave ?? x.CreatedAt) >= startDate && (x.DateSendLeave ??x.CreatedAt) <= endDate))
-                //.Where(x => x.LeaveStartDate.Date >= startDate.Date && x.LeaveStartDate.Date <= endDate.Date)
+                .Where(x => x.LeaveStartDate.Date >= fiscalStart.Date && x.LeaveStartDate.Date <= fiscalEnd.Date)
                 .Where(x => x.LeaveStatus == "APPROVE" || x.LeaveStatus == "DELETING")
                 .ToListAsync();
 
@@ -2024,13 +2049,18 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
         /// <returns></returns>
         public async Task<double> GetSumDraftLeaveTotalByTypeAndRangeForUser2(Guid keycloakUserId, Guid leaveTypeId, DateTime startDate, DateTime endDate)
         {
+            // คำนวณปีงบประมาณจาก startDate (ปีงบประมาณเริ่ม 1 ต.ค. และสิ้นสุด 30 ก.ย.)
+            var fiscalYear = startDate.Month >= 10 ? startDate.Year + 1 : startDate.Year;
+            var fiscalStart = new DateTime(fiscalYear - 1, 10, 1);
+            var fiscalEnd = new DateTime(fiscalYear, 9, 30);
+            
             var data = await _dbContext.Set<LeaveRequest>().AsQueryable().AsNoTracking()
                             .Include(x => x.Type)
                             .Where(x => x.KeycloakUserId == keycloakUserId)
                             .Where(x => x.Type.Id == leaveTypeId)
                             .Where(x => ((x.DateSendLeave ?? x.CreatedAt).Date >= startDate 
                                         && (x.DateSendLeave ?? x.CreatedAt).Date < endDate))
-                            //.Where(x => x.LeaveStartDate.Date >= startDate.Date && x.LeaveStartDate.Date <= endDate.Date)
+                            .Where(x => x.LeaveStartDate.Date >= fiscalStart.Date && x.LeaveStartDate.Date <= fiscalEnd.Date)
                             .Where(x => x.LeaveStatus == "DRAFT")
                             .ToListAsync();
 
@@ -2050,12 +2080,17 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
         /// <returns></returns>
         public async Task<double> GetSumNewLeaveTotalByTypeAndRangeForUser2(Guid keycloakUserId, Guid leaveTypeId, DateTime startDate, DateTime endDate)
         {
+            // คำนวณปีงบประมาณจาก startDate (ปีงบประมาณเริ่ม 1 ต.ค. และสิ้นสุด 30 ก.ย.)
+            var fiscalYear = startDate.Month >= 10 ? startDate.Year + 1 : startDate.Year;
+            var fiscalStart = new DateTime(fiscalYear - 1, 10, 1);
+            var fiscalEnd = new DateTime(fiscalYear, 9, 30);
+            
             var data = await _dbContext.Set<LeaveRequest>().AsQueryable().AsNoTracking()
                             .Include(x => x.Type)
                             .Where(x => x.KeycloakUserId == keycloakUserId)
                             .Where(x => x.Type.Id == leaveTypeId)
                             .Where(x => ((x.DateSendLeave ?? x.CreatedAt) >= startDate && (x.DateSendLeave ??x.CreatedAt) < endDate))
-                            //.Where(x => x.LeaveStartDate.Date >= startDate.Date && x.LeaveStartDate.Date <= endDate.Date)
+                            .Where(x => x.LeaveStartDate.Date >= fiscalStart.Date && x.LeaveStartDate.Date <= fiscalEnd.Date)
                             .Where(x => (x.LeaveStatus == "NEW" || x.LeaveStatus == "PENDING"))
                             .ToListAsync();