From 20e8dfddd63add1a40c99c1c10a757c168b46971 Mon Sep 17 00:00:00 2001 From: Suphonchai Phoonsawat Date: Tue, 12 May 2026 12:02:45 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B8=99=E0=B8=B1=E0=B8=9A=E0=B8=A7=E0=B8=B1?= =?UTF-8?q?=E0=B8=99=E0=B8=AB=E0=B8=A2=E0=B8=B8=E0=B8=94=20=E0=B8=95?= =?UTF-8?q?=E0=B9=89=E0=B8=AD=E0=B8=87=E0=B8=95=E0=B8=B1=E0=B8=94=E0=B9=80?= =?UTF-8?q?=E0=B8=AA=E0=B8=B2=E0=B8=A3=E0=B9=8C=20=E0=B8=AD=E0=B8=B2?= =?UTF-8?q?=E0=B8=97=E0=B8=B4=E0=B8=95=E0=B8=A2=E0=B9=8C=E0=B8=AD=E0=B8=AD?= =?UTF-8?q?=E0=B8=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Repositories/MetaData/HolidayRepository.cs | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/BMA.EHR.Application/Repositories/MetaData/HolidayRepository.cs b/BMA.EHR.Application/Repositories/MetaData/HolidayRepository.cs index c5c09a44..1c8ae006 100644 --- a/BMA.EHR.Application/Repositories/MetaData/HolidayRepository.cs +++ b/BMA.EHR.Application/Repositories/MetaData/HolidayRepository.cs @@ -49,12 +49,16 @@ namespace BMA.EHR.Application.Repositories.MetaData public async Task GetHolidayCountAsync(DateTime startDate, DateTime endDate, string category = "NORMAL") { - var data = await _dbContext.Set().AsQueryable() + var query = _dbContext.Set().AsQueryable() .Where(x => x.Category == category) - .Where(x => x.HolidayDate.Date >= startDate && x.HolidayDate.Date <= endDate) - .CountAsync(); + .Where(x => x.HolidayDate.Date >= startDate && x.HolidayDate.Date <= endDate); - return data; + if (category == "NORMAL") + query = query.Where(x => x.HolidayDate.DayOfWeek != DayOfWeek.Saturday && x.HolidayDate.DayOfWeek != DayOfWeek.Sunday); + else + query = query.Where(x => x.HolidayDate.DayOfWeek != DayOfWeek.Sunday); + + return await query.CountAsync(); } public List GetWeekEnd(DateTime startDate, DateTime endDate, string category = "NORMAL")