diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs
index 6ed75dd6..9c3b827e 100644
--- a/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs
+++ b/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs
@@ -456,7 +456,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                     data.Group,
                     idCancel = data.RetirementResignEmployeeCancels?.Id ?? Guid.Empty,
                     statusCancel = data.RetirementResignEmployeeCancels?.Status ?? null,
-                    statusMain = data.Status,
+                    statusMain = data.Status == "CANCEL" ? "DONECANCEL" : data.Status,
                     Docs = retirementResignEmployeeDocs,
                 };
 
@@ -1114,7 +1114,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
             if (updated == null)
                 return Error(GlobalMessages.RetirementResignEmployeeNotFound, 404);
             updated.CancelReason = req.Reason;
-            if (updated.Status == "DONE")
+            if (updated.Status == "DONE" || updated.Status == "WAITING")
             {
                 var retirementResignEmployeeCancel = new RetirementResignEmployeeCancel
                 {