From 0b9d3b16ac8eba5579d10005f22e08f91a3d72fc Mon Sep 17 00:00:00 2001 From: Bright Date: Thu, 17 Jul 2025 15:41:44 +0700 Subject: [PATCH] =?UTF-8?q?Fix=20Bug=20=E0=B8=84=E0=B9=89=E0=B8=99?= =?UTF-8?q?=E0=B8=AB=E0=B8=B2=E0=B8=82=E0=B8=B1=E0=B9=89=E0=B8=99=E0=B8=AA?= =?UTF-8?q?=E0=B8=B9=E0=B8=87=E0=B8=A3=E0=B8=B0=E0=B8=9A=E0=B8=9A=E0=B8=A7?= =?UTF-8?q?=E0=B8=B4=E0=B8=99=E0=B8=B1=E0=B8=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/DisciplineDisciplinaryController.cs | 2 +- .../Controllers/DisciplineResultController.cs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/BMA.EHR.Discipline.Service/Controllers/DisciplineDisciplinaryController.cs b/BMA.EHR.Discipline.Service/Controllers/DisciplineDisciplinaryController.cs index 01ec1566..c12330f9 100644 --- a/BMA.EHR.Discipline.Service/Controllers/DisciplineDisciplinaryController.cs +++ b/BMA.EHR.Discipline.Service/Controllers/DisciplineDisciplinaryController.cs @@ -156,7 +156,7 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers && (string.IsNullOrEmpty(req.disciplinaryFaultLevel) || x.DisciplinaryFaultLevel == req.disciplinaryFaultLevel) && - (string.IsNullOrEmpty(req.disciplinaryCaseFault) || x.DisciplinaryCaseFault.Contains(req.disciplinaryCaseFault)) + (string.IsNullOrEmpty(req.disciplinaryCaseFault) || (x.DisciplinaryCaseFault?.Contains(req.disciplinaryCaseFault) ?? false)) ) .ToList(); } diff --git a/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs b/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs index f060ae84..f09ac093 100644 --- a/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs +++ b/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs @@ -175,13 +175,13 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers && (string.IsNullOrEmpty(req.disciplinaryFaultLevel) || x.DisciplinaryFaultLevel == req.disciplinaryFaultLevel) && - (string.IsNullOrEmpty(req.disciplinaryCaseFault) || x.DisciplinaryCaseFault.Contains(req.disciplinaryCaseFault)) + (string.IsNullOrEmpty(req.disciplinaryCaseFault) || (x.DisciplinaryCaseFault?.Contains(req.disciplinaryCaseFault) ?? false)) && - (string.IsNullOrEmpty(req.resultDisciplineType) || x.ResultDisciplineType.Contains(req.resultDisciplineType)) + (string.IsNullOrEmpty(req.resultDisciplineType) || (x.ResultDisciplineType?.Contains(req.resultDisciplineType) ?? false)) && - (string.IsNullOrEmpty(req.resultTitleType) || x.ResultTitleType.Contains(req.resultTitleType)) + (string.IsNullOrEmpty(req.resultTitleType) || (x.ResultTitleType?.Contains(req.resultTitleType) ?? false)) && - (string.IsNullOrEmpty(req.resultOc) || x.ResultOc.Contains(req.resultOc)) + (string.IsNullOrEmpty(req.resultOc) || (x.ResultOc?.Contains(req.resultOc) ?? false)) && (!req.resultYear.HasValue || x.ResultYear == req.resultYear) )