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

Fix #1630, #1631
Some checks failed
release-dev / release-dev (push) Failing after 10s
Details

Browse source
This commit is contained in:
Bright 2025-07-18 15:57:48 +07:00
parent ac6e4f5c1f
commit aef2d3381a
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -124,7 +124,9 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
var status = string.IsNullOrEmpty(req.status) ? string.Empty : req.status;
var data_search = (from x in _context.DisciplineDisciplinarys
where x.Title.Contains(keyword)
where x.Title.Contains(keyword) ||
x.DisciplinaryFaultLevel.Contains(keyword) ||
x.DisciplinaryCaseFault.Contains(keyword)
select x).ToList();
if (status.Trim().ToUpper() != "ALL")
data_search = data_search.Where(x => x.Status.Contains(status.Trim().ToUpper())).ToList();

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

@ -144,7 +144,11 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
var status = string.IsNullOrEmpty(req.status) ? string.Empty : req.status;
var data_search = await _context.DisciplineDisciplinarys.AsQueryable()
.Where(x => x.Title.Contains(keyword))
.Where(x => x.Title.Contains(keyword) ||
(x.ResultOc == null ? false : x.ResultOc.Contains(keyword)) ||
(x.ResultDisciplineType == null ? false : x.ResultDisciplineType.Contains(keyword)) ||
(x.ResultTitleType == null ? false : x.ResultTitleType.Contains(keyword)) ||
(x.ResultYear == null ? false : (x.ResultYear + 543).ToString().Contains(keyword)))
.Where(x => x.Status.Contains("DONE") || x.Status.Contains("REPORT"))
.ToListAsync();
if (status.Trim().ToUpper() != "ALL")