From b800b9e60d5922aaecccf5367d27f9ce53b9fbeb Mon Sep 17 00:00:00 2001 From: Kittapath Date: Sat, 22 Jul 2023 23:12:14 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B8=84=E0=B9=89=E0=B8=99=E0=B8=AB=E0=B8=B2?= =?UTF-8?q?=E0=B8=84=E0=B8=99=E0=B9=80=E0=B8=81=E0=B8=A9=E0=B8=B5=E0=B8=A2?= =?UTF-8?q?=E0=B8=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/RetirementController.cs | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementController.cs index f64382a4..2ccf1986 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementController.cs @@ -15,7 +15,6 @@ using System.Drawing; using System.Linq; using System.Security.Claims; using System.Security.Cryptography; -using static System.Runtime.InteropServices.JavaScript.JSType; namespace BMA.EHR.Retirement.Service.Controllers { @@ -189,10 +188,17 @@ namespace BMA.EHR.Retirement.Service.Controllers } else { - var profiles = await _context.Profiles - // .Where(x => x.BirthDate.CalculateRetireDate().Year == year) - .Where(x => x.CitizenId == "0000000000001") - .ToListAsync(); + var profiles = await _context.Profiles.AsQueryable() + // .Where(x => x.BirthDate.CalculateRetireDate().Year == year) + .Where(x => x.ProfileType.Trim().ToUpper().Contains(type.Trim().ToUpper())) + // .Where(x => x.CitizenId == "0000000000001") + .ToListAsync(); + + // var profiles = await (from p in _context.Profiles + // where p.BirthDate.CalculateRetireDate().Year == year + // select p) + // .ToListAsync(); + profiles = profiles.Where(x=>x.BirthDate.CalculateRetireDate().Year == year).ToList(); var order = 1; foreach (var profile in profiles) {