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,
                             })
diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs
index 9b176503..5ad00538 100644
--- a/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs
+++ b/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs
@@ -102,8 +102,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
                                 p.Remark,
                                 p.ApproveReason,
                                 p.RejectReason,
-                                p.CancelReason,
-                                p.Status,
+                                p.CancelReason,                           
+                                status = p.RetirementResignEmployeeCancels.FirstOrDefault() == null ? p.Status : p.RetirementResignEmployeeCancels.FirstOrDefault().Status,
                                 statusCancel = p.RetirementResignEmployeeCancels.FirstOrDefault() == null ? null : p.RetirementResignEmployeeCancels.FirstOrDefault().Status,
                                 p.IsActive,
                             })