diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
index c8053ed5..7d3aca8f 100644
--- a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
+++ b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
@@ -3587,11 +3587,23 @@ namespace BMA.EHR.Retirement.Service.Controllers
             if (updated == null)  
                 return Error(GlobalMessages.RetirementResignNotFound, 404);
 
+            var ReasonResign = req.ReasonResign;
+            if (req.ReasonResign != null)
+            {
+                switch (req.ReasonResign.Trim().ToUpper())
+                {
+                    case "CAREER": ReasonResign = $"ประกอบอาชีพอื่น"; break;
+                    case "MOVE": ReasonResign = $"รับราชการสังกัดอื่น"; break;
+                    case "FAMILY": ReasonResign = $"ดูแลบิดามารดา"; break;
+                    case "EDUCATION": ReasonResign = $"ศึกษาต่อ"; break;
+                    case "OTHER": ReasonResign = $"อื่น ๆ"; break;
+                    default: ReasonResign = string.Empty; break;
+                }
+            }
+
             updated.Location = !string.IsNullOrEmpty(req.Location) ? req.Location : updated.Location;
-            updated.ReasonResign = !string.IsNullOrEmpty(req.ReasonResign) ? req.ReasonResign : updated.ReasonResign;
-            updated.Remark = !string.IsNullOrEmpty(req.ReasonResign) && req.ReasonResign == "อื่น ๆ" && !string.IsNullOrEmpty(req.Remark) 
-                ? req.Remark 
-                : null;
+            updated.ReasonResign = !string.IsNullOrEmpty(ReasonResign) ? ReasonResign : updated.ReasonResign;
+            updated.Remark = !string.IsNullOrEmpty(req.Remark) ? req.Remark : null;
             updated.SendDate = req.SendDate.HasValue ? req.SendDate  : updated.SendDate;
             updated.ActiveDate = req.ActiveDate.HasValue ? req.ActiveDate  : updated.ActiveDate;
             updated.LastUpdateFullName = FullName ?? "System Administrator";
diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs
index cb9d382c..f6422bc4 100644
--- a/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs
+++ b/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs
@@ -3054,11 +3054,23 @@ namespace BMA.EHR.Retirement.Service.Controllers
             if (updated == null)
                 return Error(GlobalMessages.RetirementResignNotFound, 404);
 
+            var ReasonResign = req.ReasonResign;
+            if (req.ReasonResign != null)
+            {
+                switch (req.ReasonResign.Trim().ToUpper())
+                {
+                    case "CAREER": ReasonResign = $"ประกอบอาชีพอื่น"; break;
+                    case "MOVE": ReasonResign = $"รับราชการสังกัดอื่น"; break;
+                    case "FAMILY": ReasonResign = $"ดูแลบิดามารดา"; break;
+                    case "EDUCATION": ReasonResign = $"ศึกษาต่อ"; break;
+                    case "OTHER": ReasonResign = $"อื่น ๆ"; break;
+                    default: ReasonResign = string.Empty; break;
+                }
+            }
+
             updated.Location = !string.IsNullOrEmpty(req.Location) ? req.Location : updated.Location;
-            updated.ReasonResign = !string.IsNullOrEmpty(req.ReasonResign) ? req.ReasonResign : updated.ReasonResign;
-            updated.Remark = !string.IsNullOrEmpty(req.ReasonResign) && req.ReasonResign == "อื่น ๆ" && !string.IsNullOrEmpty(req.Remark)
-                ? req.Remark
-                : null;
+            updated.ReasonResign = !string.IsNullOrEmpty(ReasonResign) ? ReasonResign : updated.ReasonResign;
+            updated.Remark = !string.IsNullOrEmpty(req.Remark) ? req.Remark : null;
             updated.SendDate = req.SendDate.HasValue ? req.SendDate : updated.SendDate;
             updated.ActiveDate = req.ActiveDate.HasValue ? req.ActiveDate : updated.ActiveDate;
             updated.LastUpdateFullName = FullName ?? "System Administrator";