diff --git a/Controllers/DisableController.cs b/Controllers/DisableController.cs
index ac85b96..24ddfc7 100644
--- a/Controllers/DisableController.cs
+++ b/Controllers/DisableController.cs
@@ -1562,12 +1562,12 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers
                     for (int i = 0; i < c_package.Workbook.Worksheets.Count; i++)
                     {
                         var workSheet = c_package.Workbook.Worksheets[i];
-                        var totalRows = workSheet.Dimension.Rows;
+                        //var totalRows = workSheet.Dimension.Rows;
                         var cols = workSheet.GetHeaderColumns();
 
                         int row = 8;
-
-                        while (row <= totalRows)
+                        var endRow = workSheet.Dimension.End.Row; // แถวสุดท้ายที่มีข้อมูล
+                        while (row <= endRow)
                         {
                             var cell1 = workSheet?.Cells[row, 1]?.GetValue<string>();
                             if (cell1 == "" || cell1 == null) break;
@@ -1776,10 +1776,10 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers
                 {
                     foreach (var workSheet in c_package.Workbook.Worksheets)
                     {
-                        var totalRows = workSheet.Dimension.Rows;
+                        //var totalRows = workSheet.Dimension.Rows;
                         int row = 7; // เริ่มที่ row 7 ตามตัวอย่างไฟล์
-
-                        while (row <= totalRows)
+                        var endRow = workSheet.Dimension.End.Row; // แถวสุดท้ายที่มีข้อมูล
+                        while (row <= endRow)
                         {
                             var examId = workSheet?.Cells[row, 2]?.GetValue<string>();
                             if (string.IsNullOrWhiteSpace(examId))
@@ -2027,9 +2027,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers
                     query = query.Where(x =>
                         x.ExamId.Contains(keywordParam) ||
                         x.CitizenId.Contains(keywordParam) ||
-                        x.Prefix.Contains(keywordParam) ||
-                        x.FirstName.Contains(keywordParam) ||
-                        x.LastName.Contains(keywordParam) ||
+                        (x.Prefix + x.FirstName + " " + x.LastName).Contains(keywordParam) ||
                         x.HddPosition.Contains(keywordParam) ||
                         x.PositionName.Contains(keywordParam)
                     );