From 2f1cd53493bf29021cf83f0e43368c8e32236366 Mon Sep 17 00:00:00 2001
From: Suphonchai Phoonsawat <suphonchai.ph@gmail.com>
Date: Tue, 13 May 2025 12:46:25 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=20=E0=B9=84?=
 =?UTF-8?q?=E0=B8=9B=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=8A=E0=B8=B8=E0=B8=A1?=
 =?UTF-8?q?/=E0=B8=AD=E0=B8=9A=E0=B8=A3=E0=B8=A1/=E0=B8=AA=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=A1=E0=B8=A1=E0=B8=99=E0=B8=B2/=E0=B8=9B=E0=B8=8F?=
 =?UTF-8?q?=E0=B8=B4=E0=B8=9A=E0=B8=B1=E0=B8=95=E0=B8=B4=E0=B8=87=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=99=E0=B8=97=E0=B8=B5=E0=B9=88=E0=B8=9A=E0=B9=89=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=99=E0=B8=99=E0=B8=AD=E0=B8=81=E0=B8=AA=E0=B8=96=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=99=E0=B8=97=E0=B8=B5=E0=B9=88=20=E0=B9=83=E0=B8=AB?=
 =?UTF-8?q?=E0=B9=89=20startTime=20=E0=B9=80=E0=B8=9B=E0=B9=87=E0=B8=99=20?=
 =?UTF-8?q?09:30?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BMA.EHR.Leave/Controllers/LeaveController.cs | 24 +++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

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
             {