diff --git a/BMA.EHR.Discipline.Service/Controllers/DisciplineDisciplinaryController.cs b/BMA.EHR.Discipline.Service/Controllers/DisciplineDisciplinaryController.cs
index c12330f9..59d4176e 100644
--- a/BMA.EHR.Discipline.Service/Controllers/DisciplineDisciplinaryController.cs
+++ b/BMA.EHR.Discipline.Service/Controllers/DisciplineDisciplinaryController.cs
@@ -124,7 +124,9 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
             var status = string.IsNullOrEmpty(req.status) ? string.Empty : req.status;
 
             var data_search = (from x in _context.DisciplineDisciplinarys
-                               where x.Title.Contains(keyword)
+                               where x.Title.Contains(keyword) ||
+                                  x.DisciplinaryFaultLevel.Contains(keyword) ||
+                                  x.DisciplinaryCaseFault.Contains(keyword)
                                select x).ToList();
             if (status.Trim().ToUpper() != "ALL")
                 data_search = data_search.Where(x => x.Status.Contains(status.Trim().ToUpper())).ToList();
diff --git a/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs b/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs
index f09ac093..3489759d 100644
--- a/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs
+++ b/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs
@@ -144,7 +144,11 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
             var status = string.IsNullOrEmpty(req.status) ? string.Empty : req.status;
 
             var data_search = await _context.DisciplineDisciplinarys.AsQueryable()
-                               .Where(x => x.Title.Contains(keyword))
+                               .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();
             if (status.Trim().ToUpper() != "ALL")