From 752b1a5479e23052e125b1fa64f2be85fb871ab0 Mon Sep 17 00:00:00 2001
From: Suphonchai Phoonsawat <suphonchai.ph@gmail.com>
Date: Thu, 23 Jan 2025 15:32:31 +0700
Subject: [PATCH] =?UTF-8?q?fix=20issue=20:=20SIT=20=E0=B8=A3=E0=B8=B0?=
 =?UTF-8?q?=E0=B8=9A=E0=B8=9A=E0=B8=9A=E0=B8=B1=E0=B8=99=E0=B8=97=E0=B8=B6?=
 =?UTF-8?q?=E0=B8=81=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=A5=E0=B8=B2>>?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=A5?=
 =?UTF-8?q?=E0=B8=B2=20(=E0=B8=A5=E0=B8=B2=E0=B8=9E=E0=B8=B1=E0=B8=81?=
 =?UTF-8?q?=E0=B8=9C=E0=B9=88=E0=B8=AD=E0=B8=99=20=E0=B8=A2=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=87=E0=B9=84=E0=B8=A1=E0=B9=88=E0=B8=96=E0=B8=B6=E0=B8=87?=
 =?UTF-8?q?=2010=20=E0=B8=A7=E0=B8=B1=E0=B8=99=20=E0=B8=A3=E0=B8=B0?=
 =?UTF-8?q?=E0=B8=9A=E0=B8=9A=E0=B9=81=E0=B8=88=E0=B9=89=E0=B8=87=E0=B8=A5?=
 =?UTF-8?q?=E0=B8=B2=E0=B9=80=E0=B8=81=E0=B8=B4=E0=B8=99=E0=B8=81=E0=B8=B3?=
 =?UTF-8?q?=E0=B8=AB=E0=B8=99=E0=B8=94)=20#973?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BMA.EHR.Leave/Controllers/LeaveRequestController.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs
index 2425a505..b1f30fec 100644
--- a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs
+++ b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs
@@ -857,7 +857,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                     break;
                 case "LV-005":
                     // fix issue : ระบบลา (ขรก.) >> ลาพักผ่อน (กรณีรับราชการไม่ถึง 6 เดือน) #838
-                    var leavePrevYear = (await _leaveRequestRepository.GetSumApproveLeaveAsync(thisYear)).Where(x => x.LeaveTypeCode == "LV-005").FirstOrDefault();
+                    var leavePrevYear = (await _leaveRequestRepository.GetSumApproveLeaveAsync(thisYear)).Where(x => x.LeaveTypeCode == "LV-005" && x.KeycloakUserId == userId).FirstOrDefault();
                     var leavePrevYearRemain = 10 - (leavePrevYear == null ? 0 : leavePrevYear.SumLeaveDay); // หายอดวันลาที่เหลือของปีก่อน
 
                     if (govAge >= 180)
@@ -891,7 +891,7 @@ namespace BMA.EHR.Leave.Service.Controllers
                     else
                     {
                         // fix issue : ระบบลา (ขรก.) >> ลาอุปสมบทหรือการลาประกอบพิธีฮัจย์ฯ (ยื่นขอลาได้มากกว่า 1 ครั้ง) #841
-                        var prevLeave = _context.Set<LeaveRequest>().Where(x => x.LeaveTypeCode == "LV-006").Where(x => x.LeaveStatus == "APPROVE").Count();
+                        var prevLeave = _context.Set<LeaveRequest>().Where(x => x.LeaveTypeCode == "LV-006" && x.KeycloakUserId == userId).Where(x => x.LeaveStatus == "APPROVE").Count();
 
                         if (prevLeave > 0)
                         {