From 57012f450d8265ddf5f359d67df2563733b36477 Mon Sep 17 00:00:00 2001 From: Bright Date: Tue, 3 Dec 2024 10:32:40 +0700 Subject: [PATCH] fix search fullName & posType+posLevel --- .../Controllers/DisciplineDirectorController.cs | 5 +++-- .../Controllers/DisciplineSuspendController.cs | 12 +++++++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/BMA.EHR.Discipline.Service/Controllers/DisciplineDirectorController.cs b/BMA.EHR.Discipline.Service/Controllers/DisciplineDirectorController.cs index 49e426b9..26a0c293 100644 --- a/BMA.EHR.Discipline.Service/Controllers/DisciplineDirectorController.cs +++ b/BMA.EHR.Discipline.Service/Controllers/DisciplineDirectorController.cs @@ -87,9 +87,10 @@ namespace BMA.EHR.DisciplineDirector.Service.Controllers return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden); } var data_search = (from x in _context.DisciplineDirectors.Include(x => x.DisciplineInvestigate_Directors).Include(x => x.DisciplineDisciplinary_DirectorInvestigates) - where x.Prefix.Contains(keyword) || + where /*x.Prefix.Contains(keyword) || x.FirstName.Contains(keyword) || - x.LastName.Contains(keyword) || + x.LastName.Contains(keyword) ||*/ + ((x.Prefix ?? "") + (x.FirstName ?? "") + " " + (x.LastName ?? "")).Contains(keyword) || x.Position.Contains(keyword) || x.Email.Contains(keyword) || x.Phone.Contains(keyword) || diff --git a/BMA.EHR.Discipline.Service/Controllers/DisciplineSuspendController.cs b/BMA.EHR.Discipline.Service/Controllers/DisciplineSuspendController.cs index 57a2fcd9..97d1d51a 100644 --- a/BMA.EHR.Discipline.Service/Controllers/DisciplineSuspendController.cs +++ b/BMA.EHR.Discipline.Service/Controllers/DisciplineSuspendController.cs @@ -68,14 +68,16 @@ namespace BMA.EHR.DisciplineSuspend.Service.Controllers } var data_search = (from x in _context.DisciplineReport_Profiles.Include(x => x.DisciplineDisciplinary) where (x.CitizenId == null ? false : x.CitizenId.Contains(keyword)) || - (x.Prefix == null ? false : x.Prefix.Contains(keyword)) || - (x.FirstName == null ? false : x.FirstName.Contains(keyword)) || - (x.LastName == null ? false : x.LastName.Contains(keyword)) || + //(x.Prefix == null ? false : x.Prefix.Contains(keyword)) || + //(x.FirstName == null ? false : x.FirstName.Contains(keyword)) || + //(x.LastName == null ? false : x.LastName.Contains(keyword)) || + ((x.Prefix ?? "") + (x.FirstName ?? "") + " " + (x.LastName ?? "")).Contains(keyword) || (x.Organization == null ? false : x.Organization.Contains(keyword)) || (x.Position == null ? false : x.Position.Contains(keyword)) || (x.PosNo == null ? false : x.PosNo.Contains(keyword)) || - (x.posTypeName == null ? false : x.posTypeName.Contains(keyword)) || - (x.posLevelName == null ? false : x.posLevelName.Contains(keyword)) || + //(x.posTypeName == null ? false : x.posTypeName.Contains(keyword)) || + //(x.posLevelName == null ? false : x.posLevelName.Contains(keyword)) || + ((x.posTypeName ?? "") + " (" + (x.posLevelName ?? "") + ")").Contains(keyword) || (x.Title == null ? false : x.Title.Contains(keyword)) select x).ToList(); var data = data_search