From f52b750ac03b55d71d55d948a5f5d8b9433eb928 Mon Sep 17 00:00:00 2001
From: Bright <harid_pr61@live.rmutl.ac.th>
Date: Wed, 25 Jun 2025 17:19:57 +0700
Subject: [PATCH] fix

---
 Controllers/ExamReportController.cs | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/Controllers/ExamReportController.cs b/Controllers/ExamReportController.cs
index 4803a17..0dccb44 100644
--- a/Controllers/ExamReportController.cs
+++ b/Controllers/ExamReportController.cs
@@ -350,11 +350,11 @@ namespace BMA.EHR.Report.Service.Controllers
                     .Include(x => x.PeriodExam)
                     .Where(x => x.PeriodExam == periodExam)
                     .Where(x => x.Status != "register")
-                    .Where(x => x.SeatNumber != null || x.SeatNumber != "")
-                    .OrderBy(x => x.SeatNumber)
+                    .Where(x => x.ExamIdenNumber != null || x.ExamIdenNumber != "")
+                    .OrderBy(x => x.ExamIdenNumber)
                     .Select(p => new
                     {
-                        ExamId = p.SeatNumber == null ? null : (p.SeatNumber.ToThaiNumber()),
+                        ExamId = p.ExamIdenNumber == null ? null : (p.ExamIdenNumber.ToThaiNumber()),
                         FullName = $"{p.PrefixName}{p.FirstName} {p.LastName}",
                         PositionName = "",
                         ExamName =
@@ -550,9 +550,9 @@ namespace BMA.EHR.Report.Service.Controllers
 
                 var data = candidates.Select((p, idx) => new
                 {
-                    ExamId = p.SeatNumber == null ? "-" : (p.SeatNumber.ToThaiNumber()),
+                    SeatNumber = p.SeatNumber == null ? "-" : (p.SeatNumber.ToThaiNumber()),
                     CitizenId = p.CitizenId == null ? "-" : (p.CitizenId.ToThaiNumber()),
-                    FullName = $"{p.FirstName} {p.LastName}",
+                    FullName = $"{p.PrefixName}{p.FirstName} {p.LastName}",
                     DateOfBirth = p.DateOfBirth == null ? "-" : (p.DateOfBirth.Value.ToThaiShortDate()),
                     ExamName = ($"{p.PeriodExam.Name} ครั้งที่ {p.PeriodExam.Round}/{p.PeriodExam.Year.Value.ToThaiYear()}").ToThaiNumber(),
                     Number = p.Number == null ? (idx + 1).ToString().ToThaiNumber() : p.Number.ToThaiNumber(),
@@ -564,9 +564,10 @@ namespace BMA.EHR.Report.Service.Controllers
                     SumC = p.PointC == null ? "-" : p.PointC.ToString(),
                     SumScore = ((Convert.ToInt32(p.PointB ?? "0") + Convert.ToInt32(p.PointC ?? "0")).ToString()).ToThaiNumber(),
                     ExamResult = p.Pass,
-                    ExamIdenNumber = p.ExamIdenNumber
+                    ExamThaiId = p.ExamIdenNumber == null ? "-" : p.ExamIdenNumber.ToThaiNumber(),
+                    ExamId = p.ExamIdenNumber,
                 })
-                .OrderBy(x => x.ExamIdenNumber)
+                .OrderBy(x => x.ExamId)
                 .Where(x => x.ExamResult?.Trim() == "ได้")
                 .ToList();