From 5c4467dc06612742d5cb70554035bf1698e2a3d6 Mon Sep 17 00:00:00 2001 From: harid Date: Wed, 12 Nov 2025 10:53:59 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=80=E0=B8=9B?= =?UTF-8?q?=E0=B9=87=E0=B8=99=E0=B9=80=E0=B8=A5=E0=B8=82=E0=B8=9B=E0=B8=A3?= =?UTF-8?q?=E0=B8=B0=E0=B8=88=E0=B8=B3=E0=B8=95=E0=B8=B1=E0=B8=A7=E0=B8=AA?= =?UTF-8?q?=E0=B8=AD=E0=B8=9A=E0=B8=95=E0=B8=B2=E0=B8=A1=E0=B9=80=E0=B8=97?= =?UTF-8?q?=E0=B8=A1=E0=B9=80=E0=B8=9E=E0=B8=A5=E0=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Controllers/RecruitController.cs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Controllers/RecruitController.cs b/Controllers/RecruitController.cs index ca9ed1d..925f4af 100644 --- a/Controllers/RecruitController.cs +++ b/Controllers/RecruitController.cs @@ -3000,10 +3000,8 @@ namespace BMA.EHR.Recruit.Service.Controllers { FullName = $"{p.Prefix}{p.FirstName} {p.LastName}", PositionName = p.PositionName, - Remark = p.Remark != null ? p.Remark.ToThaiNumber() : "", - RefNo1 = p.Payments.Select(x => x.RefNo1).FirstOrDefault() != null - ? p.Payments.Select(x => x.RefNo1).FirstOrDefault().ToThaiNumber() - : "", + Remark = !string.IsNullOrEmpty(p.Remark) ? p.Remark.ToThaiNumber() : "", + ExamId = !string.IsNullOrEmpty(p.ExamId) ? p.ExamId.ToThaiNumber() : "", ExamName = $"ครั้งที่ {(p.RecruitImport != null ? p.RecruitImport.Order.ToString().ToThaiNumber() : "")}/{(p.RecruitImport != null ? p.RecruitImport.Year.ToThaiYear().ToString().ToThaiNumber() : "")}", }).ToListAsync(); @@ -3024,7 +3022,7 @@ namespace BMA.EHR.Recruit.Service.Controllers Persons = g.Select((x, index) => new { No = (index + 1).ToString().ToThaiNumber(), - RefNo1 = x.RefNo1, + ExamId = x.ExamId, FullName = x.FullName, Remark = x.Remark }).ToList() @@ -3080,7 +3078,7 @@ namespace BMA.EHR.Recruit.Service.Controllers foreach (var person in group.Persons) { ws.Cells[row, 1].Value = person.No; - ws.Cells[row, 2].Value = person.RefNo1; + ws.Cells[row, 2].Value = person.ExamId; ws.Cells[row, 3].Value = person.FullName; ws.Cells[row, 4].Value = person.Remark;