diff --git a/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs b/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs
index 2ee4e7a4..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<ActionResult<ResponseObject>> 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
@@ -78,6 +92,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)