From 1bec0918569cb0e52b52f0996c8f00275dd0ec7f Mon Sep 17 00:00:00 2001 From: kittapath Date: Fri, 17 Jan 2025 14:34:07 +0700 Subject: [PATCH] eq.Reason.Trim().ToUpper() --- .../Controllers/RetirementResignController.cs | 3 +-- .../Controllers/RetirementResignEmployeeController.cs | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs index 30e8c04f..590b4719 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs @@ -880,14 +880,13 @@ namespace BMA.EHR.Retirement.Service.Controllers var Remark = req.Remark; if (req.Reason != null) { - switch (req.Reason.Trim().ToLower()) + switch (req.Reason.Trim().ToUpper()) { case "CAREER": Remark = $"ประกอบอาชีพอื่น" + (req.Remark == null || req.Remark == "" ? $"{req.Remark}" : ""); break; case "MOVE": Remark = $"รับราชการสังกัดอื่น" + (req.Remark == null || req.Remark == "" ? $"{req.Remark}" : ""); break; case "FAMILY": Remark = $"ดูแลบิดามารดา" + (req.Remark == null || req.Remark == "" ? $"{req.Remark}" : ""); break; case "EDUCATION": Remark = $"ศึกษาต่อ" + (req.Remark == null || req.Remark == "" ? $"{req.Remark}" : ""); break; case "OTHER": Remark = $"อื่น ๆ" + (req.Remark == null || req.Remark == "" ? $"{req.Remark}" : ""); break; - default: Remark = req.Reason.Trim().ToLower(); break; } } diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs index e14161cb..c80d69f3 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs @@ -823,14 +823,13 @@ namespace BMA.EHR.Retirement.Service.Controllers var Remark = req.Remark; if (req.Reason != null) { - switch (req.Reason.Trim().ToLower()) + switch (req.Reason.Trim().ToUpper()) { case "CAREER": Remark = $"ประกอบอาชีพอื่น" + (req.Remark == null || req.Remark == "" ? $"{req.Remark}" : ""); break; case "MOVE": Remark = $"รับราชการสังกัดอื่น" + (req.Remark == null || req.Remark == "" ? $"{req.Remark}" : ""); break; case "FAMILY": Remark = $"ดูแลบิดามารดา" + (req.Remark == null || req.Remark == "" ? $"{req.Remark}" : ""); break; case "EDUCATION": Remark = $"ศึกษาต่อ" + (req.Remark == null || req.Remark == "" ? $"{req.Remark}" : ""); break; case "OTHER": Remark = $"อื่น ๆ" + (req.Remark == null || req.Remark == "" ? $"{req.Remark}" : ""); break; - default: Remark = "test"; break; } } var retirementResignEmployee = new RetirementResignEmployee