diff --git a/BMA.EHR.Leave/Controllers/LeaveController.cs b/BMA.EHR.Leave/Controllers/LeaveController.cs
index 7f90fbe1..ebfd5c96 100644
--- a/BMA.EHR.Leave/Controllers/LeaveController.cs
+++ b/BMA.EHR.Leave/Controllers/LeaveController.cs
@@ -3634,6 +3634,30 @@ namespace BMA.EHR.Leave.Service.Controllers
             var data = await _processUserTimeStampRepository.GetByIdAsync(id);
             if (data == null)
                 return Error(GlobalMessages.DataNotFound);
+            
+            if (data.CheckInStatus == "NORMAL" || data.CheckOutStatus == "NORMAL")
+            {
+                var profile = await _userProfileRepository.GetProfileByKeycloakIdNewAsync(id, AccessToken);
+                var defaultRound = await _dutyTimeRepository.GetDefaultAsync();
+                if (defaultRound == null)
+                {
+                    return Error("ไม่พบรอบการลงเวลา Default", StatusCodes.Status404NotFound);
+                }
+                var effectiveDate = await _userDutyTimeRepository.GetLastEffectRound(profile!.Id);
+                var roundId = effectiveDate != null ? effectiveDate.DutyTimeId : Guid.Empty;
+                var userRound = await _dutyTimeRepository.GetByIdAsync(roundId);
+
+                var duty = userRound ?? defaultRound;
+                if (req.CheckInStatus == "NORMAL")
+                {
+                    data.CheckIn = DateTime.Parse($"{data.CheckIn.Date.ToString("yyyy-MM-dd")} {duty.StartTimeMorning}");
+                }
+                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}");
+                }
+            }
 
             data.CheckInStatus = req.CheckInStatus;
             data.CheckOutStatus = req.CheckOutStatus;