diff --git a/Services/PeriodExamService.cs b/Services/PeriodExamService.cs index 544cfc9..c3f5eac 100644 --- a/Services/PeriodExamService.cs +++ b/Services/PeriodExamService.cs @@ -692,19 +692,19 @@ namespace BMA.EHR.Recurit.Exam.Service.Services .OrderByDescending(d => d.CreatedAt) .Where(x => x.PeriodExam == periodExam && x.RegisterDate != null && x.Status != "register" && x.Status != "rejectRegister") .Where(x => - (x.PositionExam == null || x.PositionExam.PositionLevelName == null ? true : x.PositionExam.PositionLevelName.Contains(keyword)) || - (x.PositionExam == null || x.PositionExam.PositionName == null ? true : x.PositionExam.PositionName.Contains(keyword)) || - (x.CitizenId == null ? true : x.CitizenId.Contains(keyword)) || - (x.PrefixName == null ? true : x.PrefixName.Contains(keyword)) || - (x.FirstName == null ? true : x.FirstName.Contains(keyword)) || - (x.LastName == null ? true : x.LastName.Contains(keyword)) || - (x.ExamIdenNumber == null ? true : x.ExamIdenNumber.Contains(keyword)) || - (x.SeatNumber == null ? true : x.SeatNumber.Contains(keyword)) || - (x.ResultA == null ? true : x.ResultA.Contains(keyword)) || - (x.ResultB == null ? true : x.ResultB.Contains(keyword)) || - (x.ResultC == null ? true : x.ResultC.Contains(keyword)) || - (x.Pass == null ? true : x.Pass.Contains(keyword)) - // (x.RegisterDate == null ? true : x.RegisterDate.Value.ToThaiShortDateTime().Contains(keyword)) + (x.PositionExam == null || x.PositionExam.PositionLevelName == null ? false : x.PositionExam.PositionLevelName.Contains(keyword)) || + (x.PositionExam == null || x.PositionExam.PositionName == null ? false : x.PositionExam.PositionName.Contains(keyword)) || + (x.CitizenId == null ? false : x.CitizenId.Contains(keyword)) || + (x.PrefixName == null ? false : x.PrefixName.Contains(keyword)) || + (x.FirstName == null ? false : x.FirstName.Contains(keyword)) || + (x.LastName == null ? false : x.LastName.Contains(keyword)) || + (x.ExamIdenNumber == null ? false : x.ExamIdenNumber.Contains(keyword)) || + (x.SeatNumber == null ? false : x.SeatNumber.Contains(keyword)) || + (x.ResultA == null ? false : x.ResultA.Contains(keyword)) || + (x.ResultB == null ? false : x.ResultB.Contains(keyword)) || + (x.ResultC == null ? false : x.ResultC.Contains(keyword)) || + (x.Pass == null ? false : x.Pass.Contains(keyword)) + // (x.RegisterDate == null ? false : x.RegisterDate.Value.ToThaiShortDateTime().Contains(keyword)) ) .Select(x => new { @@ -733,19 +733,19 @@ namespace BMA.EHR.Recurit.Exam.Service.Services var _candidate = await _context.Candidates.AsQueryable() .Where(x => x.PeriodExam == periodExam && x.RegisterDate != null && x.Status != "register" && x.Status != "rejectRegister") .Where(x => - (x.PositionExam == null || x.PositionExam.PositionLevelName == null ? true : x.PositionExam.PositionLevelName.Contains(keyword)) || - (x.PositionExam == null || x.PositionExam.PositionName == null ? true : x.PositionExam.PositionName.Contains(keyword)) || - (x.CitizenId == null ? true : x.CitizenId.Contains(keyword)) || - (x.PrefixName == null ? true : x.PrefixName.Contains(keyword)) || - (x.FirstName == null ? true : x.FirstName.Contains(keyword)) || - (x.LastName == null ? true : x.LastName.Contains(keyword)) || - (x.ExamIdenNumber == null ? true : x.ExamIdenNumber.Contains(keyword)) || - (x.SeatNumber == null ? true : x.SeatNumber.Contains(keyword)) || - (x.ResultA == null ? true : x.ResultA.Contains(keyword)) || - (x.ResultB == null ? true : x.ResultB.Contains(keyword)) || - (x.ResultC == null ? true : x.ResultC.Contains(keyword)) || - (x.Pass == null ? true : x.Pass.Contains(keyword)) - // (x.RegisterDate == null ? true : x.RegisterDate.Value.ToThaiShortDateTime().Contains(keyword)) + (x.PositionExam == null || x.PositionExam.PositionLevelName == null ? false : x.PositionExam.PositionLevelName.Contains(keyword)) || + (x.PositionExam == null || x.PositionExam.PositionName == null ? false : x.PositionExam.PositionName.Contains(keyword)) || + (x.CitizenId == null ? false : x.CitizenId.Contains(keyword)) || + (x.PrefixName == null ? false : x.PrefixName.Contains(keyword)) || + (x.FirstName == null ? false : x.FirstName.Contains(keyword)) || + (x.LastName == null ? false : x.LastName.Contains(keyword)) || + (x.ExamIdenNumber == null ? false : x.ExamIdenNumber.Contains(keyword)) || + (x.SeatNumber == null ? false : x.SeatNumber.Contains(keyword)) || + (x.ResultA == null ? false : x.ResultA.Contains(keyword)) || + (x.ResultB == null ? false : x.ResultB.Contains(keyword)) || + (x.ResultC == null ? false : x.ResultC.Contains(keyword)) || + (x.Pass == null ? false : x.Pass.Contains(keyword)) + // (x.RegisterDate == null ? false : x.RegisterDate.Value.ToThaiShortDateTime().Contains(keyword)) ) .CountAsync(); if (candidate.Where(x => x.Status == "done").FirstOrDefault() != null) @@ -767,19 +767,19 @@ namespace BMA.EHR.Recurit.Exam.Service.Services .OrderByDescending(d => d.CreatedAt) .Where(x => x.PeriodExam == periodExam && x.Status == status) .Where(x => - (x.PositionExam == null || x.PositionExam.PositionLevelName == null ? true : x.PositionExam.PositionLevelName.Contains(keyword)) || - (x.PositionExam == null || x.PositionExam.PositionName == null ? true : x.PositionExam.PositionName.Contains(keyword)) || - (x.CitizenId == null ? true : x.CitizenId.Contains(keyword)) || - (x.PrefixName == null ? true : x.PrefixName.Contains(keyword)) || - (x.FirstName == null ? true : x.FirstName.Contains(keyword)) || - (x.LastName == null ? true : x.LastName.Contains(keyword)) || - (x.ExamIdenNumber == null ? true : x.ExamIdenNumber.Contains(keyword)) || - (x.SeatNumber == null ? true : x.SeatNumber.Contains(keyword)) || - (x.ResultA == null ? true : x.ResultA.Contains(keyword)) || - (x.ResultB == null ? true : x.ResultB.Contains(keyword)) || - (x.ResultC == null ? true : x.ResultC.Contains(keyword)) || - (x.Pass == null ? true : x.Pass.Contains(keyword)) - // (x.RegisterDate == null ? true : x.RegisterDate.Value.ToThaiShortDateTime().Contains(keyword)) + (x.PositionExam == null || x.PositionExam.PositionLevelName == null ? false : x.PositionExam.PositionLevelName.Contains(keyword)) || + (x.PositionExam == null || x.PositionExam.PositionName == null ? false : x.PositionExam.PositionName.Contains(keyword)) || + (x.CitizenId == null ? false : x.CitizenId.Contains(keyword)) || + (x.PrefixName == null ? false : x.PrefixName.Contains(keyword)) || + (x.FirstName == null ? false : x.FirstName.Contains(keyword)) || + (x.LastName == null ? false : x.LastName.Contains(keyword)) || + (x.ExamIdenNumber == null ? false : x.ExamIdenNumber.Contains(keyword)) || + (x.SeatNumber == null ? false : x.SeatNumber.Contains(keyword)) || + (x.ResultA == null ? false : x.ResultA.Contains(keyword)) || + (x.ResultB == null ? false : x.ResultB.Contains(keyword)) || + (x.ResultC == null ? false : x.ResultC.Contains(keyword)) || + (x.Pass == null ? false : x.Pass.Contains(keyword)) + // (x.RegisterDate == null ? false : x.RegisterDate.Value.ToThaiShortDateTime().Contains(keyword)) ) .Skip((page - 1) * pageSize) .Take(pageSize) @@ -808,19 +808,19 @@ namespace BMA.EHR.Recurit.Exam.Service.Services var _candidate = await _context.Candidates.AsQueryable() .Where(x => x.PeriodExam == periodExam && x.RegisterDate != null && x.Status != "register" && x.Status != "rejectRegister") .Where(x => - (x.PositionExam == null || x.PositionExam.PositionLevelName == null ? true : x.PositionExam.PositionLevelName.Contains(keyword)) || - (x.PositionExam == null || x.PositionExam.PositionName == null ? true : x.PositionExam.PositionName.Contains(keyword)) || - (x.CitizenId == null ? true : x.CitizenId.Contains(keyword)) || - (x.PrefixName == null ? true : x.PrefixName.Contains(keyword)) || - (x.FirstName == null ? true : x.FirstName.Contains(keyword)) || - (x.LastName == null ? true : x.LastName.Contains(keyword)) || - (x.ExamIdenNumber == null ? true : x.ExamIdenNumber.Contains(keyword)) || - (x.SeatNumber == null ? true : x.SeatNumber.Contains(keyword)) || - (x.ResultA == null ? true : x.ResultA.Contains(keyword)) || - (x.ResultB == null ? true : x.ResultB.Contains(keyword)) || - (x.ResultC == null ? true : x.ResultC.Contains(keyword)) || - (x.Pass == null ? true : x.Pass.Contains(keyword)) - // (x.RegisterDate == null ? true : x.RegisterDate.Value.ToThaiShortDateTime().Contains(keyword)) + (x.PositionExam == null || x.PositionExam.PositionLevelName == null ? false : x.PositionExam.PositionLevelName.Contains(keyword)) || + (x.PositionExam == null || x.PositionExam.PositionName == null ? false : x.PositionExam.PositionName.Contains(keyword)) || + (x.CitizenId == null ? false : x.CitizenId.Contains(keyword)) || + (x.PrefixName == null ? false : x.PrefixName.Contains(keyword)) || + (x.FirstName == null ? false : x.FirstName.Contains(keyword)) || + (x.LastName == null ? false : x.LastName.Contains(keyword)) || + (x.ExamIdenNumber == null ? false : x.ExamIdenNumber.Contains(keyword)) || + (x.SeatNumber == null ? false : x.SeatNumber.Contains(keyword)) || + (x.ResultA == null ? false : x.ResultA.Contains(keyword)) || + (x.ResultB == null ? false : x.ResultB.Contains(keyword)) || + (x.ResultC == null ? false : x.ResultC.Contains(keyword)) || + (x.Pass == null ? false : x.Pass.Contains(keyword)) + // (x.RegisterDate == null ? false : x.RegisterDate.Value.ToThaiShortDateTime().Contains(keyword)) ) .CountAsync(); if (candidate.Where(x => x.Status == "done").FirstOrDefault() != null)