From 97b5bd1176b167158df3a23279de4daa00c25d37 Mon Sep 17 00:00:00 2001
From: moss <>
Date: Thu, 29 May 2025 14:59:57 +0700
Subject: [PATCH] status camcel

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

diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
index 195a5843..b4f4d608 100644
--- a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
+++ b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
@@ -290,7 +290,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                 return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
             }
             var retirementResigns = await _context.RetirementResignCancels.AsQueryable()
-                        .Where(x => x.Status == type.Trim().ToUpper())
+                        .Where(x => type.Trim().ToUpper() == "APPROVE" ? (x.Status == "APPROVE" || x.Status == "REJECT") : x.Status == type.Trim().ToUpper())
                         .OrderByDescending(x => x.CreatedAt)
                         .Select(p => new
                         {
diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs
index 4c0947fa..7b87e143 100644
--- a/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs
+++ b/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs
@@ -229,7 +229,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                 return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
             }
             var retirementResignEmployees = await _context.RetirementResignEmployeeCancels.AsQueryable()
-                        .Where(x => x.Status == type.Trim().ToUpper())
+                        .Where(x => type.Trim().ToUpper() == "APPROVE" ? (x.Status == "APPROVE" || x.Status == "REJECT") : x.Status == type.Trim().ToUpper())
                         .OrderByDescending(x => x.CreatedAt)
                         .Select(p => new
                         {