From 2bdb8bb73345fb35a1e1d9dadb281ba0d6e9cbd7 Mon Sep 17 00:00:00 2001
From: Suphonchai Phoonsawat <suphonchai.ph@gmail.com>
Date: Fri, 1 May 2026 10:23:27 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=81=E0=B8=97=E0=B8=A1.=20=E0=B8=95?=
 =?UTF-8?q?=E0=B9=89=E0=B8=AD=E0=B8=87=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=9E?=
 =?UTF-8?q?=E0=B8=B4=E0=B9=88=E0=B8=A1=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=81?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=A3=E0=B8=A5=E0=B8=87=E0=B9=80=E0=B8=A7=E0=B8=A5?=
 =?UTF-8?q?=E0=B8=B2=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=B0=E0=B8=97=E0=B8=B5=E0=B9=88=20"=E0=B8=9B?=
 =?UTF-8?q?=E0=B8=8F=E0=B8=B4=E0=B8=9A=E0=B8=B1=E0=B8=95=E0=B8=B4=E0=B8=87?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=99=E0=B9=83=E0=B8=99=E0=B8=88=E0=B8=B8=E0=B8=94?=
 =?UTF-8?q?=E0=B8=9A=E0=B8=A3=E0=B8=B4=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=94?=
 =?UTF-8?q?=E0=B9=88=E0=B8=A7=E0=B8=99=E0=B8=A1=E0=B8=AB=E0=B8=B2=E0=B8=99?=
 =?UTF-8?q?=E0=B8=84=E0=B8=A3"=20=E0=B8=81=E0=B8=B3=E0=B8=AB=E0=B8=99?=
 =?UTF-8?q?=E0=B8=94=E0=B9=80=E0=B8=A7=E0=B8=A5=E0=B8=B2=2010.30-18.30=20?=
 =?UTF-8?q?=E0=B8=99.=20#2458?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BMA.EHR.Leave/Controllers/LeaveController.cs | 26 ++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/BMA.EHR.Leave/Controllers/LeaveController.cs b/BMA.EHR.Leave/Controllers/LeaveController.cs
index c148089e..1dca793e 100644
--- a/BMA.EHR.Leave/Controllers/LeaveController.cs
+++ b/BMA.EHR.Leave/Controllers/LeaveController.cs
@@ -1086,6 +1086,12 @@ namespace BMA.EHR.Leave.Service.Controllers
                                 startTime1 = "13:00";
                                 endTime1 = "14:30";
                                 endTimeMorning1 = "12:00";
+                            } 
+                            else if (!data.IsLocation && data.LocationName == "ปฏิบัติงานในจุดบริการด่วนมหานคร")
+                            {
+                                startTime1 = "13:00";
+                                endTime1 = "18:30";
+                                endTimeMorning1 = "12:00";
                             }
                             else
                             {
@@ -1252,6 +1258,12 @@ namespace BMA.EHR.Leave.Service.Controllers
                     var startTime = "";
                     var endTime = "";
                     if (!data.IsLocation && data.LocationName == "ไปประชุม / อบรม / สัมมนา")
+                    {
+                        //startTime = "09:30";
+                        startTime = "10:30";
+                        endTime = "12:00";
+                    } 
+                    else if (!data.IsLocation && data.LocationName == "ปฏิบัติงานในจุดบริการด่วนมหานคร")
                     {
                         //startTime = "09:30";
                         startTime = "10:30";
@@ -1403,6 +1415,12 @@ namespace BMA.EHR.Leave.Service.Controllers
                         startTime = "13:00";
                         endTime = "14:30";
                         endTimeMorning = "12:00";
+                    } 
+                    else if (!data.IsLocation && data.LocationName == "ปฏิบัติงานในจุดบริการด่วนมหานคร")
+                    {
+                        startTime = "13:00";
+                        endTime = "18:30";
+                        endTimeMorning = "12:00";
                     }
                     else
                     {
@@ -4130,6 +4148,10 @@ namespace BMA.EHR.Leave.Service.Controllers
             if (req.CheckInStatus == "NORMAL")
             {
                 if(data.CheckInLocationName == "ไปประชุม / อบรม / สัมมนา")
+                {
+                    data.CheckIn = DateTime.Parse($"{data.CheckIn.Date.ToString("yyyy-MM-dd")} 10:30");
+                } 
+                else if (data.CheckInLocationName == "ปฏิบัติงานในจุดบริการด่วนมหานคร")
                 {
                     data.CheckIn = DateTime.Parse($"{data.CheckIn.Date.ToString("yyyy-MM-dd")} 10:30");
                 }
@@ -4147,6 +4169,10 @@ namespace BMA.EHR.Leave.Service.Controllers
                 if(data.CheckOutLocationName == "ไปประชุม / อบรม / สัมมนา")
                 {
                     roundCheckOutTime = DateTime.Parse($"{checkOutTime.Date.ToString("yyyy-MM-dd")} 14:30");
+                }  
+                else if (data.CheckInLocationName == "ปฏิบัติงานในจุดบริการด่วนมหานคร")
+                {
+                    roundCheckOutTime = DateTime.Parse($"{checkOutTime.Date.ToString("yyyy-MM-dd")} 18:30");
                 }
                 else
                 {