fix keyword

This commit is contained in:
Bright 2024-08-26 17:18:24 +07:00
parent d823d3a4ae
commit 759d98be61

View file

@ -182,13 +182,14 @@ namespace BMA.EHR.Placement.Service.Controllers
// placementReceives.Where(x => x.Status.Trim().ToUpper().Contains("PENDING"));
if (keyword != "")
{
var data = placementReceives.Where(x => x.prefix.Contains(keyword) ||
x.firstName.Contains(keyword) ||
x.lastName.Contains(keyword) ||
x.citizenId.Contains(keyword) ||
x.root.Contains(keyword) ||
x.nodeName.Contains(keyword) ||
x.nodeShortName.Contains(keyword))
var data = placementReceives.Where(x =>
(x.prefix != null && x.prefix.Contains(keyword)) ||
(x.firstName != null && x.firstName.Contains(keyword)) ||
(x.lastName != null && x.lastName.Contains(keyword)) ||
(x.citizenId != null && x.citizenId.Contains(keyword)) ||
(x.root != null && x.root.Contains(keyword)) ||
(x.nodeName != null && x.nodeName.Contains(keyword)) ||
(x.nodeShortName != null && x.nodeShortName.Contains(keyword)))
.OrderByDescending(x => x.CreatedAt)
.Skip((page - 1) * pageSize)
.Take(pageSize)