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")