hrms-bangkok/hrms-api-backend
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

Fix Bug กรองวันที่
Some checks failed
release-dev / release-dev (push) Failing after 10s
Details

Browse source
This commit is contained in:
Bright 2025-07-22 10:27:05 +07:00
parent 757035a4b0
commit d3be22cfbd
4 changed files with 18 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

8
BMA.EHR.Discipline.Service/Controllers/DisciplineDisciplinaryController.cs
View file

@ -145,14 +145,14 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
//วันที่รับเรือง
(!req.dateReceivedStart.HasValue || !req.dateReceivedEnd.HasValue ||
(x.DateReceived.HasValue &&
x.DateReceived.Value.Date >= req.dateReceivedStart.Value.Date &&
x.DateReceived.Value.Date <= req.dateReceivedEnd.Value.Date))
x.DateReceived.Value.Date <= req.dateReceivedStart.Value.Date &&
x.DateReceived.Value.Date >= req.dateReceivedEnd.Value.Date))
&&
//วันที่สอบสวน
(!req.disciplinaryDateStart.HasValue || !req.disciplinaryDateEnd.HasValue ||
(x.DisciplinaryDateStart.HasValue && x.DisciplinaryDateEnd.HasValue &&
x.DisciplinaryDateStart.Value.Date >= req.disciplinaryDateStart.Value.Date &&
x.DisciplinaryDateEnd.Value.Date <= req.disciplinaryDateEnd.Value.Date))
x.DisciplinaryDateStart.Value.Date <= req.disciplinaryDateStart.Value.Date &&
x.DisciplinaryDateEnd.Value.Date >= req.disciplinaryDateEnd.Value.Date))
&&
(string.IsNullOrEmpty(req.respondentType) || x.RespondentType == req.respondentType)
&&