diff --git a/BMA.EHR.Leave/Controllers/LeaveController.cs b/BMA.EHR.Leave/Controllers/LeaveController.cs
index 73c632b4..f7e315fa 100644
--- a/BMA.EHR.Leave/Controllers/LeaveController.cs
+++ b/BMA.EHR.Leave/Controllers/LeaveController.cs
@@ -2077,6 +2077,20 @@ namespace BMA.EHR.Leave.Service.Controllers
                 processTimeStamp.EditStatus = "APPROVE";
                 processTimeStamp.EditReason = req.Reason;
 
+                if (requestData.CheckInEdit)
+                {
+                    processTimeStamp.CheckInPOI = requestData.POI ?? "";
+                    processTimeStamp.CheckInLat = requestData.Latitude ?? 0;
+                    processTimeStamp.CheckInLon = requestData.Longitude ?? 0;
+                }
+
+                if (requestData.CheckOutEdit)
+                {
+                    processTimeStamp.CheckOutPOI = requestData.POI ?? "";
+                    processTimeStamp.CheckOutLat = requestData.Latitude ?? 0;
+                    processTimeStamp.CheckOutLon = requestData.Longitude ?? 0;
+                }
+
                 await _processUserTimeStampRepository.AddAsync(processTimeStamp);
             }
             else
@@ -2085,9 +2099,9 @@ namespace BMA.EHR.Leave.Service.Controllers
                 {
                     processTimeStamp.CheckIn = DateTime.Parse($"{requestData.CheckDate.Date.ToString("yyyy-MM-dd")} {req.CheckInTime}");
                     processTimeStamp.CheckInRemark = req.Reason;
-                    processTimeStamp.CheckInLat = 0;
-                    processTimeStamp.CheckInLon = 0;
-                    processTimeStamp.CheckInPOI = "ลงเวลากรณีพิเศษ";
+                    //processTimeStamp.CheckInLat = 0;
+                    //processTimeStamp.CheckInLon = 0;
+                    //processTimeStamp.CheckInPOI = "ลงเวลากรณีพิเศษ";
                     processTimeStamp.CheckInStatus = req.CheckInStatus;
 
                     processTimeStamp.CheckInPOI = requestData.POI ?? "";
@@ -2099,9 +2113,9 @@ namespace BMA.EHR.Leave.Service.Controllers
                 {
                     processTimeStamp.CheckOut = DateTime.Parse($"{requestData.CheckDate.Date.ToString("yyyy-MM-dd")} {req.CheckOutTime}");
                     processTimeStamp.CheckOutRemark = req.Reason;
-                    processTimeStamp.CheckOutLat = 0;
-                    processTimeStamp.CheckOutLon = 0;
-                    processTimeStamp.CheckOutPOI = "ลงเวลากรณีพิเศษ";
+                    //processTimeStamp.CheckOutLat = 0;
+                    //processTimeStamp.CheckOutLon = 0;
+                    //processTimeStamp.CheckOutPOI = "ลงเวลากรณีพิเศษ";
                     processTimeStamp.CheckOutStatus = req.CheckOutStatus;
 
                     processTimeStamp.CheckOutPOI = requestData.POI ?? "";