From af453659202fc7b20b5339a91ebc5d925da25ce5 Mon Sep 17 00:00:00 2001
From: kittapath <>
Date: Sat, 9 Aug 2025 21:59:30 +0700
Subject: [PATCH] =?UTF-8?q?1728-=E0=B8=A2=E0=B8=81=E0=B9=80=E0=B8=A5?=
 =?UTF-8?q?=E0=B8=B4=E0=B8=81=E0=B8=84=E0=B8=B3=E0=B8=AA=E0=B8=B1=E0=B9=88?=
 =?UTF-8?q?=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/RetirementResignController.cs      |  8 ++++----
 .../RetirementResignEmployeeController.cs          | 14 +-------------
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
index d84656d5..5030559a 100644
--- a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
+++ b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
@@ -1741,7 +1741,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                     client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
                     var _res = await client.DeleteAsync($"{_configuration["API"]}/org/command/tab2Cancel17/{updated.Id}");
                 }
-                updated.Status = "CANCELING";
+                updated.Status = "CANCEL";
             }
             else
             {
@@ -3584,7 +3584,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
             }
             var updated = await _context.RetirementResigns.AsQueryable()
                             .FirstOrDefaultAsync(x => x.Id == id);
-            if (updated == null)  
+            if (updated == null)
                 return Error(GlobalMessages.RetirementResignNotFound, 404);
 
             var ReasonResign = req.ReasonResign;
@@ -3605,8 +3605,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
             updated.ReasonResign = !string.IsNullOrEmpty(ReasonResign) ? ReasonResign : updated.ReasonResign;
             updated.Reason = req.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.SendDate = req.SendDate.HasValue ? req.SendDate : updated.SendDate;
+            updated.ActiveDate = req.ActiveDate.HasValue ? req.ActiveDate : updated.ActiveDate;
             updated.LastUpdateFullName = FullName ?? "System Administrator";
             updated.LastUpdateUserId = UserId ?? "";
             updated.LastUpdatedAt = DateTime.Now;
diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs
index fe3bb208..8a842aea 100644
--- a/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs
+++ b/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs
@@ -1648,18 +1648,6 @@ namespace BMA.EHR.Retirement.Service.Controllers
                 }
                 await _context.AddRangeAsync(addList);
                 await _context.SaveChangesAsync();
-                // using (var client = new HttpClient())
-                // {
-                //     client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                //     client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
-                //     var _res = await client.PostAsJsonAsync($"{_configuration["API"]}/org/workflow/add-workflow", new
-                //     {
-                //         refId = retirementResignEmployeeCancel.Id,
-                //         sysName = "RETIREMENT_CANCEL_EMP",
-                //         posLevelName = retirementResignEmployeeCancel.PositionLevelOld,
-                //         posTypeName = retirementResignEmployeeCancel.PositionTypeOld,
-                //     });
-                // }
                 updated.IsCancel = true;
                 updated.Status = "CANCELING";
             }
@@ -1671,7 +1659,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                     client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
                     var _res = await client.DeleteAsync($"{_configuration["API"]}/org/command/tab2Cancel23/{updated.Id}");
                 }
-                updated.Status = "CANCELING";
+                updated.Status = "CANCEL";
             }
             else
             {