diff --git a/BMA.EHR.Leave/Controllers/LeaveController.cs b/BMA.EHR.Leave/Controllers/LeaveController.cs
index 6947557e..c6f1db85 100644
--- a/BMA.EHR.Leave/Controllers/LeaveController.cs
+++ b/BMA.EHR.Leave/Controllers/LeaveController.cs
@@ -852,14 +852,22 @@ namespace BMA.EHR.Leave.Service.Controllers
                     ProfileType = profile.ProfileType,
                 };
 
-                var checkInStatus = DateTime.Parse(currentDate.ToString("yyyy-MM-dd HH:mm")) >
-                                    DateTime.Parse($"{currentDate.ToString("yyyy-MM-dd")} {duty.StartTimeMorning}") ?
+                var startTime = "";
+                if (!data.IsLocation && data.LocationName == "ไปประชุม/อบรม/สัมมนา/ปฏิบัติงานที่บ้านนอกสถานที่")
+                {
+                    startTime = "09:30";
+                }
+                else
+                    startTime = duty.StartTimeMorning;
 
-                                    DateTime.Parse(currentDate.ToString("yyyy-MM-dd HH:mm")) >
-                                    DateTime.Parse($"{currentDate.ToString("yyyy-MM-dd")} {duty.EndTimeMorning}") ?
-                                    "ABSENT" :
-                                    "LATE" :
-                                    "NORMAL";
+                var checkInStatus = DateTime.Parse(currentDate.ToString("yyyy-MM-dd HH:mm")) >
+                                        DateTime.Parse($"{currentDate.ToString("yyyy-MM-dd")} {startTime}") ?
+
+                                        DateTime.Parse(currentDate.ToString("yyyy-MM-dd HH:mm")) >
+                                        DateTime.Parse($"{currentDate.ToString("yyyy-MM-dd")} {duty.EndTimeMorning}") ?
+                                        "ABSENT" :
+                                        "LATE" :
+                                        "NORMAL";
 
                 // process - รอทำใน queue
                 var checkin_process = new ProcessUserTimeStamp
@@ -1798,7 +1806,7 @@ namespace BMA.EHR.Leave.Service.Controllers
 
             var endTime = DateTime.Parse($"{DateTime.Now.Date.ToString("yyyy-MM-dd")}T{duty.EndTimeAfternoon}:00.0000000+07:00");
 
-            var status = lastCheckIn == null ? "ABSENT" : lastCheckIn.CheckIn.Date < DateTime.Now.Date ? "NORMAL" :  time < endTime ? "ABSENT" : "NORMAL";
+            var status = lastCheckIn == null ? "ABSENT" : lastCheckIn.CheckIn.Date < DateTime.Now.Date ? "NORMAL" : time < endTime ? "ABSENT" : "NORMAL";
 
             return Success(new
             {