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

Merge branch 'develop' into working

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2023-12-21 14:30:37 +07:00
commit 84c725977f
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -57,6 +57,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
{
var data_search = (from x in _context.DisciplineDisciplinarys
where x.Title.Contains(keyword)
where x.Status.Contains("DONE") || x.Status.Contains("REPORT")
// x.DisciplinaryFaultLevel == null ? false : x.DisciplinaryFaultLevel.Contains(keyword) ||
// x.DisciplinaryCaseFault == null ? false : x.DisciplinaryCaseFault.Contains(keyword) ||
select x).ToList();
@ -72,7 +73,6 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
Status = x.Status,//สถานะหรือผลการสอบสวน
CreatedAt = x.CreatedAt,//วันที่สร้างเรื่องสอบสวน
})
.Where(x => x.Status == "DONE" || x.Status == "REPORT")
.OrderByDescending(x => x.CreatedAt)
.Skip((page - 1) * pageSize)
.Take(pageSize)