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

fix search fullName & posType+posLevel

Browse source
This commit is contained in:
Bright 2024-12-03 10:32:40 +07:00
parent eb5de77b2d
commit 57012f450d
2 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
BMA.EHR.Discipline.Service/Controllers/DisciplineDirectorController.cs
View file

@ -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) ||

12
BMA.EHR.Discipline.Service/Controllers/DisciplineSuspendController.cs
View file

@ -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