diff --git a/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs b/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs
index 9cc0f65a..6223d786 100644
--- a/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs
+++ b/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs
@@ -1103,9 +1103,17 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
                 throw new Exception(GlobalMessages.DataNotFound);
             }
 
-            if (rawData.ApproveStep != "st3")
+            // ถ้าไม่มี commander ข้ามไปเช็ค approver ได้เลย
+            var commanders = rawData.Approvers
+                                .Where(x => x.ApproveType!.ToUpper() == "COMMANDER")
+                                .OrderBy(x => x.Seq)
+                                .ToList();
+            if(commanders.Count > 0 || commanders != null)
             {
-                throw new Exception("คำขอนี้ยังไม่ได้อยู่ในขั้นตอนที่สามารถอนุมัติได้ ไม่สามารถทำรายการได้");
+                if (rawData.ApproveStep != "st3")
+                {
+                    throw new Exception("คำขอนี้ยังไม่ได้อยู่ในขั้นตอนที่สามารถอนุมัติได้ ไม่สามารถทำรายการได้");
+                }
             }
 
             // check commander approve
diff --git a/BMA.EHR.Leave/Controllers/LeaveReportController.cs b/BMA.EHR.Leave/Controllers/LeaveReportController.cs
index 3b71a529..43e233ec 100644
--- a/BMA.EHR.Leave/Controllers/LeaveReportController.cs
+++ b/BMA.EHR.Leave/Controllers/LeaveReportController.cs
@@ -238,11 +238,13 @@ namespace BMA.EHR.Leave.Service.Controllers
             if (toDay >= new DateTime(toDay.Year, 10, 1) && toDay <= new DateTime(toDay.Year, 12, 31))
                 thisYear = thisYear + 1;
 
-            var leaveData = await _leaveBeginningRepository.GetByYearAndTypeIdForUserAsync(thisYear, data.Type.Id, data.KeycloakUserId);
-
-            var sumLeave = await _leaveRequestRepository.GetSumApproveLeaveTotalByTypeAndRangeForUser(data.KeycloakUserId, data.Type.Id, startFiscalYear, endFiscalYear);
+            var leaveData = await _leaveBeginningRepository.GetByYearAndTypeIdForUser2Async(thisYear, data.Type.Id, data.KeycloakUserId);
+            //var leaveData = await _leaveBeginningRepository.GetByYearAndTypeIdForUser2Async(thisYear, rawData.Type.Id, rawData.KeycloakUserId);
+            //var leaveSummary = 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;