Merge branch 'develop' into adiDev
Some checks failed
release-dev / release-dev (push) Failing after 12s

This commit is contained in:
AdisakKanthawilang 2025-03-26 17:15:15 +07:00
commit 3779128e6c
26 changed files with 1912 additions and 191 deletions

View file

@ -149,7 +149,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
p.IsActive,
})
.ToListAsync();
if (status != null && status.Trim().ToUpper() != "WAITTING")
//if (status != null && status.Trim().ToUpper() != "WAITTING")
if (status != null)
retirementOuts = retirementOuts.Where(x => x.Status.Contains(status.Trim().ToUpper())).ToList();
return Success(retirementOuts);
}