From 9562093cc08deefca609aa2cec09e49abb17899f Mon Sep 17 00:00:00 2001 From: Kittapath Date: Tue, 9 Jan 2024 16:07:47 +0700 Subject: [PATCH 1/2] =?UTF-8?q?=E0=B8=AA=E0=B8=A3=E0=B8=B8=E0=B8=9B?= =?UTF-8?q?=E0=B8=9C=E0=B8=A5=E0=B8=A7=E0=B8=B4=E0=B8=99=E0=B8=B1=E0=B8=A2?= =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1=E0=B8=9B=E0=B8=B5?= =?UTF-8?q?=E0=B8=87=E0=B8=9A=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A1=E0=B8=B2?= =?UTF-8?q?=E0=B8=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/DisciplineResultController.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs b/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs index 2ee4e7a4..707216b2 100644 --- a/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs +++ b/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs @@ -78,6 +78,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers ResultOc = x.ResultOc,// ResultDisciplineType = x.ResultDisciplineType,// ResultTitleType = x.ResultTitleType,// + ResultYear = x.ResultYear,// }) .OrderByDescending(x => x.CreatedAt) .Skip((page - 1) * pageSize) From 664fd510f975daf51ddf42252ed4a1162670081f Mon Sep 17 00:00:00 2001 From: Kittapath Date: Tue, 9 Jan 2024 20:53:48 +0700 Subject: [PATCH 2/2] =?UTF-8?q?=E0=B8=84=E0=B9=89=E0=B8=99=E0=B8=AB?= =?UTF-8?q?=E0=B8=B2=E0=B8=AA=E0=B8=A3=E0=B8=B8=E0=B8=9B=E0=B8=9C=E0=B8=A1?= =?UTF-8?q?=E0=B8=A7=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/DisciplineResultController.cs | 26 ++++++++++++++----- 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs b/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs index 707216b2..ade91e3b 100644 --- a/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs +++ b/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs @@ -56,12 +56,26 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers [HttpGet()] public async Task> GetDisciplineResult(int page = 1, int pageSize = 25, string keyword = "", string status = "") { - var data_search = (from x in _context.DisciplineDisciplinarys - where x.Title.Contains(keyword) - where x.Status.Contains("DONE") || x.Status.Contains("REPORT") - // x.DisciplinaryFaultLevel == null ? false : x.DisciplinaryFaultLevel.Contains(keyword) || - // x.DisciplinaryCaseFault == null ? false : x.DisciplinaryCaseFault.Contains(keyword) || - select x).ToList(); + // var data_search = (from x in _context.DisciplineDisciplinarys + // where x.Title.Contains(keyword) || + // (x.ResultOc == null ? false : x.ResultOc.Contains(keyword)) || + // (x.ResultDisciplineType == null ? false : x.ResultDisciplineType.Contains(keyword)) || + // (x.ResultTitleType == null ? false : x.ResultTitleType.Contains(keyword)) || + // (x.ResultYear == null ? false : (x.ResultYear + 543).ToString().Contains(keyword)) + // where x.Status.Contains("DONE") || x.Status.Contains("REPORT") + // // x.DisciplinaryFaultLevel == null ? false : x.DisciplinaryFaultLevel.Contains(keyword) || + // // x.DisciplinaryCaseFault == null ? false : x.DisciplinaryCaseFault.Contains(keyword) || + // select x).ToList(); + var data_search = await _context.DisciplineDisciplinarys.AsQueryable() + .Where(x => x.Title.Contains(keyword) || + (x.ResultOc == null ? false : x.ResultOc.Contains(keyword)) || + (x.ResultDisciplineType == null ? false : x.ResultDisciplineType.Contains(keyword)) || + (x.ResultTitleType == null ? false : x.ResultTitleType.Contains(keyword)) || + (x.ResultYear == null ? false : (x.ResultYear + 543).ToString().Contains(keyword))) + .Where(x => x.Status.Contains("DONE") || x.Status.Contains("REPORT")) + .ToListAsync(); + // x.DisciplinaryFaultLevel == null ? false : x.DisciplinaryFaultLevel.Contains(keyword) || + // x.DisciplinaryCaseFault == null ? false : x.DisciplinaryCaseFault.Contains(keyword) || if (status.Trim().ToUpper() != "ALL") data_search = data_search.Where(x => x.Status.Contains(status.Trim().ToUpper())).ToList(); var data = data_search