From 0f295fb4d6a787943c03e4a4a3e44c1e98ef6c5b Mon Sep 17 00:00:00 2001 From: Kittapath Date: Thu, 21 Dec 2023 13:41:09 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89paging=E0=B8=AA?= =?UTF-8?q?=E0=B8=A3=E0=B8=B8=E0=B8=9B=E0=B8=9C=E0=B8=A1=E0=B8=A7=E0=B8=B4?= =?UTF-8?q?=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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs b/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs index 47200de3..7050f102 100644 --- a/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs +++ b/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs @@ -57,6 +57,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers { 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(); @@ -72,7 +73,6 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers Status = x.Status,//สถานะหรือผลการสอบสวน CreatedAt = x.CreatedAt,//วันที่สร้างเรื่องสอบสวน }) - .Where(x => x.Status == "DONE" || x.Status == "REPORT") .OrderByDescending(x => x.CreatedAt) .Skip((page - 1) * pageSize) .Take(pageSize)