From ee9e233e9903fc41a602c8afbda47dd38d6e833f Mon Sep 17 00:00:00 2001 From: Harid Promsri <52228846+Harid-999@users.noreply.github.com> Date: Wed, 22 Oct 2025 14:19:26 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=84=E0=B9=89?= =?UTF-8?q?=E0=B8=99=E0=B8=AB=E0=B8=B2=E0=B8=8A=E0=B8=B7=E0=B9=88=E0=B8=AD?= =?UTF-8?q?=E0=B9=80=E0=B8=95=E0=B9=87=E0=B8=A1=20+=20=E0=B8=99=E0=B8=B3?= =?UTF-8?q?=E0=B9=80=E0=B8=82=E0=B9=89=E0=B8=B2=E0=B9=81=E0=B8=A5=E0=B9=89?= =?UTF-8?q?=E0=B8=A7=E0=B8=A5=E0=B8=B3=E0=B8=94=E0=B8=B1=E0=B8=9A=E0=B8=AA?= =?UTF-8?q?=E0=B8=AD=E0=B8=9A=E0=B9=81=E0=B8=96=E0=B8=A7=E0=B8=AA=E0=B8=B8?= =?UTF-8?q?=E0=B8=94=E0=B8=97=E0=B9=89=E0=B8=B2=E0=B8=A2=E0=B9=84=E0=B8=A1?= =?UTF-8?q?=E0=B9=88=E0=B8=AD=E0=B8=B1=E0=B8=9E=E0=B9=80=E0=B8=94=E0=B8=97?= =?UTF-8?q?=20(#5)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: harid --- Controllers/DisableController.cs | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) 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(); 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(); 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) );