diff --git a/BMA.EHR.Leave/Controllers/LeaveController.cs b/BMA.EHR.Leave/Controllers/LeaveController.cs
index ebfd5c96..3346a4a4 100644
--- a/BMA.EHR.Leave/Controllers/LeaveController.cs
+++ b/BMA.EHR.Leave/Controllers/LeaveController.cs
@@ -3655,7 +3655,12 @@ namespace BMA.EHR.Leave.Service.Controllers
                 if (req.CheckOutStatus == "NORMAL" )
                 {
                     var checkOutTime = data.CheckOut != null ? data.CheckOut.Value : data.CheckIn;
-                    data.CheckOut = DateTime.Parse($"{checkOutTime.Date.ToString("yyyy-MM-dd")} {duty.EndTimeAfternoon}");
+                    var oldCheckOutTime = data.CheckOut != null ? data.CheckOut.Value : DateTime.Now;
+                    var roundCheckOutTime = DateTime.Parse($"{checkOutTime.Date.ToString("yyyy-MM-dd")} {duty.EndTimeAfternoon}");
+                    if (oldCheckOutTime < roundCheckOutTime)
+                    {
+                        data.CheckOut = roundCheckOutTime;
+                    }
                 }
             }