diff --git a/BMA.EHR.Discipline.Service/Controllers/DisciplineReportController.cs b/BMA.EHR.Discipline.Service/Controllers/DisciplineReportController.cs index 599a0ae8..f819e6a0 100644 --- a/BMA.EHR.Discipline.Service/Controllers/DisciplineReportController.cs +++ b/BMA.EHR.Discipline.Service/Controllers/DisciplineReportController.cs @@ -95,13 +95,13 @@ namespace BMA.EHR.DisciplineSuspend.Service.Controllers .ToListAsync(); if (req.status.Trim().ToUpper() != "ALL") - data_search = data_search.Where(x => x.Status.Contains(req.status.Trim().ToUpper())).ToList(); + data_search = data_search.Where(x => x.Status != null && x.Status.Contains(req.status.Trim().ToUpper())).ToList(); if (req.offenseDetail.Trim().ToUpper() != "ALL") - data_search = data_search.Where(x => x.OffenseDetails.Contains(req.status.Trim().ToUpper())).ToList(); + data_search = data_search.Where(x => x.OffenseDetails != null && x.OffenseDetails.Contains(req.status.Trim().ToUpper())).ToList(); if (req.disciplinaryFaultLevel.Trim().ToUpper() != "ALL") - data_search = data_search.Where(x => x.DisciplinaryFaultLevel.Contains(req.status.Trim().ToUpper())).ToList(); + data_search = data_search.Where(x => x.DisciplinaryFaultLevel != null && x.DisciplinaryFaultLevel.Contains(req.status.Trim().ToUpper())).ToList(); var mapData = data_search .SelectMany((d) => d.DisciplineDisciplinary_ProfileComplaintInvestigates.Select((profile) => new