diff --git a/BMA.EHR.Leave/Controllers/LeaveController.cs b/BMA.EHR.Leave/Controllers/LeaveController.cs
index ebce7bbe..9b1773ee 100644
--- a/BMA.EHR.Leave/Controllers/LeaveController.cs
+++ b/BMA.EHR.Leave/Controllers/LeaveController.cs
@@ -882,7 +882,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                 if (leaveReq != null)
                 {
                     var leaveRange = leaveReq.LeaveRange == null ? "" : leaveReq.LeaveRange.ToUpper();
-                    if (leaveRange == "MORNING")
+                    if (leaveRange == "MORNING" || leaveRange == "ALL")
                         checkInStatus = "NORMAL";
                     else
                     {
@@ -987,8 +987,8 @@ namespace BMA.EHR.Leave.Service.Controllers
                 var leaveReq = await _leaveRequestRepository.GetLeavePeriodAsync(userId, currentDate.Date);
                 if (leaveReq != null)
                 {
-                    var leaveRange = leaveReq.LeaveRange == null ? "" : leaveReq.LeaveRange.ToUpper();
-                    if (leaveRange == "AFTERNOON")
+                    var leaveRange = leaveReq.LeaveRangeEnd == null ? "" : leaveReq.LeaveRangeEnd.ToUpper();
+                    if (leaveRange == "AFTERNOON" || leaveRange == "ALL")
                         checkOutStatus = "NORMAL";
                     else
                     {