From a28ade80bf7d4eea4c054b7ea3614a5625c3d65f Mon Sep 17 00:00:00 2001
From: Suphonchai Phoonsawat <suphonchai.ph@gmail.com>
Date: Tue, 24 Dec 2024 12:06:03 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1?=
 =?UTF-8?q?=E0=B9=80=E0=B8=95=E0=B8=B4=E0=B8=A1=E0=B8=A3=E0=B8=B2=E0=B8=A2?=
 =?UTF-8?q?=E0=B8=A5=E0=B8=B0=E0=B9=80=E0=B8=AD=E0=B8=B5=E0=B8=A2=E0=B8=94?=
 =?UTF-8?q?=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=A5=E0=B8=87=E0=B9=80=E0=B8=A7?=
 =?UTF-8?q?=E0=B8=A5=E0=B8=B2=E0=B8=99=E0=B8=AD=E0=B8=81=E0=B8=AA=E0=B8=96?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=99=E0=B8=97=E0=B8=B5=E0=B9=88=20=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=B0=E0=B8=9A=E0=B8=9A=E0=B8=A5=E0=B8=87=E0=B9=80=E0=B8=A7?=
 =?UTF-8?q?=E0=B8=A5=E0=B8=B2>>=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=87?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=99=E0=B8=AA=E0=B8=96=E0=B8=B4=E0=B8=95=E0=B8=B4?=
 =?UTF-8?q?=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=A5=E0=B8=87=E0=B9=80=E0=B8=A7?=
 =?UTF-8?q?=E0=B8=A5=E0=B8=B2=20(=E0=B8=88=E0=B8=B3=E0=B8=99=E0=B8=A7?=
 =?UTF-8?q?=E0=B8=99=E0=B8=AD=E0=B8=9A=E0=B8=A3=E0=B8=A1=20=E0=B8=9B?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=B0=E0=B8=8A=E0=B8=B8=E0=B8=A1=20=E0=B8=AA?=
 =?UTF-8?q?=E0=B8=B1=E0=B8=A1=E0=B8=A1=E0=B8=99=E0=B8=B2=E0=B8=AF=20?=
 =?UTF-8?q?=E0=B9=84=E0=B8=A1=E0=B9=88=E0=B9=81=E0=B8=AA=E0=B8=94=E0=B8=87?=
 =?UTF-8?q?)=20#884?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BMA.EHR.Leave/Controllers/LeaveReportController.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/BMA.EHR.Leave/Controllers/LeaveReportController.cs b/BMA.EHR.Leave/Controllers/LeaveReportController.cs
index 7dd783ea..641e9800 100644
--- a/BMA.EHR.Leave/Controllers/LeaveReportController.cs
+++ b/BMA.EHR.Leave/Controllers/LeaveReportController.cs
@@ -1034,12 +1034,12 @@ namespace BMA.EHR.Leave.Service.Controllers
                                 if (timeStamps.CheckOut != null)
                                 {
                                     if (timeStamps.CheckOutStatus == "ABSENT")
-                                        remarkStr = "ขาดราชการ";
+                                        remarkStr = "ขาดราชการ" + (timeStamps.IsLocationCheckOut ? $" (นอกสถานที่:{ timeStamps.CheckOutLocationName })".Trim() : "") ;
                                     else if (timeStamps.CheckInStatus == "ABSENT")
-                                        remarkStr = "ขาดราชการ";
+                                        remarkStr = "ขาดราชการ" + (timeStamps.IsLocationCheckIn ? $" (นอกสถานที่:{timeStamps.CheckInLocationName})".Trim() : "");
                                     else if (timeStamps.CheckInStatus == "LATE")
                                     {
-                                        remarkStr = "สาย";
+                                        remarkStr = "สาย" + (timeStamps.IsLocationCheckIn ? $" (นอกสถานที่:{timeStamps.CheckInLocationName})".Trim() : "");
                                         lateTotal += 1;
                                     }
                                     else
@@ -1048,10 +1048,10 @@ namespace BMA.EHR.Leave.Service.Controllers
                                 else
                                 {
                                     if (timeStamps.CheckInStatus == "ABSENT")
-                                        remarkStr = "ขาดราชการ";
+                                        remarkStr = "ขาดราชการ" + (timeStamps.IsLocationCheckIn ? $" (นอกสถานที่:{timeStamps.CheckInLocationName})".Trim() : "");
                                     else if (timeStamps.CheckInStatus == "LATE")
                                     {
-                                        remarkStr = "สาย";
+                                        remarkStr = "สาย" + (timeStamps.IsLocationCheckIn ? $" (นอกสถานที่:{timeStamps.CheckInLocationName})".Trim() : "");
                                         lateTotal += 1;
                                     }
                                     else