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,