diff --git a/BMA.EHR.Leave.Service/Controllers/LeaveController.cs b/BMA.EHR.Leave.Service/Controllers/LeaveController.cs
index b090505b..3d814cf4 100644
--- a/BMA.EHR.Leave.Service/Controllers/LeaveController.cs
+++ b/BMA.EHR.Leave.Service/Controllers/LeaveController.cs
@@ -591,7 +591,8 @@ namespace BMA.EHR.Leave.Service.Controllers
                                 CheckInDate = d.CheckIn.Date,
                                 CheckInTime = d.CheckIn.ToString("HH:mm:ss"),
                                 CheckInLocation = d.CheckInPOI,
-                                CheckInStatus = DateTime.Parse(d.CheckIn.ToString("yyyy-MM-dd HH:mm")) >
+                                CheckInStatus = d.CheckInStatus != null || d.CheckInStatus != "" ? d.CheckInStatus :
+                                                DateTime.Parse(d.CheckIn.ToString("yyyy-MM-dd HH:mm")) >
                                                 DateTime.Parse($"{d.CheckIn.Date.ToString("yyyy-MM-dd")} {duty.StartTimeMorning}") ?
                                                "LATE" :
                                                "NORMAL",
@@ -601,6 +602,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                                 CheckOutTime = d.CheckOut == null ? "" : d.CheckOut.Value.ToString("HH:mm:ss"),
                                 CheckOutLocation = d.CheckOutPOI ?? "",
                                 CheckOutStatus = d.CheckOut == null ? null :
+                                                d.CheckOutStatus != null || d.CheckOutStatus != "" ? d.CheckOutStatus :
                                                 DateTime.Parse(d.CheckOut.Value.ToString("yyyy-MM-dd HH:mm")) <
                                                 DateTime.Parse($"{d.CheckIn.Date.ToString("yyyy-MM-dd")} {duty.EndTimeAfternoon}") ?
                                                 "LATE" :
@@ -756,7 +758,8 @@ namespace BMA.EHR.Leave.Service.Controllers
                     CheckInLat = d.CheckInLat,
                     CheckInLon = d.CheckInLon,
                     CheckInImg = $"{imgUrl}/{d.CheckInImageUrl}",
-                    CheckInStatus = DateTime.Parse(d.CheckIn.ToString("yyyy-MM-dd HH:mm")) >
+                    CheckInStatus = d.CheckInStatus != null || d.CheckInStatus != "" ? d.CheckInStatus :
+                                    DateTime.Parse(d.CheckIn.ToString("yyyy-MM-dd HH:mm")) >
                                     DateTime.Parse($"{d.CheckIn.Date.ToString("yyyy-MM-dd")} {duty.StartTimeMorning}") ?
                                     "LATE" :
                                     "NORMAL",
@@ -772,6 +775,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                     CheckOutImg = d.CheckOut == null ? "" : $"{imgUrl}/{d.CheckOutImageUrl}",
 
                     CheckOutStatus = d.CheckOut == null ? null :
+                                     d.CheckOutStatus != null || d.CheckOutStatus != "" ? d.CheckOutStatus :
                                      DateTime.Parse(d.CheckOut.Value.ToString("yyyy-MM-dd HH:mm")) <
                                      DateTime.Parse($"{d.CheckIn.Date.ToString("yyyy-MM-dd")} {duty.EndTimeAfternoon}") ?
                                      "LATE" :
@@ -1576,7 +1580,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                 return Error(GlobalMessages.DataNotFound);
 
             data.CheckInStatus = req.CheckInStatus;
-            data.CheckInStatus = req.CheckOutStatus;
+            data.CheckOutStatus = req.CheckOutStatus;
             data.EditReason = req.Reason;
 
             await _processUserTimeStampRepository.UpdateAsync(data);