From b528f0a81de5b1918cb155ee2647b7a805223293 Mon Sep 17 00:00:00 2001 From: Bright Date: Wed, 11 Jun 2025 12:05:46 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=E0=B9=80?= =?UTF-8?q?=E0=B8=AB=E0=B8=95=E0=B8=B8=E0=B8=9C=E0=B8=A5=E0=B8=84=E0=B8=B3?= =?UTF-8?q?=E0=B8=AA=E0=B8=B1=E0=B9=88=E0=B8=87=E0=B8=A5=E0=B8=B2=E0=B8=AD?= =?UTF-8?q?=E0=B8=AD=E0=B8=81,=E0=B9=82=E0=B8=AD=E0=B8=99=E0=B8=AD?= =?UTF-8?q?=E0=B8=AD=E0=B8=81=20issue=20#1572?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/PlacementTransferController.cs | 3 ++- .../Controllers/RetirementResignController.cs | 5 ++++- .../Controllers/RetirementResignEmployeeController.cs | 5 ++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs index d02665d2..cdc3b298 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs @@ -881,7 +881,8 @@ namespace BMA.EHR.Placement.Service.Controllers positionType = p.PositionTypeOld, positionLevel = p.PositionLevelOld, commandId = r.commandId, - leaveReason = "โอนออก", + //leaveReason = "โอนออก", + leaveReason = string.IsNullOrWhiteSpace(p.Reason) ? "โอนออก" : p.Reason, dateLeave = r.commandDateAffect, isLeave = true, orgRoot = p.rootOld, diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs index ab6636b3..cbb31dbe 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs @@ -2630,7 +2630,10 @@ namespace BMA.EHR.Retirement.Service.Controllers positionType = p.PositionTypeOld, positionLevel = p.PositionLevelOld, isLeave = p.IsCancel == true ? false : true, - leaveReason = "ออกจากราชการ", + //leaveReason = "ออกจากราชการ", + leaveReason = p.ReasonResign == "อื่น ๆ" + ? string.IsNullOrWhiteSpace(p.Remark) ? p.ReasonResign : $"{p.ReasonResign}({p.Remark})" + : p.ReasonResign, dateLeave = r.commandDateAffect, commandId = r.commandId, isGovernment = false, diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs index 82320216..d02c9c80 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs @@ -2111,7 +2111,10 @@ namespace BMA.EHR.Retirement.Service.Controllers positionType = p.PositionTypeOld, positionLevel = p.PositionLevelOld, isLeave = p.IsCancel == true ? false : true, - leaveReason = "ออกจากราชการ", + //leaveReason = "ออกจากราชการ", + leaveReason = p.ReasonResign == "อื่น ๆ" + ? string.IsNullOrWhiteSpace(p.Remark) ? p.ReasonResign : $"{p.ReasonResign}({p.Remark})" + : p.ReasonResign, dateLeave = r.commandDateAffect, commandId = r.commandId, isGovernment = false,