From b1f93784245f694f9bbc5dc7c03308bd23bb6748 Mon Sep 17 00:00:00 2001 From: Suphonchai Phoonsawat Date: Thu, 23 Jan 2025 15:14:09 +0700 Subject: [PATCH] =?UTF-8?q?fix=20issue=20:=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=82=E0=B9=89=E0=B8=AD=E0=B8=A1=E0=B8=B9?= =?UTF-8?q?=E0=B8=A5=E0=B8=9C=E0=B8=B9=E0=B9=89=E0=B8=AA=E0=B8=B1=E0=B8=87?= =?UTF-8?q?=E0=B8=81=E0=B8=B1=E0=B8=94=E0=B9=81=E0=B8=A5=E0=B8=B0=E0=B9=80?= =?UTF-8?q?=E0=B8=A3=E0=B8=B5=E0=B8=A2=E0=B8=99=E0=B9=84=E0=B8=A1=E0=B9=88?= =?UTF-8?q?=E0=B9=81=E0=B8=AA=E0=B8=94=E0=B8=87)=20#971?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/LeaveRequestController.cs | 33 +++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs index 1771cbca..2425a505 100644 --- a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs +++ b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs @@ -1163,6 +1163,18 @@ namespace BMA.EHR.Leave.Service.Controllers var sumHoliday = await _holidayRepository.GetHolidayCountAsync(rawData.LeaveStartDate, rawData.LeaveEndDate, category); var sumWeekend = _holidayRepository.GetWeekEndCount(rawData.LeaveStartDate, rawData.LeaveEndDate, category); + + var orgName = rawData.Root ?? ""; + if (rawData.Child1 != null && rawData.Child1 != "") + orgName += $"/{rawData.Child1}"; + if (rawData.Child2 != null && rawData.Child2 != "") + orgName += $"/{rawData.Child2}"; + if (rawData.Child3 != null && rawData.Child3 != "") + orgName += $"/{rawData.Child3}"; + if (rawData.Child4 != null && rawData.Child4 != "") + orgName += $"/{rawData.Child4}"; + + var result = new GetLeaveRequestByIdDto { Id = rawData.Id, @@ -1235,7 +1247,10 @@ namespace BMA.EHR.Leave.Service.Controllers Dear = rawData.Dear ?? "", PositionName = rawData.PositionName ?? "", PositionLevelName = rawData.PositionLevelName ?? "", - OrganizationName = rawData.OrganizationName ?? "", + OrganizationName = orgName, + //OrganizationName = rawData.OrganizationName ?? "", + // fix issue : SIT ระบบบันทึกการลา>>รายการลา (ข้อมูลผู้สังกัดและเรียนไม่แสดง) #971 + LeaveTypeCode = rawData.LeaveTypeCode ?? "" }; @@ -1780,6 +1795,16 @@ namespace BMA.EHR.Leave.Service.Controllers //var sumHoliday = await _holidayRepository.GetHolidayCountAsync(rawData.LeaveStartDate, rawData.LeaveEndDate, category); //var sumWeekend = _holidayRepository.GetWeekEndCount(rawData.LeaveStartDate, rawData.LeaveEndDate, category); + var orgName = rawData.Root ?? ""; + if (rawData.Child1 != null && rawData.Child1 != "") + orgName += $"/{rawData.Child1}"; + if (rawData.Child2 != null && rawData.Child2 != "") + orgName += $"/{rawData.Child2}"; + if (rawData.Child3 != null && rawData.Child3 != "") + orgName += $"/{rawData.Child3}"; + if (rawData.Child4 != null && rawData.Child4 != "") + orgName += $"/{rawData.Child4}"; + var result = new GetLeaveRequestForAdminByIdDto { Id = rawData.Id, @@ -1858,10 +1883,14 @@ namespace BMA.EHR.Leave.Service.Controllers // OrganizationName = profile.Oc ?? "", // เปลี่ยนมาอ่านจากฐานข้อมูลแทน read_db + Dear = rawData.Dear ?? "", PositionName = rawData.PositionName ?? "", PositionLevelName = rawData.PositionLevelName ?? "", - OrganizationName = rawData.OrganizationName ?? "", + OrganizationName = orgName, + //OrganizationName = rawData.OrganizationName ?? "", + // fix SIT ระบบบันทึกการลา>>รายการลา (ข้อมูลผู้สังกัดและเรียนไม่แสดง) #971 + ApproveStep = rawData.ApproveStep ?? "-",