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 11s
Details

Browse source
This commit is contained in:
Bright 2025-07-17 15:41:44 +07:00
parent 1b861c1a65
commit 0b9d3b16ac
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -156,7 +156,7 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
&&
(string.IsNullOrEmpty(req.disciplinaryFaultLevel) || x.DisciplinaryFaultLevel == req.disciplinaryFaultLevel)
&&
(string.IsNullOrEmpty(req.disciplinaryCaseFault) || x.DisciplinaryCaseFault.Contains(req.disciplinaryCaseFault))
(string.IsNullOrEmpty(req.disciplinaryCaseFault) || (x.DisciplinaryCaseFault?.Contains(req.disciplinaryCaseFault) ?? false))
)
.ToList();
}

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

@ -175,13 +175,13 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
&&
(string.IsNullOrEmpty(req.disciplinaryFaultLevel) || x.DisciplinaryFaultLevel == req.disciplinaryFaultLevel)
&&
(string.IsNullOrEmpty(req.disciplinaryCaseFault) || x.DisciplinaryCaseFault.Contains(req.disciplinaryCaseFault))
(string.IsNullOrEmpty(req.disciplinaryCaseFault) || (x.DisciplinaryCaseFault?.Contains(req.disciplinaryCaseFault) ?? false))
&&
(string.IsNullOrEmpty(req.resultDisciplineType) || x.ResultDisciplineType.Contains(req.resultDisciplineType))
(string.IsNullOrEmpty(req.resultDisciplineType) || (x.ResultDisciplineType?.Contains(req.resultDisciplineType) ?? false))
&&
(string.IsNullOrEmpty(req.resultTitleType) || x.ResultTitleType.Contains(req.resultTitleType))
(string.IsNullOrEmpty(req.resultTitleType) || (x.ResultTitleType?.Contains(req.resultTitleType) ?? false))
&&
(string.IsNullOrEmpty(req.resultOc) || x.ResultOc.Contains(req.resultOc))
(string.IsNullOrEmpty(req.resultOc) || (x.ResultOc?.Contains(req.resultOc) ?? false))
&&
(!req.resultYear.HasValue || x.ResultYear == req.resultYear)
)