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)