From 759d98be61d490085689d8b64007291dc75992df Mon Sep 17 00:00:00 2001
From: Bright <harid_pr61@live.rmutl.ac.th>
Date: Mon, 26 Aug 2024 17:18:24 +0700
Subject: [PATCH] fix keyword

---
 .../Controllers/PlacementReceiveController.cs     | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs
index 6473f827..a366d428 100644
--- a/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs
+++ b/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs
@@ -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)