From 06956284d7b14ebeb88f2a6a82b1f3a2c28e6195 Mon Sep 17 00:00:00 2001
From: adisak <t99m2018@gmail.com>
Date: Thu, 2 Apr 2026 17:50:18 +0700
Subject: [PATCH] #2381

---
 .../Controllers/RetirementResignController.cs                   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
index 7b8d27b1..147f1adb 100644
--- a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
+++ b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
@@ -165,7 +165,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                                 p.ApproveReason,
                                 p.RejectReason,
                                 p.CancelReason,
-                                p.Status,
+                                status = p.RetirementResignCancels.FirstOrDefault() == null ? p.Status : p.RetirementResignCancels.FirstOrDefault().Status,
                                 statusCancel = p.RetirementResignCancels.FirstOrDefault() == null ? null : p.RetirementResignCancels.FirstOrDefault().Status,
                                 p.IsActive,
                             })