diff --git a/BMA.EHR.Leave/Controllers/LeaveController.cs b/BMA.EHR.Leave/Controllers/LeaveController.cs
index 9b1773ee..7dafb605 100644
--- a/BMA.EHR.Leave/Controllers/LeaveController.cs
+++ b/BMA.EHR.Leave/Controllers/LeaveController.cs
@@ -2437,7 +2437,23 @@ namespace BMA.EHR.Leave.Service.Controllers
             {
                 if (time < endTime)
                 {
-                    status = "ABSENT";
+
+                    //string checkOutStatus = "NORMAL";
+                    var leaveReq = await _leaveRequestRepository.GetLeavePeriodAsync(userId, time.Date);
+                    if (leaveReq != null)
+                    {
+                        var leaveRange = leaveReq.LeaveRangeEnd == null ? "" : leaveReq.LeaveRangeEnd.ToUpper();
+                        if (leaveRange == "AFTERNOON" || leaveRange == "ALL")
+                            status = "NORMAL";
+                        else
+                        {
+                            status = "ABSENT";
+                        }
+                    }
+                    else
+                    {
+                        status = "ABSENT";
+                    }
                 }
                 else
                 {