From 28f8971e7f45413fd8d7dfec7f930efd1a8fb0eb Mon Sep 17 00:00:00 2001
From: moss <>
Date: Tue, 27 May 2025 17:34:10 +0700
Subject: [PATCH] filter retireresign

---
 .../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 023ae702..0d37b086 100644
--- a/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
+++ b/BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
@@ -235,7 +235,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                 return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
             }
             var retirementResigns = await _context.RetirementResigns.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 c721af67..1a7962e6 100644
--- a/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs
+++ b/BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs
@@ -174,7 +174,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                 return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
             }
             var retirementResignEmployees = await _context.RetirementResignEmployees.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
                         {