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 2024-01-10 09:54:29 +07:00
commit d45a61262a
1 changed files with 21 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -56,12 +56,26 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
[HttpGet()] [HttpGet()]
public async Task<ActionResult<ResponseObject>> GetDisciplineResult(int page = 1, int pageSize = 25, string keyword = "", string status = "") public async Task<ActionResult<ResponseObject>> GetDisciplineResult(int page = 1, int pageSize = 25, string keyword = "", string status = "")
{ {
var data_search = (from x in _context.DisciplineDisciplinarys // var data_search = (from x in _context.DisciplineDisciplinarys
where x.Title.Contains(keyword) // where x.Title.Contains(keyword) ||
where x.Status.Contains("DONE") || x.Status.Contains("REPORT") // (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.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();
var data_search = await _context.DisciplineDisciplinarys.AsQueryable()
.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();
// x.DisciplinaryFaultLevel == null ? false : x.DisciplinaryFaultLevel.Contains(keyword) || // x.DisciplinaryFaultLevel == null ? false : x.DisciplinaryFaultLevel.Contains(keyword) ||
// x.DisciplinaryCaseFault == null ? false : x.DisciplinaryCaseFault.Contains(keyword) || // x.DisciplinaryCaseFault == null ? false : x.DisciplinaryCaseFault.Contains(keyword) ||
select x).ToList();
if (status.Trim().ToUpper() != "ALL") if (status.Trim().ToUpper() != "ALL")
data_search = data_search.Where(x => x.Status.Contains(status.Trim().ToUpper())).ToList(); data_search = data_search.Where(x => x.Status.Contains(status.Trim().ToUpper())).ToList();
var data = data_search var data = data_search
@ -78,6 +92,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
ResultOc = x.ResultOc,// ResultOc = x.ResultOc,//
ResultDisciplineType = x.ResultDisciplineType,// ResultDisciplineType = x.ResultDisciplineType,//
ResultTitleType = x.ResultTitleType,// ResultTitleType = x.ResultTitleType,//
ResultYear = x.ResultYear,//
}) })
.OrderByDescending(x => x.CreatedAt) .OrderByDescending(x => x.CreatedAt)
.Skip((page - 1) * pageSize) .Skip((page - 1) * pageSize)