Merge branch 'develop' into dev

.gitignore

@@ -475,3 +475,5 @@ $RECYCLE.BIN/
 
 # Windows shortcuts
 *.lnk
+
+.claude

Controllers/DisableController.cs

@@ -86,6 +86,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers
         private string? UserId => _httpContextAccessor?.HttpContext?.User?.FindFirst(ClaimTypes.NameIdentifier)?.Value;
 
         private string? FullName => _httpContextAccessor?.HttpContext?.User?.FindFirst("name")?.Value;
+        private string? RootDnaId => _httpContextAccessor?.HttpContext?.User?.FindFirst("orgRootDnaId")?.Value;
         private string? token => _httpContextAccessor.HttpContext.Request.Headers["Authorization"];
 
         #endregion
@@ -282,10 +283,10 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers
 
         #endregion
 
-        #region " จัดการรอบการสมัครสอบคัดเลือกผู้พิการ "
+        #region " จัดการรอบการสมัครสอบคัดเลือกอื่นๆ "
 
         /// <summary>
-        /// แสดงข้อมูลรอบการสอบคัดเลือกผู้พิการ
+        /// แสดงข้อมูลรอบการสอบคัดเลือกอื่นๆ
         /// </summary>
         /// <returns></returns>
         /// <response code="200">เมื่อทำการอ่านข้อมูลจาก Relational Database สำเร็จ</response>
@@ -340,9 +341,9 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers
         }
 
         /// <summary>
-        /// แสดงข้อมูลรอบการสอบคัดเลือกผู้พิการเป็นรายการ
+        /// แสดงข้อมูลรอบการสอบคัดเลือกอื่นๆเป็นรายการ
         /// </summary>
-        /// <param name="id">รหัสรอบการสอบคัดเลือกผู้พิการ</param>
+        /// <param name="id">รหัสรอบการสอบคัดเลือกอื่นๆ</param>
         /// <returns></returns>
         /// <response code="200">เมื่อทำการอ่านข้อมูลจาก Relational Database สำเร็จ</response>
         /// <response code="400">ค่าตัวแปรที่ส่งมาไม่ถูกต้อง</response>
@@ -381,6 +382,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers
                                     AnnouncementEndDate = x.AnnouncementEndDate,
                                     AnnouncementStartDate = x.AnnouncementStartDate,
                                     AnnouncementDate = x.AnnouncementDate,
+                                    ScoreExpireDate = x.ScoreExpireDate,
                                     CheckDisability = x.CheckDisability,
                                     CheckDocument = x.CheckDocument,
                                     Detail = x.Detail,
@@ -450,7 +452,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers
 
 
         /// <summary>
-        /// เพิ่มข้อมูลรอบการจัดสอบคัดเลือกผู้พิการ
+        /// เพิ่มข้อมูลรอบการจัดสอบคัดเลือกอื่นๆ
         /// </summary>
         /// <param name="req">Request parameters</param>
         /// <returns></returns>
@@ -486,7 +488,9 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers
                     PaymentEndDate = req.PaymentEndDate,
                     Note = req.Note,
                     AnnouncementDate = req.AnnouncementDate,
+                    ScoreExpireDate = req.ScoreExpireDate,
                     CheckDisability = true,
+                    OrganizationId = req.rootDnaId,
                     CreatedAt = DateTime.Now,
                     CreatedUserId = UserId ?? "",
                     CreatedFullName = FullName ?? "System Administrator",
@@ -499,7 +503,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers
                 using (var client = new HttpClient())
                 {
                     client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                    client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                    client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                     var _req = new HttpRequestMessage(HttpMethod.Get, apiUrl);
                     var _res = await client.SendAsync(_req);
                     var _result = await _res.Content.ReadAsStringAsync();
@@ -523,9 +527,9 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers
         }
 
         /// <summary>
-        /// แก้ไขข้อมูลรอบการจัดสอบคัดเลือกผู้พิการ
+        /// แก้ไขข้อมูลรอบการจัดสอบคัดเลือกอื่นๆ
         /// </summary>
-        /// <param name="id">รหัสรอบการสอบคัดเลือกผู้พิการ</param>
+        /// <param name="id">รหัสรอบการสอบคัดเลือกอื่นๆ</param>
         /// <param name="req">Request parameters</param>
         /// <returns></returns>
         /// <response code="200">เมื่อทำการเพิ่มข้อมูลสำเร็จ</response>
@@ -568,6 +572,9 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers
                 data.ExamDate = req.ExamDate;
                 data.Note = req.Note;
                 data.AnnouncementDate = req.AnnouncementDate;
+                // ScoreExpireDate อัปเดตเฉพาะเมื่อ FE ส่งค่ามาเท่านั้น (ไม่บังคับส่ง)
+                if (req.ScoreExpireDate.HasValue)
+                    data.ScoreExpireDate = req.ScoreExpireDate;
                 data.LastUpdatedAt = DateTime.Now;
                 data.LastUpdateUserId = UserId ?? "";
                 data.LastUpdateFullName = FullName ?? "System Administrator";
@@ -585,9 +592,9 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers
 
 
         /// <summary>
-        /// ลบข้อมูลรอบการจัดสอบคัดเลือกผู้พิการ
+        /// ลบข้อมูลรอบการจัดสอบคัดเลือกอื่นๆ
         /// </summary>
-        /// <param name="id">รหัสรอบการสอบคัดเลือกผู้พิการ</param>
+        /// <param name="id">รหัสรอบการสอบคัดเลือกอื่นๆ</param>
         /// <returns></returns>
         /// <response code="200">เมื่อทำการลบข้อมูลสำเร็จ</response>
         /// <response code="400">ค่าตัวแปรที่ส่งมาไม่ถูกต้อง</response>
@@ -646,7 +653,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers
         #region " Candidate Files "
 
         /// <summary>
-        /// แสดงข้อมูลสำหรับหน้าจอ รายการนำเข้าข้อมูลผู้สมัครสอบคัดเลือกผู้พิการ
+        /// แสดงข้อมูลสำหรับหน้าจอ รายการนำเข้าข้อมูลผู้สมัครสอบคัดเลือกอื่นๆ
         /// </summary>
         /// <returns></returns>
         /// <response code="200">เมื่อแสดงรายการข้อมูลสำเร็จ</response>
@@ -668,8 +675,16 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers
                 {
                     return Error(jsonData["message"]?.ToString(), StatusCodes.Status403Forbidden);
                 }
+                string role = jsonData["result"]?.ToString() ?? string.Empty;
+                string rootDnaId = string.Empty;
+                if (role != "OWNER")
+                {
+                    rootDnaId = RootDnaId?.ToString() ?? "";
+                }
+                
                 var data = await _context.PeriodExams.AsQueryable()
                                 .Where(x => x.CheckDisability == true)
+                                .Where(x => string.IsNullOrEmpty(rootDnaId) || x.OrganizationId == Guid.Parse(rootDnaId))
                                 .Include(x => x.ImportFile)
                                 .Include(x => x.Disables)
                                 .Include(x => x.ScoreImport)
@@ -694,7 +709,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers
                                                 ImportYear = x.ScoreImport.Year,
                                                 ImportDate = x.CreatedAt.Date.ToThaiShortDate(),
                                                 ScoreCount = x.ScoreImport.Scores.Count(),
-                                                ResultCount = x.ScoreImport.Scores.Count(x => !string.IsNullOrEmpty(x.Number))
+                                                ResultCount = x.ScoreImport.Scores.Count(x => x.ExamStatus == "ผ่าน" && !string.IsNullOrEmpty(x.Number))
                                             },
                                     x.CreatedUserId,
                                 })
@@ -712,7 +727,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers
 
 
         /// <summary>
-        /// นำเข้ารายชื่อผู้สมัครสอบคัดเลือกผู้พิการ
+        /// นำเข้ารายชื่อผู้สมัครสอบคัดเลือกอื่นๆ
         /// </summary>
         /// <returns></returns>
         /// <response code="200">เมื่อทำนำเข้าข้อมูลสำเร็จ</response>
@@ -764,7 +779,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers
                     {
                         new DisableImportHistory
                         {
-                            Description = "นำเข้าข้อมูลผู้สมัครสอบคัดเลือกผู้พิการ",
+                            Description = "นำเข้าข้อมูลผู้สมัครสอบคัดเลือกอื่นๆ",
                             CreatedAt = DateTime.Now,
                             CreatedUserId = UserId ?? "",
                             CreatedFullName = FullName ?? "System Administrator",
@@ -954,9 +969,9 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers
         }
 
         /// <summary>
-        /// ลบข้อมูลนำข้อมูลผู้สมัครสอบคัดเลือกผู้พิการ
+        /// ลบข้อมูลนำข้อมูลผู้สมัครสอบคัดเลือกอื่นๆ
         /// </summary>
-        /// <param name="id">รหัสรอบการสอบคัดเลือกผู้พิการ</param>
+        /// <param name="id">รหัสรอบการสอบคัดเลือกอื่นๆ</param>
         /// <returns></returns>
         /// <response code="200">เมื่อทำนำเข้าข้อมูลสำเร็จ</response>
         /// <response code="400">ค่าตัวแปรที่ส่งมาไม่ถูกต้อง</response>
@@ -1019,9 +1034,9 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers
         }
 
         /// <summary>
-        /// แสดงประวัติการนำเข้าข้อมูลการสอบคัดเลือกผู้พิการ
+        /// แสดงประวัติการนำเข้าข้อมูลการสอบคัดเลือกอื่นๆ
         /// </summary>
-        /// <param name="id">รหัสรอบการสอบคัดเลือกผู้พิการ</param>
+        /// <param name="id">รหัสรอบการสอบคัดเลือกอื่นๆ</param>
         /// <returns></returns>
         /// <response code="200">เมื่อทำนำเข้าข้อมูลสำเร็จ</response>
         /// <response code="400">ค่าตัวแปรที่ส่งมาไม่ถูกต้อง</response>
@@ -1059,9 +1074,9 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers
 
 
         /// <summary>
-        /// นำเข้ารายชื่อผู้สมัครสอบคัดเลือกผู้พิการ (ข้อมูลผู้สมัครสอบ)
+        /// นำเข้ารายชื่อผู้สมัครสอบคัดเลือกอื่นๆ (ข้อมูลผู้สมัครสอบ)
         /// </summary>
-        /// <param name="id">รหัสรอบการสอบคัดเลือกผู้พิการ</param>
+        /// <param name="id">รหัสรอบการสอบคัดเลือกอื่นๆ</param>
         /// <returns></returns>
         /// <response code="200">เมื่อทำนำเข้าข้อมูลสำเร็จ</response>
         /// <response code="400">ค่าตัวแปรที่ส่งมาไม่ถูกต้อง</response>
@@ -1130,7 +1145,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers
                 // สร้างรอบการบรรจุ โดยเอาเข้ามูลมาใส่จาก Request
                 imported.ImportHostories.Add(new DisableImportHistory
                 {
-                    Description = "นำเข้าข้อมูลผู้สมัครสอบคัดเลือกผู้พิการ",
+                    Description = "นำเข้าข้อมูลผู้สมัครสอบคัดเลือกอื่นๆ",
                     CreatedAt = DateTime.Now,
                     CreatedUserId = UserId ?? "",
                     CreatedFullName = FullName ?? "System Administrator",
@@ -1459,9 +1474,9 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers
 
         #region " Score File "
         /// <summary>
-        /// นำเข้าผลคะแนนสอบคัดเลือกผู้พิการ (บัญชีรวมคะแนน)
+        /// นำเข้าผลคะแนนสอบคัดเลือกอื่นๆ (บัญชีรวมคะแนน)
         /// </summary>
-        /// <param name="id">รหัสรอบการสอบคัดเลือกผู้พิการ</param>
+        /// <param name="id">รหัสรอบการสอบคัดเลือกอื่นๆ</param>
         /// <returns></returns>
         /// <response code="200">เมื่อทำนำเข้าข้อมูลสำเร็จ</response>
         /// <response code="400">ค่าตัวแปรที่ส่งมาไม่ถูกต้อง</response>
@@ -1574,7 +1589,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers
 
                             var r = new DisableScore();
 
-                            #region นำเข้าผลคะแนนสอบคัดเลือกผู้พิการ old
+                            #region นำเข้าผลคะแนนสอบคัดเลือกอื่นๆ old
 
                             ////r.ExamId = workSheet?.Cells[row, 2]?.GetValue<string>();
 
@@ -1684,9 +1699,9 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers
 
         #region " Result File "
         /// <summary>
-        /// นำเข้าผลการสอบคัดเลือกผู้พิการ  (ผลการสอบ)
+        /// นำเข้าผลการสอบคัดเลือกอื่นๆ  (ผลการสอบ)
         /// </summary>
-        /// <param name="id">รหัสรอบการสอบคัดเลือกผู้พิการ </param>
+        /// <param name="id">รหัสรอบการสอบคัดเลือกอื่นๆ </param>
         /// <returns></returns>
         /// <response code="200">เมื่อทำนำเข้าข้อมูลสำเร็จ</response>
         /// <response code="400">ค่าตัวแปรที่ส่งมาไม่ถูกต้อง</response>
@@ -1758,7 +1773,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers
                     .Select(g => g.First())
                     .ToDictionary(s => s.ExamId, s => s);
 
-                // ถ้าไม่มีผลคะแนนสอบคัดเลือกผู้พิการให้จบการทำงาน
+                // ถ้าไม่มีผลคะแนนสอบคัดเลือกอื่นๆให้จบการทำงาน
                 if (score.Count == 0) return Success();
 
                 var file = Request.Form.Files[0];
@@ -2051,6 +2066,9 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers
                         case "notpass":
                             queryWithScores = queryWithScores.Where(x => x.score != null && x.score.ExamStatus == "ไม่ผ่าน");
                             break;
+                        case "other":
+                            queryWithScores = queryWithScores.Where(x => x.score != null && !new[] { "ขส.", "ผ่าน", "ไม่ผ่าน" }.Contains(x.score.ExamStatus));
+                            break;
                     }
                 }
 
@@ -2178,89 +2196,180 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers
         {
             try
             {
-                var data = await _context.Disables.AsQueryable()
+                #region old
+                //var data = await _context.Disables.AsQueryable()
+                //                    .Include(x => x.PeriodExam)
+                //                    .Include(x => x.Documents)
+                //                    .ThenInclude(x => x.DocumentFile)
+                //                    .Where(x => x.PeriodExam.Id == id)
+                //                    .Where(x => x.PeriodExam.CheckDisability == true)
+                //                    .Where(x => x.ExamId == examId)
+                //                    .Join(_context.DisableScores.AsQueryable()
+                //                            .Include(x => x.ScoreImport),
+                //                            rc => new { PeriodExamId = rc.PeriodExam.Id, rc.ExamId },
+                //                            sc => new { PeriodExamId = sc.ScoreImport.PeriodExamId, sc.ExamId },
+                //                            (p, sr) => new
+                //                            {
+                //                                ExamID = p.ExamId,
+                //                                ProfileID = p.CitizenId,
+                //                                p.Prefix,
+                //                                FullName = $"{p.FirstName} {p.LastName}",
+                //                                DateOfBirth = p.DateOfBirth.HasValue && p.DateOfBirth.Value != DateTime.MinValue
+                //                                    ? p.DateOfBirth.Value.ToThaiShortDate()
+                //                                    : "",
+                //                                Gender = p.Gendor,
+                //                                Degree = p.Educations.First().Degree,
+                //                                Major = p.Educations.First().Major,
+                //                                CertificateNo = p.Certificates.Count > 0
+                //                                     ? p.Certificates.First().CertificateNo ?? ""
+                //                                     : "",
+                //                                CertificateIssueDate = p.Certificates.Count > 0
+                //                                     ? p.Certificates.First().IssueDate != DateTime.MinValue
+                //                                         ? p.Certificates.First().IssueDate.ToThaiShortDate()
+                //                                         : ""
+                //                                     : "",
+                //                                ExamResult = sr == null ? "" : sr.ExamStatus,
+                //                                ExamAttribute = sr != null && !string.IsNullOrEmpty(sr.ExamAttribute) &&
+                //                                    (sr.ExamAttribute == "มีคุณสมบัติ" || sr.ExamAttribute == "ไม่มีคุณสมบัติ")
+                //                                    ? sr.ExamAttribute : "",
+                //                                IsSpecial = p.Isspecial,
+                //                                Remark = p.Remark,
+                //                                University = p.Educations.First().University,
+                //                                PositionName = p.PositionName,
+                //                                PositionType = p.PositionType,
+                //                                PositionLevel = p.PositionLevel,
+                //                                ExamName = p.PeriodExam!.Name,
+                //                                ExamOrder = p.PeriodExam.Round,
+                //                                ExamYear = p.PeriodExam.Year == null ? 0 : p.PeriodExam.Year.Value.ToThaiYear(),
+                //                                Score = sr == null ? 0.0 : sr.TotalScore,
+                //                                Number = sr == null ? "" : sr.Number,
+                //                                ExamCount = _disableService.GetExamCount(p.CitizenId),
+                //                                ScoreExpire = p.PeriodExam.AnnouncementDate == null
+                //                                    ? ""
+                //                                    : p.PeriodExam.AnnouncementDate != DateTime.MinValue
+                //                                        ? p.PeriodExam.AnnouncementDate.Value.AddYears(2).ToThaiShortDate()
+                //                                        : "",
+                //                                typeTest = p.typeTest,
+                //                                ScoreResult = sr == null ? null : new
+                //                                {
+                //                                    ScoreAFull = sr.FullA,
+                //                                    ScoreA = sr.SumA,
+                //                                    ScoreBFull = sr.FullB,
+                //                                    ScoreB = sr.SumB,
+                //                                    ScoreAB = sr.SumAB,
+                //                                    ScoreCFull = sr.FullC,
+                //                                    ScoreC = sr.SumC,
+                //                                    ScoreDFull = sr.FullD,
+                //                                    ScoreD = sr.SumD,
+                //                                    ScoreCD = sr.SumCD,
+                //                                    ScoreSumFull = sr.FullScore,
+                //                                    ScoreSum = sr.TotalScore,
+                //                                    ExamResult = sr.ExamStatus
+                //                                },
+                //                                Attachments = p.Documents.Select(a => new
+                //                                {
+                //                                    FileName = a.DocumentFile.FileName,
+                //                                    DocumentId = a.DocumentFile.Id
+                //                                })
+                //                            })
+                //                    .FirstOrDefaultAsync();
+                #endregion
+
+                // 1. Query Disable (ข้อมูลผู้สอบ)
+                var disable = await _context.Disables.AsQueryable()
                                     .Include(x => x.PeriodExam)
                                     .Include(x => x.Documents)
                                     .ThenInclude(x => x.DocumentFile)
+                                    .Include(x => x.Educations)
+                                    .Include(x => x.Certificates)
+                                    .Where(x => x.PeriodExam != null)
                                     .Where(x => x.PeriodExam.Id == id)
                                     .Where(x => x.PeriodExam.CheckDisability == true)
                                     .Where(x => x.ExamId == examId)
-                                    .Join(_context.DisableScores.AsQueryable()
-                                            .Include(x => x.ScoreImport),
-                                            rc => new { PeriodExamId = rc.PeriodExam.Id, rc.ExamId },
-                                            sc => new { PeriodExamId = sc.ScoreImport.PeriodExamId, sc.ExamId },
-                                            (p, sr) => new
+                                    .FirstOrDefaultAsync();
+
+                if (disable == null)
+                    return Success();
+
+                // 2. Query DisableScore (ข้อมูลคะแนน) — แยกต่างหาก ไม่มีก็ผ่าน
+                var score = await _context.DisableScores.AsQueryable()
+                                    .Include(x => x.ScoreImport)
+                                    .Where(x => x.ScoreImport != null)
+                                    .Where(x => x.ScoreImport.PeriodExamId == id)
+                                    .Where(x => x.ExamId == examId)
+                                    .FirstOrDefaultAsync();
+
+                // 3. รวมผลลัพธ์ก่อน return
+                var data = new
                 {
-                                                ExamID = p.ExamId,
-                                                ProfileID = p.CitizenId,
-                                                p.Prefix,
-                                                FullName = $"{p.FirstName} {p.LastName}",
-                                                DateOfBirth = p.DateOfBirth.HasValue && p.DateOfBirth.Value != DateTime.MinValue
-                                                    ? p.DateOfBirth.Value.ToThaiShortDate()
+                    ExamID = disable.ExamId,
+                    ProfileID = disable.CitizenId,
+                    disable.Prefix,
+                    FullName = $"{disable.FirstName} {disable.LastName}",
+                    DateOfBirth = disable.DateOfBirth.HasValue && disable.DateOfBirth.Value != DateTime.MinValue
+                        ? disable.DateOfBirth.Value.ToThaiShortDate()
                         : "",
-                                                Gender = p.Gendor,
-                                                Degree = p.Educations.First().Degree,
-                                                Major = p.Educations.First().Major,
-                                                CertificateNo = p.Certificates.Count > 0
-                                                     ? p.Certificates.First().CertificateNo ?? ""
+                    Gender = disable.Gendor,
+                    Degree = disable.Educations.First().Degree,
+                    Major = disable.Educations.First().Major,
+                    CertificateNo = disable.Certificates.Count > 0
+                         ? disable.Certificates.First().CertificateNo ?? ""
                          : "",
-                                                CertificateIssueDate = p.Certificates.Count > 0
-                                                     ? p.Certificates.First().IssueDate != DateTime.MinValue
-                                                         ? p.Certificates.First().IssueDate.ToThaiShortDate()
+                    CertificateIssueDate = disable.Certificates.Count > 0
+                         ? disable.Certificates.First().IssueDate != DateTime.MinValue
+                             ? disable.Certificates.First().IssueDate.ToThaiShortDate()
                              : ""
                          : "",
-                                                ExamResult = sr == null ? "" : sr.ExamStatus,
-                                                // ExamAttribute = p.Certificates.Count > 0 ?
-                                                //     _disableService.CheckValidCertificate(p.Certificates.First().IssueDate, 5)
-                                                //         ? "มีคุณสมบัติ"
-                                                //         : "ไม่มีคุณสมบัติ"
-                                                //     : "ไม่มีคุณสมบัติ",
+                    ExamResult = score == null ? "" : score.ExamStatus,
 
-                                                ExamAttribute = sr != null && !string.IsNullOrEmpty(sr.ExamAttribute) &&
-                                                    (sr.ExamAttribute == "มีคุณสมบัติ" || sr.ExamAttribute == "ไม่มีคุณสมบัติ")
-                                                    ? sr.ExamAttribute : "",
+                    ExamAttribute = score != null && !string.IsNullOrEmpty(score.ExamAttribute) &&
+                        (score.ExamAttribute == "มีคุณสมบัติ" || score.ExamAttribute == "ไม่มีคุณสมบัติ")
+                        ? score.ExamAttribute : "",
 
-                                                IsSpecial = p.Isspecial,
-                                                Remark = p.Remark,
-                                                University = p.Educations.First().University,
-                                                PositionName = p.PositionName,
-                                                PositionType = p.PositionType,
-                                                PositionLevel = p.PositionLevel,
-                                                ExamName = p.PeriodExam!.Name,
-                                                ExamOrder = p.PeriodExam.Round,
-                                                ExamYear = p.PeriodExam.Year == null ? 0 : p.PeriodExam.Year.Value.ToThaiYear(),
-                                                Score = sr == null ? 0.0 : sr.TotalScore,
-                                                Number = sr == null ? "" : sr.Number,
-                                                ExamCount = _disableService.GetExamCount(p.CitizenId),
-                                                ScoreExpire = p.PeriodExam.AnnouncementDate == null
+                    IsSpecial = disable.Isspecial,
+                    Remark = disable.Remark,
+                    University = disable.Educations.First().University,
+                    PositionName = disable.PositionName,
+                    PositionType = disable.PositionType,
+                    PositionLevel = disable.PositionLevel,
+                    ExamName = disable.PeriodExam!.Name,
+                    ExamOrder = disable.PeriodExam.Round,
+                    ExamYear = disable.PeriodExam.Year == null ? 0 : disable.PeriodExam.Year.Value.ToThaiYear(),
+                    Score = score == null ? 0.0 : score.TotalScore,
+                    Number = score == null ? "" : score.Number,
+                    ExamCount = _disableService.GetExamCount(disable.CitizenId),
+                    // เดิมคำนวณวันหมดอายุจาก AnnouncementDate + 2 ปี (เก็บไว้สำหรับอ้างอิงข้อมูลเก่า)
+                    //ScoreExpire = disable.PeriodExam.AnnouncementDate == null
+                    //    ? ""
+                    //    : disable.PeriodExam.AnnouncementDate != DateTime.MinValue
+                    //        ? disable.PeriodExam.AnnouncementDate.Value.AddYears(2).ToThaiShortDate()
+                    //        : "",
+                    ScoreExpire = disable.PeriodExam.ScoreExpireDate == null
                         ? ""
-                                                    : p.PeriodExam.AnnouncementDate != DateTime.MinValue
-                                                        ? p.PeriodExam.AnnouncementDate.Value.AddYears(2).ToThaiShortDate()
-                                                        : "",
-                                                typeTest = p.typeTest,
-                                                ScoreResult = sr == null ? null : new
+                        : disable.PeriodExam.ScoreExpireDate.Value.ToThaiShortDate(),
+                    typeTest = disable.typeTest,
+                    ScoreResult = score == null ? null : new
                     {
-                                                    ScoreAFull = sr.FullA,
-                                                    ScoreA = sr.SumA,
-                                                    ScoreBFull = sr.FullB,
-                                                    ScoreB = sr.SumB,
-                                                    ScoreAB = sr.SumAB,
-                                                    ScoreCFull = sr.FullC,
-                                                    ScoreC = sr.SumC,
-                                                    ScoreDFull = sr.FullD,
-                                                    ScoreD = sr.SumD,
-                                                    ScoreCD = sr.SumCD,
-                                                    ScoreSumFull = sr.FullScore,
-                                                    ScoreSum = sr.TotalScore,
-                                                    ExamResult = sr.ExamStatus
+                        ScoreAFull = score.FullA,
+                        ScoreA = score.SumA,
+                        ScoreBFull = score.FullB,
+                        ScoreB = score.SumB,
+                        ScoreAB = score.SumAB,
+                        ScoreCFull = score.FullC,
+                        ScoreC = score.SumC,
+                        ScoreDFull = score.FullD,
+                        ScoreD = score.SumD,
+                        ScoreCD = score.SumCD,
+                        ScoreSumFull = score.FullScore,
+                        ScoreSum = score.TotalScore,
+                        ExamResult = score.ExamStatus
                     },
-                                                Attachments = p.Documents.Select(a => new
+                    Attachments = disable.Documents.Select(a => new
                     {
                         FileName = a.DocumentFile.FileName,
                         DocumentId = a.DocumentFile.Id
                     })
-                                            })
-                                    .FirstOrDefaultAsync();
+                };
 
                 return Success(data);
             }
@@ -2451,7 +2560,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers
         }
 
         /// <summary>
-        /// โอนคนสรรหาไปบรรจุ
+        /// โอนคนสรรหาไปบรรจุ (คัดเลือกอื่นๆ)
         /// </summary>
         /// <param name="examId">รหัสรอบสมัคร</param>
         /// <returns></returns>
@@ -2482,7 +2591,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers
         /// <summary>
         /// ผลคะแนนผู้สมัครสอบ
         /// </summary>
-        /// <param name="id">รหัสรอบการสอบคัดเลือกผู้พิการ</param>
+        /// <param name="id">รหัสรอบการสอบคัดเลือกอื่นๆ</param>
         /// <param name="examId">เลขประจำตัวสอบ</param>
         /// <returns></returns>
         /// <response code="200">เมื่อทำการอ่านข้อมูลจำนวนผู้สอบผ่านแข่งขันเพื่อบรรจุเข้ารับราชการเป็นข้าราชการ กทม. สามัญสำเร็จ</response>
@@ -2496,49 +2605,110 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers
         {
             try
             {
-                var data = await _context.Disables.AsQueryable()
-                                    .Include(x => x.PeriodExam)
-                                    .Where(x => x.PeriodExam!.Id == id)
-                                    .Where(x => x.ExamId == examId)
-                                    .Join(_context.DisableScores.AsQueryable()
-                                            .Include(x => x.ScoreImport),
-                                            rc => new { rc.PeriodExam!.Id, rc.ExamId },
-                                            sc => new { Id = sc.ScoreImport!.PeriodExamId, sc.ExamId },
-                                            (p, sr) => new
-                                            {
-                                                ExamID = p.ExamId != null ? p.ExamId.ToThaiNumber() : "",
-                                                CitizenId = p.CitizenId != null ? p.CitizenId.ToThaiNumber() : "",
-                                                FullName = $"{p.Prefix}{p.FirstName} {p.LastName}",
-                                                DateOfBirth = p.DateOfBirth.HasValue && p.DateOfBirth.Value != DateTime.MinValue
-                                                    ? p.DateOfBirth.Value.ToThaiShortDate().ToThaiNumber()
-                                                    : "",
-                                                Gender = p.Gendor,
-                                                Degree = p.Educations.First().Degree,
-                                                Major = p.Educations.First().Major,
-                                                University = p.Educations.First().University,
-                                                PositionName = p.PositionName,
-                                                ExamName = $"{p.PeriodExam!.Name} ครั้งที่ {p.PeriodExam.Round}/{(p.PeriodExam.Year > 2500 ? p.PeriodExam.Year : (p.PeriodExam.Year + 543))}".ToThaiNumber(),
+                #region old
+                //var data = await _context.Disables.AsQueryable()
+                //                    .Include(x => x.PeriodExam)
+                //                    .Where(x => x.PeriodExam!.Id == id)
+                //                    .Where(x => x.ExamId == examId)
+                //                    .Join(_context.DisableScores.AsQueryable()
+                //                            .Include(x => x.ScoreImport),
+                //                            rc => new { rc.PeriodExam!.Id, rc.ExamId },
+                //                            sc => new { Id = sc.ScoreImport!.PeriodExamId, sc.ExamId },
+                //                            (p, sr) => new
+                //                            {
+                //                                ExamID = p.ExamId != null ? p.ExamId.ToThaiNumber() : "",
+                //                                CitizenId = p.CitizenId != null ? p.CitizenId.ToThaiNumber() : "",
+                //                                FullName = $"{p.Prefix}{p.FirstName} {p.LastName}",
+                //                                DateOfBirth = p.DateOfBirth.HasValue && p.DateOfBirth.Value != DateTime.MinValue
+                //                                    ? p.DateOfBirth.Value.ToThaiShortDate().ToThaiNumber()
+                //                                    : "",
+                //                                Gender = p.Gendor,
+                //                                Degree = p.Educations.First().Degree,
+                //                                Major = p.Educations.First().Major,
+                //                                University = p.Educations.First().University,
+                //                                PositionName = p.PositionName,
+                //                                ExamName = $"{p.PeriodExam!.Name} ครั้งที่ {p.PeriodExam.Round}/{(p.PeriodExam.Year > 2500 ? p.PeriodExam.Year : (p.PeriodExam.Year + 543))}".ToThaiNumber(),
+                //
+                //                                ExamCount = _disableService.GetExamCount(p.CitizenId).ToString().ToThaiNumber(),
+                //                                type = p.typeTest == "bangkok" ? "กทม." : p.typeTest == "ocsc" ? "ก.พ." : "",
+                //                                FA = sr.FullA != null ? sr.FullA.ToString().ToThaiNumber() : "",
+                //                                SA = sr.SumA != null ? sr.SumA.ToString().ToThaiNumber() : "",
+                //                                FC = sr.FullC != null ? sr.FullC.ToString().ToThaiNumber() : "",
+                //                                SC = sr.SumC != null ? sr.SumC.ToString().ToThaiNumber() : "",
+                //                                FD = sr.FullD != null ? sr.FullD.ToString().ToThaiNumber() : "",
+                //                                SD = sr.SumD != null ? sr.SumD.ToString().ToThaiNumber() : "",
+                //                                F = sr.FullScore != null ? sr.FullScore.ToString().ToThaiNumber() : "",
+                //                                T = sr.TotalScore != null ? sr.TotalScore.ToString().ToThaiNumber() : "",
+                //                                Result = sr.ExamStatus,
+                //                                Number = sr.Number != null ? sr.Number.ToString().ToThaiNumber() : "",
+                //                                Expire = p.PeriodExam.AnnouncementDate == null
+                //                                    ? ""
+                //                                    : p.PeriodExam.AnnouncementDate != DateTime.MinValue
+                //                                        ? p.PeriodExam.AnnouncementDate.Value.AddYears(2).ToThaiShortDate().ToString().ToThaiNumber()
+                //                                        : "",
+                //                            })
+                //                    .FirstOrDefaultAsync();
+                #endregion
 
-                                                ExamCount = _disableService.GetExamCount(p.CitizenId).ToString().ToThaiNumber(),
-                                                type = p.typeTest == "bangkok" ? "กทม." : p.typeTest == "ocsc" ? "ก.พ." : "",
-                                                FA = sr.FullA != null ? sr.FullA.ToString().ToThaiNumber() : "",
-                                                SA = sr.SumA != null ? sr.SumA.ToString().ToThaiNumber() : "",
-                                                FC = sr.FullC != null ? sr.FullC.ToString().ToThaiNumber() : "",
-                                                SC = sr.SumC != null ? sr.SumC.ToString().ToThaiNumber() : "",
-                                                FD = sr.FullD != null ? sr.FullD.ToString().ToThaiNumber() : "",
-                                                SD = sr.SumD != null ? sr.SumD.ToString().ToThaiNumber() : "",
-                                                F = sr.FullScore != null ? sr.FullScore.ToString().ToThaiNumber() : "",
-                                                T = sr.TotalScore != null ? sr.TotalScore.ToString().ToThaiNumber() : "",
-                                                Result = sr.ExamStatus,
-                                                Number = sr.Number != null ? sr.Number.ToString().ToThaiNumber() : "",
-                                                Expire = p.PeriodExam.AnnouncementDate == null
-                                                    ? ""
-                                                    : p.PeriodExam.AnnouncementDate != DateTime.MinValue
-                                                        ? p.PeriodExam.AnnouncementDate.Value.AddYears(2).ToThaiShortDate().ToString().ToThaiNumber()
-                                                        : "",
-                                            })
+                // 1. Query Disable (ข้อมูลผู้สอบ)
+                var disable = await _context.Disables.AsQueryable()
+                                    .Include(x => x.PeriodExam)
+                                    .Include(x => x.Educations)
+                                    .Where(x => x.PeriodExam != null)
+                                    .Where(x => x.PeriodExam.Id == id)
+                                    .Where(x => x.ExamId == examId)
                                     .FirstOrDefaultAsync();
 
+                if (disable == null)
+                    return Success();
+
+                // 2. Query DisableScore (ข้อมูลคะแนน) — แยกต่างหาก ไม่มีก็ผ่าน
+                var score = await _context.DisableScores.AsQueryable()
+                                    .Include(x => x.ScoreImport)
+                                    .Where(x => x.ScoreImport != null)
+                                    .Where(x => x.ScoreImport.PeriodExamId == id)
+                                    .Where(x => x.ExamId == examId)
+                                    .FirstOrDefaultAsync();
+
+                // 3. รวมผลลัพธ์
+                var data = new
+                {
+                    ExamID = disable.ExamId != null ? disable.ExamId.ToThaiNumber() : "",
+                    CitizenId = disable.CitizenId != null ? disable.CitizenId.ToThaiNumber() : "",
+                    FullName = $"{disable.Prefix}{disable.FirstName} {disable.LastName}",
+                    DateOfBirth = disable.DateOfBirth.HasValue && disable.DateOfBirth.Value != DateTime.MinValue
+                        ? disable.DateOfBirth.Value.ToThaiShortDate().ToThaiNumber()
+                        : "",
+                    Gender = disable.Gendor,
+                    Degree = disable.Educations.First().Degree,
+                    Major = disable.Educations.First().Major,
+                    University = disable.Educations.First().University,
+                    PositionName = disable.PositionName,
+                    ExamName = $"{disable.PeriodExam!.Name} ครั้งที่ {disable.PeriodExam.Round}/{(disable.PeriodExam.Year > 2500 ? disable.PeriodExam.Year : (disable.PeriodExam.Year + 543))}".ToThaiNumber(),
+
+                    ExamCount = _disableService.GetExamCount(disable.CitizenId!).ToString().ToThaiNumber(),
+                    type = disable.typeTest == "bangkok" ? "กทม." : disable.typeTest == "ocsc" ? "ก.พ." : "",
+                    FA = score != null ? score.FullA.ToString().ToThaiNumber() : "",
+                    SA = score != null ? score.SumA.ToString().ToThaiNumber() : "",
+                    FC = score != null ? score.FullC.ToString().ToThaiNumber() : "",
+                    SC = score != null ? score.SumC.ToString().ToThaiNumber() : "",
+                    FD = score != null ? score.FullD.ToString().ToThaiNumber() : "",
+                    SD = score != null ? score.SumD.ToString().ToThaiNumber() : "",
+                    F = score != null ? score.FullScore.ToString().ToThaiNumber() : "",
+                    T = score != null ? score.TotalScore.ToString().ToThaiNumber() : "",
+                    Result = score != null ? score.ExamStatus : "",
+                    Number = score != null && score.Number != null ? score.Number.ToString().ToThaiNumber() : "",
+                    // เดิมคำนวณวันหมดอายุจาก AnnouncementDate + 2 ปี (เก็บไว้สำหรับอ้างอิงข้อมูลเก่า)
+                    //Expire = disable.PeriodExam.AnnouncementDate == null
+                    //    ? ""
+                    //    : disable.PeriodExam.AnnouncementDate != DateTime.MinValue
+                    //        ? disable.PeriodExam.AnnouncementDate.Value.AddYears(2).ToThaiShortDate().ToString().ToThaiNumber()
+                    //        : "",
+                    Expire = disable.PeriodExam.ScoreExpireDate == null
+                        ? ""
+                        : disable.PeriodExam.ScoreExpireDate.Value.ToThaiShortDate().ToString().ToThaiNumber(),
+                };
+
                 var result = new
                 {
                     template = "recruit-exam",

Controllers/DisableReportController.cs

@@ -191,7 +191,9 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers
                                                 Number = sr == null ? "" : sr.Number,
                                                 // ExamCount = 10,
                                                 // ExamCount = GetExamCountTes(p.CitizenId),
-                                                ScoreExpire = p.PeriodExam.AnnouncementDate == null ? "" : p.PeriodExam.AnnouncementDate.Value.AddYears(2).ToThaiShortDate(),
+                                                // เดิมคำนวณวันหมดอายุจาก AnnouncementDate + 2 ปี (เก็บไว้สำหรับอ้างอิงข้อมูลเก่า)
+                                                //ScoreExpire = p.PeriodExam.AnnouncementDate == null ? "" : p.PeriodExam.AnnouncementDate.Value.AddYears(2).ToThaiShortDate(),
+                                                ScoreExpire = p.PeriodExam.ScoreExpireDate == null ? "" : p.PeriodExam.ScoreExpireDate.Value.ToThaiShortDate(),
                                                 FullA = sr == null ? 0 : sr.FullA,
                                                 SumA = sr == null ? 0 : sr.SumA,
                                                 FullB = sr == null ? 0 : sr.FullB,

Controllers/PeriodExamController.cs

@@ -749,6 +749,56 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers
             }
         }
 
+        /// <summary>
+        /// ดาวน์โหลดรายชื่อผู้มีสิทธิ์สอบ
+        /// </summary>
+        /// <param name="examId">รหัสรอบสมัคร</param>
+        /// <returns></returns>
+        /// <response code="200">เมื่อทำการอ่านโหลดผู้สมัครสอบสำเร็จ</response>
+        /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
+        /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
+        [HttpGet("download/candidate-exam/{examId:length(36)}")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status401Unauthorized)]
+        [ProducesResponseType(StatusCodes.Status500InternalServerError)]
+        public async Task<ActionResult<ResponseObject>> DownloadCandidateExamAsync(string examId)
+        {
+            try
+            {
+                var data = await _periodExamService.DownloadCandidateExamAsync(examId);
+                return Success(data);
+            }
+            catch (Exception ex)
+            {
+                return Error(ex);
+            }
+        }
+
+        /// <summary>
+        /// ดาวน์โหลดรายชื่อผู้สอบคัดเลือกได้
+        /// </summary>
+        /// <param name="examId">รหัสรอบสมัคร</param>
+        /// <returns></returns>
+        /// <response code="200">เมื่อทำการอ่านโหลดผู้สมัครสอบสำเร็จ</response>
+        /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
+        /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
+        [HttpGet("download/pass-exam/{examId:length(36)}")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status401Unauthorized)]
+        [ProducesResponseType(StatusCodes.Status500InternalServerError)]
+        public async Task<ActionResult<ResponseObject>> DownloadPassExamAsync(string examId)
+        {
+            try
+            {
+                var data = await _periodExamService.DownloadPassExamAsync(examId);
+                return Success(data);
+            }
+            catch (Exception ex)
+            {
+                return Error(ex, "เกิดข้อผิดพลาดในการแสดงรายงาน");
+            }
+        }
+
         /// <summary>
         /// โหลดผู้สมัครสอบ
         /// </summary>
@@ -952,7 +1002,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers
         }
 
         /// <summary>
-        /// โอนคนสรรหาไปบรรจุ
+        /// โอนคนสรรหาไปบรรจุ (สอบคัดเลือก)
         /// </summary>
         /// <param name="examId">รหัสรอบสมัคร</param>
         /// <returns></returns>

Core/RequestLoggingMiddleware.cs

@@ -2,6 +2,7 @@
 using Microsoft.Extensions.Configuration;
 using Nest;
 using System.Diagnostics;
+using System.IdentityModel.Tokens.Jwt;
 using System.Security.Claims;
 using System.Text.Encodings.Web;
 using System.Text.Json;
@@ -29,6 +30,49 @@ namespace BMA.EHR.Recurit.Exam.Service.Core
             SystemName = "recruiting";
         }
 
+        /// <summary>
+        /// แกะ JWT token เพื่อดึง claims ต่างๆ
+        /// </summary>
+        private JwtSecurityToken? ParseToken(string token)
+        {
+            try
+            {
+                var tokenHandler = new JwtSecurityTokenHandler();
+                var jwtToken = tokenHandler.ReadJwtToken(token.Replace("Bearer ", ""));
+                return jwtToken;
+            }
+            catch
+            {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// ดึงค่า claim จาก token โดยลองชื่อหลายแบบ
+        /// </summary>
+        private string? GetClaimValue(JwtSecurityToken? token, params string[] claimNames)
+        {
+            if (token == null) return null;
+
+            foreach (var name in claimNames)
+            {
+                var claim = token.Claims.FirstOrDefault(c => c.Type == name);
+                if (claim != null)
+                    return claim.Value;
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// ดึงค่า Guid claim จาก token
+        /// </summary>
+        private Guid? GetGuidClaim(JwtSecurityToken? token, params string[] claimNames)
+        {
+            var value = GetClaimValue(token, claimNames);
+            if (Guid.TryParse(value, out var guid))
+                return guid;
+            return null;
+        }
 
         public async Task Invoke(HttpContext context)
         {
@@ -92,28 +136,22 @@ namespace BMA.EHR.Recurit.Exam.Service.Core
                 // เปลี่ยน stream ของ Response เพื่อให้สามารถอ่านได้
                 context.Response.Body = memoryStream;
 
-
-
-                // Extract all required data from JWT token claims
                 var keycloakId = context.User?.FindFirst(ClaimTypes.NameIdentifier)?.Value ?? Guid.Empty.ToString("D");
+                var tokenHeader = context.Request.Headers["Authorization"].ToString();
 
-                var prefix = context.User?.FindFirst("prefix")?.Value;
-                var firstName = context.User?.FindFirst("given_name")?.Value;
-                var lastName = context.User?.FindFirst("family_name")?.Value;
-                var preferredUsername = context.User?.FindFirst("preferred_username")?.Value;
+                // แกะ JWT token เพื่อดึง claims ต่างๆ
+                var jwtToken = ParseToken(tokenHeader);
 
-                var orgRootDnaId = context.User?.FindFirst("orgRootDnaId")?.Value;
-                var orgChild1DnaId = context.User?.FindFirst("orgChild1DnaId")?.Value;
-                var orgChild2DnaId = context.User?.FindFirst("orgChild2DnaId")?.Value;
-                var orgChild3DnaId = context.User?.FindFirst("orgChild3DnaId")?.Value;
-                var orgChild4DnaId = context.User?.FindFirst("orgChild4DnaId")?.Value;
-
-                // Parse Guid values safely
-                Guid? rootDnaId = Guid.TryParse(orgRootDnaId, out var rid) ? rid : null;
-                Guid? child1DnaId = Guid.TryParse(orgChild1DnaId, out var c1) ? c1 : null;
-                Guid? child2DnaId = Guid.TryParse(orgChild2DnaId, out var c2) ? c2 : null;
-                Guid? child3DnaId = Guid.TryParse(orgChild3DnaId, out var c3) ? c3 : null;
-                Guid? child4DnaId = Guid.TryParse(orgChild4DnaId, out var c4) ? c4 : null;
+                // ดึงข้อมูลจาก claims โดยลองชื่อหลายแบบ (camelCase, snake_case, ฯลฯ)
+                var prefix = GetClaimValue(jwtToken, "prefix", "Prefix", "PREFIX");
+                var firstName = GetClaimValue(jwtToken, "given_name", "firstname", "firstName", "FirstName", "FIRSTNAME");
+                var lastName = GetClaimValue(jwtToken, "family_name", "lastname", "lastName", "LastName", "LASTNAME");
+                var preferredUsername = GetClaimValue(jwtToken, "preferred_username", "preferred_username", "PreferredUsername");
+                var orgRootDnaId = GetGuidClaim(jwtToken, "orgRootDnaId", "org_root_dna_id", "OrgRootDnaId", "rootDnaId");
+                var orgChild1DnaId = GetGuidClaim(jwtToken, "orgChild1DnaId", "org_child1_dna", "OrgChild1Dna", "child1DnaId");
+                var orgChild2DnaId = GetGuidClaim(jwtToken, "orgChild2DnaId", "org_child2_dna", "OrgChild2Dna", "child2DnaId");
+                var orgChild3DnaId = GetGuidClaim(jwtToken, "orgChild3DnaId", "org_child3_dna", "OrgChild3Dna", "child3DnaId");
+                var orgChild4DnaId = GetGuidClaim(jwtToken, "orgChild4DnaId", "org_child4_dna", "OrgChild4Dna", "child4DnaId");
 
                 await _next(context); // ดำเนินการต่อไปยัง Middleware อื่น ๆ
 
@@ -200,7 +238,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Core
                 {
                     logType = logType,
                     ip = context.Connection.RemoteIpAddress?.ToString(),
-                    rootId = rootDnaId,
+                    rootId = orgRootDnaId?.ToString("D"),
                     systemName = SystemName,
                     startTimeStamp = startTime.ToString("o"),
                     endTimeStamp = endTime.ToString("o"),

Data/Migrations/ApplicationDbContextModelSnapshot.cs

@@ -2392,6 +2392,11 @@ namespace BMA.EHR.Recurit.Exam.Service.Data.Migrations
                         .HasColumnOrder(9)
                         .HasComment("รอบการสอบ");
 
+                    b.Property<DateTime?>("ScoreExpireDate")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(6)
+                        .HasComment("วันหมดอายุบัญชี");
+
                     b.Property<bool>("SetSeat")
                         .HasColumnType("tinyint(1)")
                         .HasComment("เช็คอัพคะแนน");

Migrations/20260701102530_update_PeriodExams_add_ScoreExpireDate.cs

@@ -0,0 +1,31 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace BMA.EHR.Recurit.Exam.Service.Migrations
+{
+    /// <inheritdoc />
+    public partial class update_PeriodExams_add_ScoreExpireDate : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<DateTime>(
+                name: "ScoreExpireDate",
+                table: "PeriodExams",
+                type: "datetime(6)",
+                nullable: true,
+                comment: "วันหมดอายุบัญชี")
+                .Annotation("Relational:ColumnOrder", 6);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "ScoreExpireDate",
+                table: "PeriodExams");
+        }
+    }
+}

Models/District.cs

@@ -9,6 +9,9 @@ namespace BMA.EHR.Recurit.Exam.Service.Models
         [Required, MaxLength(150), Column(Order = 1), Comment("เขต/อำเภอ")]
         public string name { get; set; } = string.Empty;
 
+        [Column(Order = 2), Comment("รหัสอ้างอิงจังหวัด")]
+        public Guid? provinceId { get; set; } = null;
+
         // [Column(Order = 2), Comment("สถานะการใช้งาน")]
         // public bool IsActive { get; set; } = true;
 

Models/PeriodExam.cs

@@ -41,6 +41,9 @@ namespace BMA.EHR.Recurit.Exam.Service.Models
         [Column(Order = 5), Comment("วันประกาศผลสอบ")]
         public DateTime? AnnouncementDate { get; set; }
 
+        [Column(Order = 6), Comment("วันหมดอายุบัญชี")]
+        public DateTime? ScoreExpireDate { get; set; }
+
         [Required, Column(Order = 6), Comment("วันเริ่มประกาศ")]
         public DateTime AnnouncementStartDate { get; set; } = DateTime.Now.Date;
 

Models/SubDistrict.cs

@@ -12,6 +12,9 @@ namespace BMA.EHR.Recurit.Exam.Service.Models
         [MaxLength(10), Column(Order = 2), Comment("รหัสไปรษณีย์")]
         public string? zipCode { get; set; } = null;
 
+        [Column(Order = 3), Comment("รหัสอ้างอิงอำเภอ")]
+        public Guid? districtId { get; set; } = null;
+
         // [Column(Order = 3), Comment("สถานะการใช้งาน")]
         // public bool IsActive { get; set; } = true;
 

Repositories/PermissionRepository.cs

@@ -51,7 +51,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
                 using (var client = new HttpClient())
                 {
                     client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", AccessToken.Replace("Bearer ", ""));
-                    client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                    client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                     var req = await client.GetAsync(apiPath);
                     var res = await req.Content.ReadAsStringAsync();
                     return res;

Request/Disables/PostDisableImportRequest.cs

@@ -6,7 +6,7 @@ using System.ComponentModel.DataAnnotations;
 namespace BMA.EHR.Recurit.Exam.Service.Request.Disables
 {
     /// <summary>
-    /// ตัวแปรสำหรับสร้างข้อมูลการสอบคัดเลือกผู้พิการ
+    /// ตัวแปรสำหรับสร้างข้อมูลการสอบคัดเลือกอื่นๆ
     /// </summary>
     public class PostDisableImportRequest
     {
@@ -82,5 +82,15 @@ namespace BMA.EHR.Recurit.Exam.Service.Request.Disables
         /// วันที่ประกาศผลสอบ
         /// </summary>
         public DateTime AnnouncementDate { get; set; }
+
+        /// <summary>
+        /// วันหมดอายุบัญชี (ไม่บังคับส่ง)
+        /// </summary>
+        public DateTime? ScoreExpireDate { get; set; }
+
+        /// <summary>
+        /// รหัส DNA หน่วยงาน
+        /// </summary>
+        public Guid? rootDnaId { get; set; }
     }
 }

Request/RequestPeriodExam.cs

@@ -17,6 +17,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Request
         public DateTime AnnouncementStartDate { get; set; } = DateTime.Now.Date;
         public DateTime AnnouncementEndDate { get; set; } = DateTime.Now.Date;
         public DateTime? AnnouncementDate { get; set; }
+        public DateTime? ScoreExpireDate { get; set; }
         public DateTime? ExamDate { get; set; }
         public Guid? OrganizationCodeId { get; set; }
         public string? OrganizationCodeName { get; set; }

Response/CandidateStatusResponse.cs

@@ -9,5 +9,8 @@ namespace BMA.EHR.Recurit.Exam.Service.Response
         public string? RejectDetail { get; set; }
 
         public bool? IsShowExamInfo { get; set; }
+
+        public bool? IsShowResult { get; set; }
+
     }
 }

Response/PeriodExamCandidateResponseItem.cs

@@ -20,6 +20,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Response
         public DateTime AnnouncementStartDate { get; set; }
         public DateTime AnnouncementEndDate { get; set; }
         public DateTime? AnnouncementDate { get; set; }
+        public DateTime? ScoreExpireDate { get; set; }
         public DateTime? ExamDate { get; set; }
         public Guid? OrganizationCodeId { get; set; }
         public string? OrganizationCodeName { get; set; }

Services/CandidateService.cs

@@ -1978,7 +1978,19 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
             if (candidate == null)
                 throw new Exception(GlobalMessages.CandidateNotFound);
 
-            return new CandidateStatusResponse { Status = candidate.Status, RejectDetail = candidate.RejectDetail, IsShowExamInfo = candidate.IsShowExamInfo };
+            bool IsShowResult = true;
+            if (exam.AnnouncementDate != null)
+            {
+                var showResultEndDate = exam.AnnouncementDate.Value.Date.AddDays(15);
+                IsShowResult = DateTime.Now.Date <= showResultEndDate;
+            }
+
+            return new CandidateStatusResponse {
+                Status = candidate.Status,
+                RejectDetail = candidate.RejectDetail,
+                IsShowExamInfo = candidate.IsShowExamInfo,
+                IsShowResult = IsShowResult,
+            };
         }
 
         public async Task UserCheckCandidateService(string examId, string positionId, string status)
@@ -2468,7 +2480,9 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
                 Number = candidate.Number,
                 ReviewPoint = candidate.ReviewPoint,
                 Review = candidate.Review,
-                AnnouncementDate = exam.AnnouncementDate?.AddYears(2),
+                // เดิมคำนวณวันหมดอายุจาก AnnouncementDate + 2 ปี (เก็บไว้สำหรับอ้างอิงข้อมูลเก่า)
+                //AnnouncementDate = exam.AnnouncementDate?.AddYears(2),
+                AnnouncementDate = exam.ScoreExpireDate,
                 Id = candidate.Id,
                 Position = positionName,
                 PositionLevel = positionLevelName,
@@ -2528,7 +2542,9 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
                 Number = candidate.Number,
                 ReviewPoint = candidate.ReviewPoint,
                 Review = candidate.Review,
-                AnnouncementDate = candidate.PeriodExam?.AnnouncementDate?.AddYears(2),
+                // เดิมคำนวณวันหมดอายุจาก AnnouncementDate + 2 ปี (เก็บไว้สำหรับอ้างอิงข้อมูลเก่า)
+                //AnnouncementDate = candidate.PeriodExam?.AnnouncementDate?.AddYears(2),
+                AnnouncementDate = candidate.PeriodExam?.ScoreExpireDate,
                 Id = candidate.Id,
                 Position = positionName,
                 PositionLevel = positionLevelName,
@@ -2651,7 +2667,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
             using (var client = new HttpClient())
             {
                 client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token?.Replace("Bearer ", ""));
-                client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                 var _res = await client.PostAsJsonAsync(apiUrl, new
                 {
                     citizenId

Services/PeriodExamService.cs

@@ -11,6 +11,7 @@ using Microsoft.EntityFrameworkCore;
 using OfficeOpenXml;
 using OfficeOpenXml.Style;
 using System.Text;
+using System.Text.RegularExpressions;
 using Newtonsoft.Json;
 using System.Net.Http.Headers;
 
@@ -108,6 +109,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
                                     AnnouncementEndDate = x.AnnouncementEndDate,
                                     AnnouncementStartDate = x.AnnouncementStartDate,
                                     AnnouncementDate = x.AnnouncementDate,
+                                    ScoreExpireDate = x.ScoreExpireDate,
                                     CheckDisability = x.CheckDisability,
                                     CheckDocument = x.CheckDocument,
                                     Detail = x.Detail,
@@ -157,6 +159,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
                                 AnnouncementEndDate = x.AnnouncementEndDate,
                                 AnnouncementStartDate = x.AnnouncementStartDate,
                                 AnnouncementDate = x.AnnouncementDate,
+                                ScoreExpireDate = x.ScoreExpireDate,
                                 CheckDisability = x.CheckDisability,
                                 CheckDocument = x.CheckDocument,
                                 Detail = x.Detail,
@@ -352,6 +355,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
                 PaymentEndDate = inserted.PaymentEndDate,
                 AnnouncementStartDate = inserted.AnnouncementStartDate,
                 AnnouncementDate = inserted.AnnouncementDate,
+                ScoreExpireDate = inserted.ScoreExpireDate,
                 ExamDate = inserted.ExamDate,
                 AnnouncementEndDate = inserted.AnnouncementEndDate,
                 OrganizationCodeId = inserted.OrganizationCodeId,
@@ -454,6 +458,9 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
             periodExam.PaymentEndDate = updated.PaymentEndDate;
             periodExam.AnnouncementStartDate = updated.AnnouncementStartDate;
             periodExam.AnnouncementDate = updated.AnnouncementDate;
+            // ScoreExpireDate อัปเดตเฉพาะเมื่อ FE ส่งค่ามาเท่านั้น (ไม่บังคับส่ง)
+            if (updated.ScoreExpireDate.HasValue)
+                periodExam.ScoreExpireDate = updated.ScoreExpireDate;
             periodExam.ExamDate = updated.ExamDate;
             periodExam.AnnouncementEndDate = updated.AnnouncementEndDate;
             periodExam.OrganizationCodeId = updated.OrganizationCodeId;
@@ -1137,8 +1144,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
                         for (int row = 4; row <= rowCount; row++)
                         {
                             System.Diagnostics.Debug.WriteLine(worksheet);
-                            // if (worksheet.Cells[row, 2].Value != null)
-                            // {
+                            if (worksheet.Cells[row, 2].Value == null) continue;
                             list.Add(new RequestImportSeat
                             {
                                 Number = worksheet.Cells[row, 1].Value != null ? worksheet.Cells[row, 1].Value.ToString() : null,
@@ -1146,58 +1152,57 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
                                 CitizenId = worksheet.Cells[row, 3].Value != null ? worksheet.Cells[row, 3].Value.ToString() : null,
                                 SeatNumber = worksheet.Cells[row, 4].Value != null ? worksheet.Cells[row, 4].Value.ToString() : null,
 
-                                PointPath1A = worksheet.Cells[row, 9].Value != null ? worksheet.Cells[row, 9].Value.ToString() : null,
-                                PointPath2A = worksheet.Cells[row, 10].Value != null ? worksheet.Cells[row, 10].Value.ToString() : null,
-                                PointPath3A = worksheet.Cells[row, 11].Value != null ? worksheet.Cells[row, 11].Value.ToString() : null,
-                                PointTotalA = worksheet.Cells[3, 12].Value != null ? worksheet.Cells[3, 12].Value.ToString()?.Split(" ")[0] : null,
-                                PointA = worksheet.Cells[row, 12].Value != null ? worksheet.Cells[row, 12].Value.ToString() : null,
-                                PointPerA = worksheet.Cells[row, 13].Value != null ? worksheet.Cells[row, 13].Value.ToString() : null,
+                                PointPath1A = worksheet.Cells[row, 9].Value != null ? ExtractFirstNumber(worksheet.Cells[row, 9].Value.ToString()) : null,
+                                PointPath2A = worksheet.Cells[row, 10].Value != null ? ExtractFirstNumber(worksheet.Cells[row, 10].Value.ToString()) : null,
+                                PointPath3A = worksheet.Cells[row, 11].Value != null ? ExtractFirstNumber(worksheet.Cells[row, 11].Value.ToString()) : null,
+                                PointTotalA = worksheet.Cells[3, 12].Value != null ? ExtractFirstNumber(worksheet.Cells[3, 12].Value.ToString()) : null,
+                                PointA = worksheet.Cells[row, 12].Value != null ? ExtractFirstNumber(worksheet.Cells[row, 12].Value.ToString()) : null,
+                                PointPerA = worksheet.Cells[row, 13].Value != null ? ExtractFirstNumber(worksheet.Cells[row, 13].Value.ToString()) : null,
                                 ResultA = worksheet.Cells[row, 14].Value != null ? worksheet.Cells[row, 14].Value.ToString() : null,
 
-                                PointTotalB = worksheet.Cells[3, 15].Value != null ? worksheet.Cells[3, 15].Value.ToString()?.Split(" ")[0] : null,
-                                PointB = worksheet.Cells[row, 15].Value != null ? worksheet.Cells[row, 15].Value.ToString() : null,
-                                PointPerB = worksheet.Cells[row, 16].Value != null ? worksheet.Cells[row, 16].Value.ToString() : null,
+                                PointTotalB = worksheet.Cells[3, 15].Value != null ? ExtractFirstNumber(worksheet.Cells[3, 15].Value.ToString()) : null,
+                                PointB = worksheet.Cells[row, 15].Value != null ? ExtractFirstNumber(worksheet.Cells[row, 15].Value.ToString()) : null,
+                                PointPerB = worksheet.Cells[row, 16].Value != null ? ExtractFirstNumber(worksheet.Cells[row, 16].Value.ToString()) : null,
                                 ResultB = worksheet.Cells[row, 17].Value != null ? worksheet.Cells[row, 17].Value.ToString() : null,
 
-                                PointPath1C = worksheet.Cells[row, 18].Value != null ? worksheet.Cells[row, 18].Value.ToString() : null,
-                                PointPath2C = worksheet.Cells[row, 19].Value != null ? worksheet.Cells[row, 19].Value.ToString() : null,
-                                PointTotalC = worksheet.Cells[3, 20].Value != null ? worksheet.Cells[3, 20].Value.ToString()?.Split(" ")[0] : null,
-                                PointC = worksheet.Cells[row, 20].Value != null ? worksheet.Cells[row, 20].Value.ToString() : null,
-                                PointPerC = worksheet.Cells[row, 21].Value != null ? worksheet.Cells[row, 21].Value.ToString() : null,
+                                PointPath1C = worksheet.Cells[row, 18].Value != null ? ExtractFirstNumber(worksheet.Cells[row, 18].Value.ToString()) : null,
+                                PointPath2C = worksheet.Cells[row, 19].Value != null ? ExtractFirstNumber(worksheet.Cells[row, 19].Value.ToString()) : null,
+                                PointTotalC = worksheet.Cells[3, 20].Value != null ? ExtractFirstNumber(worksheet.Cells[3, 20].Value.ToString()) : null,
+                                PointC = worksheet.Cells[row, 20].Value != null ? ExtractFirstNumber(worksheet.Cells[row, 20].Value.ToString()) : null,
+                                PointPerC = worksheet.Cells[row, 21].Value != null ? ExtractFirstNumber(worksheet.Cells[row, 21].Value.ToString()) : null,
                                 ResultC = worksheet.Cells[row, 22].Value != null ? worksheet.Cells[row, 22].Value.ToString() : null,
 
                                 Pass = worksheet.Cells[row, 23].Value != null ? worksheet.Cells[row, 23].Value.ToString() : null,
                                 ExamReason = worksheet.Cells[row, 27].Value != null ? worksheet.Cells[row, 27].Value.ToString() : null,
                             });
-                            if (!int.TryParse(worksheet.Cells[row, 9].Value != null ? worksheet.Cells[row, 9].Value.ToString() : "0", out _))
-                                throw new Exception("กรอกจำนวนคะแนนไม่ถูกต้อง");
-                            if (!int.TryParse(worksheet.Cells[row, 10].Value != null ? worksheet.Cells[row, 10].Value.ToString() : "0", out _))
-                                throw new Exception("กรอกจำนวนคะแนนไม่ถูกต้อง");
-                            if (!int.TryParse(worksheet.Cells[row, 11].Value != null ? worksheet.Cells[row, 11].Value.ToString() : "0", out _))
-                                throw new Exception("กรอกจำนวนคะแนนไม่ถูกต้อง");
-                            if (!int.TryParse(worksheet.Cells[3, 12].Value != null ? worksheet.Cells[3, 12].Value.ToString()?.Split(" ")[0] : "0", out _))
-                                throw new Exception("กรอกจำนวนคะแนนไม่ถูกต้อง");
-                            if (!int.TryParse(worksheet.Cells[row, 12].Value != null ? worksheet.Cells[row, 12].Value.ToString() : "0", out _))
-                                throw new Exception("กรอกจำนวนคะแนนไม่ถูกต้อง");
-                            if (!int.TryParse(worksheet.Cells[row, 13].Value != null ? worksheet.Cells[row, 13].Value.ToString() : "0", out _))
-                                throw new Exception("กรอกจำนวนคะแนนไม่ถูกต้อง");
-                            if (!int.TryParse(worksheet.Cells[3, 15].Value != null ? worksheet.Cells[3, 15].Value.ToString()?.Split(" ")[0] : "0", out _))
-                                throw new Exception("กรอกจำนวนคะแนนไม่ถูกต้อง");
-                            if (!int.TryParse(worksheet.Cells[row, 15].Value != null ? worksheet.Cells[row, 15].Value.ToString() : "0", out _))
-                                throw new Exception("กรอกจำนวนคะแนนไม่ถูกต้อง");
-                            if (!int.TryParse(worksheet.Cells[row, 16].Value != null ? worksheet.Cells[row, 16].Value.ToString() : "0", out _))
-                                throw new Exception("กรอกจำนวนคะแนนไม่ถูกต้อง");
-                            if (!int.TryParse(worksheet.Cells[row, 18].Value != null ? worksheet.Cells[row, 18].Value.ToString() : "0", out _))
-                                throw new Exception("กรอกจำนวนคะแนนไม่ถูกต้อง");
-                            if (!int.TryParse(worksheet.Cells[row, 19].Value != null ? worksheet.Cells[row, 19].Value.ToString() : "0", out _))
-                                throw new Exception("กรอกจำนวนคะแนนไม่ถูกต้อง");
-                            if (!int.TryParse(worksheet.Cells[3, 20].Value != null ? worksheet.Cells[3, 20].Value.ToString()?.Split(" ")[0] : "0", out _))
-                                throw new Exception("กรอกจำนวนคะแนนไม่ถูกต้อง");
-                            if (!int.TryParse(worksheet.Cells[row, 20].Value != null ? worksheet.Cells[row, 20].Value.ToString() : "0", out _))
-                                throw new Exception("กรอกจำนวนคะแนนไม่ถูกต้อง");
-                            if (!int.TryParse(worksheet.Cells[row, 21].Value != null ? worksheet.Cells[row, 21].Value.ToString() : "0", out _))
-                                throw new Exception("กรอกจำนวนคะแนนไม่ถูกต้อง");
-                            // }
+                            if (!int.TryParse(ExtractFirstNumber(worksheet.Cells[row, 9].Value?.ToString()) ?? "0", out _))
+                                throw new Exception($"กรอกจำนวนคะแนนไม่ถูกต้อง (แถวที่ {row} คอลัมน์ I)");
+                            if (!int.TryParse(ExtractFirstNumber(worksheet.Cells[row, 10].Value?.ToString()) ?? "0", out _))
+                                throw new Exception($"กรอกจำนวนคะแนนไม่ถูกต้อง (แถวที่ {row} คอลัมน์ J)");
+                            if (!int.TryParse(ExtractFirstNumber(worksheet.Cells[row, 11].Value?.ToString()) ?? "0", out _))
+                                throw new Exception($"กรอกจำนวนคะแนนไม่ถูกต้อง (แถวที่ {row} คอลัมน์ K)");
+                            if (!int.TryParse(ExtractFirstNumber(worksheet.Cells[3, 12].Value?.ToString()) ?? "0", out _))
+                                throw new Exception($"รูปแบบคะแนนรวมไม่ถูกต้อง กรุณากรอกตัวเลขนำหน้า เช่น '100 คะเนน' หรือ '100' หรือเว้นว่างไว้ (แถวที่ 3 คอลัมน์ L)");
+                            if (!int.TryParse(ExtractFirstNumber(worksheet.Cells[row, 12].Value?.ToString()) ?? "0", out _))
+                                throw new Exception($"กรอกจำนวนคะแนนไม่ถูกต้อง (แถวที่ {row} คอลัมน์ L)");
+                            if (!int.TryParse(ExtractFirstNumber(worksheet.Cells[row, 13].Value?.ToString()) ?? "0", out _))
+                                throw new Exception($"กรอกจำนวนคะแนนไม่ถูกต้อง (แถวที่ {row} คอลัมน์ M)");
+                            if (!int.TryParse(ExtractFirstNumber(worksheet.Cells[3, 15].Value?.ToString()) ?? "0", out _))
+                                throw new Exception($"รูปแบบคะแนนรวมไม่ถูกต้อง กรุณากรอกตัวเลขนำหน้า เช่น '100 คะเนน' หรือ '100' หรือเว้นว่างไว้ (แถวที่ 3 คอลัมน์ O)");
+                            if (!int.TryParse(ExtractFirstNumber(worksheet.Cells[row, 15].Value?.ToString()) ?? "0", out _))
+                                throw new Exception($"กรอกจำนวนคะแนนไม่ถูกต้อง (แถวที่ {row} คอลัมน์ O)");
+                            if (!int.TryParse(ExtractFirstNumber(worksheet.Cells[row, 16].Value?.ToString()) ?? "0", out _))
+                                throw new Exception($"กรอกจำนวนคะแนนไม่ถูกต้อง (แถวที่ {row} คอลัมน์ P)");
+                            if (!int.TryParse(ExtractFirstNumber(worksheet.Cells[row, 18].Value?.ToString()) ?? "0", out _))
+                                throw new Exception($"กรอกจำนวนคะแนนไม่ถูกต้อง (แถวที่ {row} คอลัมน์ R)");
+                            if (!int.TryParse(ExtractFirstNumber(worksheet.Cells[row, 19].Value?.ToString()) ?? "0", out _))
+                                throw new Exception($"กรอกจำนวนคะแนนไม่ถูกต้อง (แถวที่ {row} คอลัมน์ S)");
+                            if (!int.TryParse(ExtractFirstNumber(worksheet.Cells[3, 20].Value?.ToString()) ?? "0", out _))
+                                throw new Exception($"รูปแบบคะแนนรวมไม่ถูกต้อง กรุณากรอกตัวเลขนำหน้า เช่น '100 คะเนน' หรือ '100' หรือเว้นว่างไว้ (แถวที่ 3 คอลัมน์ T)");
+                            if (!int.TryParse(ExtractFirstNumber(worksheet.Cells[row, 20].Value?.ToString()) ?? "0", out _))
+                                throw new Exception($"กรอกจำนวนคะแนนไม่ถูกต้อง (แถวที่ {row} คอลัมน์ T)");
+                            if (!int.TryParse(ExtractFirstNumber(worksheet.Cells[row, 21].Value?.ToString()) ?? "0", out _))
+                                throw new Exception($"กรอกจำนวนคะแนนไม่ถูกต้อง (แถวที่ {row} คอลัมน์ U)");
                         }
                     }
                 }
@@ -1205,6 +1210,20 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
             return list;
         }
 
+        /// <summary>
+        /// ดึงเฉพาะส่วนตัวเลขนำหน้าจากค่าในเซลล์คะแนน
+        /// เช่น "100 คะแนน" / "100คะแนน" / " 100 " -> "100"
+        /// รองรับทั้งกรณีมี/ไม่มีช่องว่างคั่น หากเซลล์ว่างจะคืน null (เพื่อเก็บ NULL ใน DB)
+        /// หมายเหตุ: จุดที่ใช้ตรวจสอบ (validation) ต้องใส่ ?? "0" เพื่อให้ค่าว่างผ่านการตรวจ
+        /// </summary>
+        private static string? ExtractFirstNumber(string? raw)
+        {
+            if (string.IsNullOrWhiteSpace(raw))
+                return null;
+            var match = Regex.Match(raw, @"^\s*\d+");
+            return match.Success ? match.Value : raw.Trim();
+        }
+
         public async Task UploadSeatCandidateAsync(string examId, IFormFile excels)
         {
             var periodExam = await _context.PeriodExams.AsQueryable()
@@ -1232,30 +1251,57 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
                     if (candidate.Status == "checkSeat")
                     {
                         candidate.SeatNumber = item.SeatNumber;
-                        var subject = "แจ้งผลการสมัครสอบคัดเลือก " + periodExam.Name;
-                        var body = candidate.FirstName + " " + candidate.LastName + " สถานะการสมัครสอบ: ติดตามประกาศทาง Website";
-                        if (candidate.Email != null && candidate.Email != "") _mailService.SendMailToUser(subject, body, candidate.Email);
+                        // var subject = "แจ้งผลการสมัครสอบคัดเลือก " + periodExam.Name;
+                        // var body = candidate.FirstName + " " + candidate.LastName + " สถานะการสมัครสอบ: ติดตามประกาศทาง Website";
+                        // try
+                        // {
+                        //     if (candidate.Email != null && candidate.Email != "") _mailService.SendMailToUser(subject, body, candidate.Email);
+                        // }
+                        // catch (Exception ex)
+                        // {
+                        //     Console.WriteLine($"[MailError] ส่ง email ไม่สำเร็จ: {candidate.Email} | {ex.Message}");
+                        //     if (ex.InnerException != null)
+                        //         Console.WriteLine($"[MailError] Inner: {ex.InnerException.Message}");
+                        // }
                         candidate.Status = "checkPoint";
                     }
                     else
                     {
-                        if (candidate.Status != "waiver")
-                        {
-                            var subject = "แจ้งผลการสมัครสอบคัดเลือก " + periodExam.Name;
-                            var body = candidate.FirstName + " " + candidate.LastName + " สถานะการสมัครสอบ: สละสิทธิ์สอบ";
-                            if (candidate.Email != null && candidate.Email != "") _mailService.SendMailToUser(subject, body, candidate.Email);
-                        }
+                        // if (candidate.Status != "waiver")
+                        // {
+                        //     var subject = "แจ้งผลการสมัครสอบคัดเลือก " + periodExam.Name;
+                        //     var body = candidate.FirstName + " " + candidate.LastName + " สถานะการสมัครสอบ: สละสิทธิ์สอบ";
+                        //     try
+                        //     {
+                        //         if (candidate.Email != null && candidate.Email != "") _mailService.SendMailToUser(subject, body, candidate.Email);
+                        //     }
+                        //     catch (Exception ex)
+                        //     {
+                        //         Console.WriteLine($"[MailError] ส่ง email ไม่สำเร็จ: {candidate.Email} | {ex.Message}");
+                        //         if (ex.InnerException != null)
+                        //             Console.WriteLine($"[MailError] Inner: {ex.InnerException.Message}");
+                        //     }
+                        // }
                         candidate.Status = "waiver";
                     }
                 }
                 else
                 {
-                    if (candidate.Status != "waiver")
-                    {
-                        var subject = "แจ้งผลการสมัครสอบคัดเลือก " + periodExam.Name;
-                        var body = candidate.FirstName + " " + candidate.LastName + " สถานะการสมัครสอบ: สละสิทธิ์สอบ";
-                        if (candidate.Email != null && candidate.Email != "") _mailService.SendMailToUser(subject, body, candidate.Email);
-                    }
+                    // if (candidate.Status != "waiver")
+                    // {
+                    //     var subject = "แจ้งผลการสมัครสอบคัดเลือก " + periodExam.Name;
+                    //     var body = candidate.FirstName + " " + candidate.LastName + " สถานะการสมัครสอบ: สละสิทธิ์สอบ";
+                    //     try
+                    //     {
+                    //         if (candidate.Email != null && candidate.Email != "") _mailService.SendMailToUser(subject, body, candidate.Email);
+                    //     }
+                    //     catch (Exception ex)
+                    //     {
+                    //         Console.WriteLine($"[MailError] ส่ง email ไม่สำเร็จ: {candidate.Email} | {ex.Message}");
+                    //         if (ex.InnerException != null)
+                    //             Console.WriteLine($"[MailError] Inner: {ex.InnerException.Message}");
+                    //     }
+                    // }
                     candidate.Status = "waiver";
                 }
                 periodExam.SetSeat = true;
@@ -1307,32 +1353,32 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
                         candidate.PointPerC = item.PointPerC;
                         candidate.ResultC = item.ResultC;
                         candidate.Pass = item.Pass;
-                        candidate.ExamReason = item.ExamReason;
-                        candidate.Number = item.Number;
-                        var subject = "แจ้งผลการสมัครสอบคัดเลือก " + periodExam.Name;
-                        var body = candidate.FirstName + " " + candidate.LastName + " สถานะการสมัครสอบ: สอบคัดเลือกสำเร็จ <br />" + "ผลการสอบของท่าน คือ " + candidate.Pass;
-                        if (candidate.Email != null && candidate.Email != "") _mailService.SendMailToUser(subject, body, candidate.Email);
+                        candidate.ExamReason = string.IsNullOrWhiteSpace(item.ExamReason) ? null : item.ExamReason;
+                        candidate.Number = string.IsNullOrWhiteSpace(item.Number) ? null : item.Number;
+                        // var subject = "แจ้งผลการสมัครสอบคัดเลือก " + periodExam.Name;
+                        // var body = candidate.FirstName + " " + candidate.LastName + " สถานะการสมัครสอบ: สอบคัดเลือกสำเร็จ <br />" + "ผลการสอบของท่าน คือ " + candidate.Pass;
+                        // if (candidate.Email != null && candidate.Email != "") _mailService.SendMailToUser(subject, body, candidate.Email);
                         candidate.Status = "done";
                     }
                     else
                     {
-                        if (candidate.Status != "waiver")
-                        {
-                            var subject = "แจ้งผลการสมัครสอบคัดเลือก " + periodExam.Name;
-                            var body = candidate.FirstName + " " + candidate.LastName + " สถานะการสมัครสอบ: สละสิทธิ์สอบ";
-                            if (candidate.Email != null && candidate.Email != "") _mailService.SendMailToUser(subject, body, candidate.Email);
-                        }
+                        // if (candidate.Status != "waiver")
+                        // {
+                        //     var subject = "แจ้งผลการสมัครสอบคัดเลือก " + periodExam.Name;
+                        //     var body = candidate.FirstName + " " + candidate.LastName + " สถานะการสมัครสอบ: สละสิทธิ์สอบ";
+                        //     if (candidate.Email != null && candidate.Email != "") _mailService.SendMailToUser(subject, body, candidate.Email);
+                        // }
                         // candidate.Status = "waiver";
                     }
                 }
                 else
                 {
-                    if (candidate.Status != "waiver")
-                    {
-                        var subject = "แจ้งผลการสมัครสอบคัดเลือก " + periodExam.Name;
-                        var body = candidate.FirstName + " " + candidate.LastName + " สถานะการสมัครสอบ: สละสิทธิ์สอบ";
-                        if (candidate.Email != null && candidate.Email != "") _mailService.SendMailToUser(subject, body, candidate.Email);
-                    }
+                    // if (candidate.Status != "waiver")
+                    // {
+                    //     var subject = "แจ้งผลการสมัครสอบคัดเลือก " + periodExam.Name;
+                    //     var body = candidate.FirstName + " " + candidate.LastName + " สถานะการสมัครสอบ: สละสิทธิ์สอบ";
+                    //     if (candidate.Email != null && candidate.Email != "") _mailService.SendMailToUser(subject, body, candidate.Email);
+                    // }
                     // candidate.Status = "waiver";
                 }
                 periodExam.SetSeat = true;
@@ -1542,37 +1588,37 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
                 {
                     _data.Add(new
                     {
-                        Number = item.Number != null ? item.Number.ToString() : "-",
-                        ExamIdenNumber = item.ExamIdenNumber != null ? item.ExamIdenNumber.ToString() : "-",
-                        CitizenId = item.CitizenId != null ? item.CitizenId.ToString() : "-",
-                        SeatNumber = item.SeatNumber != null ? item.SeatNumber.ToString() : "-",
-                        PrefixName = item.PrefixName != null ? item.PrefixName.ToString() : "-",
-                        FullName = item.FirstName != null && item.LastName != null ? $"{item.FirstName} {item.LastName}" : "-",
-                        PositionName = item.PositionExam != null && item.PositionExam?.PositionName != null ? item.PositionExam?.PositionName.ToString() : "-",
-                        PositionLevelName = item.PositionExam != null && item.PositionExam?.PositionLevelName != null ? item.PositionExam?.PositionLevelName.ToString() : "-",
+                        Number = item.Number != null ? item.Number.ToString() : "",
+                        ExamIdenNumber = item.ExamIdenNumber != null ? item.ExamIdenNumber.ToString() : "",
+                        CitizenId = item.CitizenId != null ? item.CitizenId.ToString() : "",
+                        SeatNumber = item.SeatNumber != null ? item.SeatNumber.ToString() : "",
+                        PrefixName = item.PrefixName != null ? item.PrefixName.ToString() : "",
+                        FullName = item.FirstName != null && item.LastName != null ? $"{item.FirstName} {item.LastName}" : "",
+                        PositionName = item.PositionExam != null && item.PositionExam?.PositionName != null ? item.PositionExam?.PositionName.ToString() : "",
+                        PositionLevelName = item.PositionExam != null && item.PositionExam?.PositionLevelName != null ? item.PositionExam?.PositionLevelName.ToString() : "",
 
-                        PointPath1A = item.PointPath1A != null ? item.PointPath1A.ToString() : "0",
-                        PointPath2A = item.PointPath2A != null ? item.PointPath2A.ToString() : "0",
-                        PointPath3A = item.PointPath3A != null ? item.PointPath3A.ToString() : "0",
-                        PointA = item.PointA != null ? item.PointA.ToString() : "0",
-                        PointPerA = item.PointPerA != null ? item.PointPerA.ToString() : "0",
-                        ResultA = item.ResultA != null ? item.ResultA.ToString() : "-",
+                        PointPath1A = item.PointPath1A != null ? item.PointPath1A.ToString() : "",
+                        PointPath2A = item.PointPath2A != null ? item.PointPath2A.ToString() : "",
+                        PointPath3A = item.PointPath3A != null ? item.PointPath3A.ToString() : "",
+                        PointA = item.PointA != null ? item.PointA.ToString() : "",
+                        PointPerA = item.PointPerA != null ? item.PointPerA.ToString() : "",
+                        ResultA = item.ResultA != null ? item.ResultA.ToString() : "",
 
-                        PointB = item.PointB != null ? item.PointB.ToString() : "0",
-                        PointPerB = item.PointPerB != null ? item.PointPerB.ToString() : "0",
-                        ResultB = item.ResultB != null ? item.ResultB.ToString() : "-",
+                        PointB = item.PointB != null ? item.PointB.ToString() : "",
+                        PointPerB = item.PointPerB != null ? item.PointPerB.ToString() : "",
+                        ResultB = item.ResultB != null ? item.ResultB.ToString() : "",
 
-                        PointPath1C = item.PointPath1C != null ? item.PointPath1C.ToString() : "0",
-                        PointPath2C = item.PointPath2C != null ? item.PointPath2C.ToString() : "0",
-                        PointC = item.PointC != null ? item.PointC.ToString() : "0",
-                        PointPerC = item.PointPerC != null ? item.PointPerC.ToString() : "0",
-                        ResultC = item.ResultC != null ? item.ResultC.ToString() : "-",
+                        PointPath1C = item.PointPath1C != null ? item.PointPath1C.ToString() : "",
+                        PointPath2C = item.PointPath2C != null ? item.PointPath2C.ToString() : "",
+                        PointC = item.PointC != null ? item.PointC.ToString() : "",
+                        PointPerC = item.PointPerC != null ? item.PointPerC.ToString() : "",
+                        ResultC = item.ResultC != null ? item.ResultC.ToString() : "",
 
-                        Pass = item.Pass != null ? item.Pass.ToString() : "-",
+                        Pass = item.Pass != null ? item.Pass.ToString() : "",
                         PaymentStatus = item.PeriodExam == null || item.PeriodExam.Fee <= 0 ? "ไม่มีชำระเงิน" : (item.PaymentDate == null ? "ยังไม่ชำระเงิน" : "ชำระแล้ว"),
-                        PaymentDate = item.PaymentDate == null ? "-" : $"{item.PaymentDate.Value.ToThaiShortDate()} {item.PaymentDate.Value:HH:mm:ss.ffff}".ToString(),
-                        RegisterDate = item.RegisterDate == null ? "-" : $"{item.RegisterDate.Value.ToThaiShortDate()} {item.RegisterDate.Value:HH:mm:ss.ffff}".ToString(),
-                        ExamReason = item.ExamReason != null ? item.ExamReason.ToString() : "-"
+                        PaymentDate = item.PaymentDate == null ? "" : $"{item.PaymentDate.Value.ToThaiShortDate()} {item.PaymentDate.Value:HH:mm:ss.ffff}".ToString(),
+                        RegisterDate = item.RegisterDate == null ? "" : $"{item.RegisterDate.Value.ToThaiShortDate()} {item.RegisterDate.Value:HH:mm:ss.ffff}".ToString(),
+                        ExamReason = item.ExamReason != null ? item.ExamReason.ToString() : ""
                     });
                 }
             }
@@ -1580,37 +1626,37 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
             {
                 _data.Add(new
                 {
-                    Number = "-",
-                    ExamIdenNumber = "-",
-                    CitizenId = "-",
-                    SeatNumber = "-",
-                    PrefixName = "-",
-                    FullName = "-",
-                    PositionName = "-",
-                    PositionLevelName = "-",
+                    Number = "",
+                    ExamIdenNumber = "",
+                    CitizenId = "",
+                    SeatNumber = "",
+                    PrefixName = "",
+                    FullName = "",
+                    PositionName = "",
+                    PositionLevelName = "",
 
-                    PointPath1A = "-",
-                    PointPath2A = "-",
-                    PointPath3A = "-",
-                    PointA = "-",
-                    PointPerA = "-",
-                    ResultA = "-",
+                    PointPath1A = "",
+                    PointPath2A = "",
+                    PointPath3A = "",
+                    PointA = "",
+                    PointPerA = "",
+                    ResultA = "",
 
-                    PointB = "-",
-                    PointPerB = "-",
-                    ResultB = "-",
+                    PointB = "",
+                    PointPerB = "",
+                    ResultB = "",
 
-                    PointPath1C = "-",
-                    PointPath2C = "-",
-                    PointC = "-",
-                    PointPerC = "-",
-                    ResultC = "-",
+                    PointPath1C = "",
+                    PointPath2C = "",
+                    PointC = "",
+                    PointPerC = "",
+                    ResultC = "",
 
-                    Pass = "-",
-                    PaymentStatus = "-",
-                    PaymentDate = "-",
-                    RegisterDate = "-",
-                    ExamReason = "-"
+                    Pass = "",
+                    PaymentStatus = "",
+                    PaymentDate = "",
+                    RegisterDate = "",
+                    ExamReason = ""
                 });
             }
 
@@ -1625,6 +1671,101 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
             };
         }
 
+        public async Task<dynamic> DownloadCandidateExamAsync(string examId)
+        {
+            var periodExam = await _context.PeriodExams.AsQueryable()
+                .Where(x => x.CheckDisability == false)
+                .FirstOrDefaultAsync(x => x.Id == Guid.Parse(examId));
+
+            if (periodExam == null)
+                throw new Exception(GlobalMessages.ExamNotFound);
+
+            var data = await _context.Candidates.AsQueryable()
+                .Include(x => x.PeriodExam)
+                .Where(x => x.PeriodExam == periodExam)
+                .Where(x => x.Status != "register")
+                .Where(x => x.ExamIdenNumber != null && x.ExamIdenNumber != "")
+                .OrderBy(x => x.ExamIdenNumber)
+                .Select(p => new
+                {
+                    ExamId = p.ExamIdenNumber == null ? null : (p.ExamIdenNumber.ToThaiNumber()),
+                    FullName = $"{p.PrefixName}{p.FirstName} {p.LastName}",
+                    PositionName = "",
+                    ExamName =
+                        ($"{p.PeriodExam.Name} ครั้งที่ {p.PeriodExam.Round}/{p.PeriodExam.Year.Value.ToThaiYear()}").ToThaiNumber(),
+                }).ToListAsync();
+
+            if (data.Count == 0)
+                throw new Exception("ไม่พบข้อมูลในระบบ");
+
+            var examName = data[0].ExamName;
+            return new
+            {
+                template = "rptCandidateList",
+                reportName = $"รายชื่อผู้มีสิทธิ์สอบ_{data.First().ExamName}",
+                data = new
+                {
+                    examName = examName,
+                    data = data
+                }
+            };
+        }
+
+        public async Task<dynamic> DownloadPassExamAsync(string examId)
+        {
+            var periodExam = await _context.PeriodExams.AsQueryable()
+                .Where(x => x.CheckDisability == false)
+                .FirstOrDefaultAsync(x => x.Id == Guid.Parse(examId));
+
+            if (periodExam == null)
+                throw new Exception(GlobalMessages.ExamNotFound);
+
+            var candidates = await _context.Candidates.AsQueryable()
+                .Include(x => x.PeriodExam)
+                .ThenInclude(x => x.ScoreImport)
+                .Where(x => x.PeriodExam == periodExam)
+                .Where(x => x.Status != "register")
+                .ToListAsync();
+
+            var data = candidates.Select((p, idx) => new
+            {
+                SeatNumber = p.SeatNumber == null ? "-" : (p.SeatNumber.ToThaiNumber()),
+                CitizenId = p.CitizenId == null ? "-" : (p.CitizenId.ToThaiNumber()),
+                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(),
+                FullA = "๐",
+                SumA = "๐",
+                FullB = p.PointTotalB == null ? "-" : p.PointTotalB.ToString(),
+                SumB = p.PointB == null ? "-" : p.PointB.ToString(),
+                FullC = p.PointTotalC == null ? "-" : p.PointTotalC.ToString(),
+                SumC = p.PointC == null ? "-" : p.PointC.ToString(),
+                SumScore = ((Convert.ToInt32(p.PointB ?? "0") + Convert.ToInt32(p.PointC ?? "0")).ToString()).ToThaiNumber(),
+                ExamResult = p.Pass,
+                ExamThaiId = p.ExamIdenNumber == null ? "-" : p.ExamIdenNumber.ToThaiNumber(),
+                ExamId = p.ExamIdenNumber,
+            })
+            .OrderBy(x => x.ExamId)
+            .Where(x => x.ExamResult?.Trim() == "ได้")
+            .ToList();
+
+            if (data.Count == 0)
+                throw new Exception("ไม่พบข้อมูลในระบบ");
+
+            var examName = data[0].ExamName;
+            return new
+            {
+                template = "rptPassExamList",
+                reportName = $"รายชื่อผู้สอบแข่งขันได้_{periodExam.Name} ครั้งที่ {periodExam.Round}/{periodExam.Year.Value.ToThaiYear()}",
+                data = new
+                {
+                    examName = examName,
+                    data = data
+                }
+            };
+        }
+
         public async Task<PeriodExam> GetsPaymentExamAsync(string examId)
         {
             var periodExam = await _context.PeriodExams.AsQueryable()
@@ -2843,7 +2984,9 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
                 Number = periodExam.Candidate.Where(x => x.Status.Contains("done")).Count(),
                 PlacementType = await _contextMetadata.PlacementTypes.FirstOrDefaultAsync(x => x.Name.Trim().ToUpper().Contains("สอบคัดเลือก")) == null ? await _contextMetadata.PlacementTypes.FirstOrDefaultAsync() : await _contextMetadata.PlacementTypes.FirstOrDefaultAsync(x => x.Name.Trim().ToUpper().Contains("สอบคัดเลือก")),
                 StartDate = DateTime.Now,
-                EndDate = DateTime.Now.AddYears(2).AddDays(-1),
+                // เดิมคำนวณวันหมดอายุจาก AnnouncementDate + 2 ปี (เก็บไว้สำหรับอ้างอิงข้อมูลเก่า)
+                //EndDate = DateTime.Now.AddYears(2).AddDays(-1),
+                EndDate = periodExam.ScoreExpireDate ?? DateTime.Now.AddYears(2).AddDays(-1),
                 CreatedAt = DateTime.Now,
                 CreatedUserId = UserId ?? "",
                 CreatedFullName = FullName ?? "",
@@ -2860,7 +3003,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
                 using (var client = new HttpClient())
                 {
                     client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
-                    client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
+                    client.DefaultRequestHeaders.Add("api-key", _configuration["API_KEY"]);
                     var _req = new HttpRequestMessage(HttpMethod.Get, apiUrl);
                     var _res = await client.SendAsync(_req);
                     var _result = await _res.Content.ReadAsStringAsync();
@@ -3055,7 +3198,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
                     throw new Exception(GlobalMessages.ExamNotFound);
 
                 var _placement = await _contextMetadata.Placements.AsQueryable()
-                                            .FirstOrDefaultAsync(x => x.PlacementType.Name == "คัดเลือกคนพิการ" && x.RefId == periodExam.Id);
+                                            .FirstOrDefaultAsync(x => x.PlacementType.Name == "คัดเลือกอื่นๆ" && x.RefId == periodExam.Id);
                 if (_placement != null)
                     throw new Exception("รอบการสอบนี้ได้ทำการบรรจุไปแล้ว");
 
@@ -3073,9 +3216,11 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
                     Round = periodExam.Round?.ToString() ?? "",
                     Year = (int)(periodExam.Year ?? 0),
                     Number = await _context.Disables.AsQueryable().Where(x => x.PeriodExam == periodExam).CountAsync(),
-                    PlacementType = placementTypesCache.FirstOrDefault(x => x.Name.Trim().ToUpper().Contains("คัดเลือกคนพิการ")) ?? placementTypesCache.First(),
+                    PlacementType = placementTypesCache.FirstOrDefault(x => x.Name.Trim().ToUpper().Contains("คัดเลือกอื่นๆ")) ?? placementTypesCache.First(),
                     StartDate = accountStartDate,
-                    EndDate = accountStartDate.AddYears(2).AddDays(-1),
+                    // เดิมคำนวณวันหมดอายุจาก AnnouncementDate + 2 ปี (เก็บไว้สำหรับอ้างอิงข้อมูลเก่า)
+                    //EndDate = accountStartDate.AddYears(2).AddDays(-1),
+                    EndDate = periodExam.ScoreExpireDate ?? accountStartDate.AddYears(2).AddDays(-1),
                     CreatedAt = DateTime.Now,
                     CreatedUserId = UserId ?? "",
                     CreatedFullName = FullName ?? "",
@@ -3197,6 +3342,28 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
                         positionNameWithoutLevel = positionNameWithoutLevel.Replace(posLevelName, "").Trim();
                     }
 
+                    // lookup province, district, subDistrict IDs with parent filtering
+                    var registProvinceId = provincesCache.FirstOrDefault(x => x.name == firstAddress?.Province)?.Id;
+                    var registDistrictId = districtsCache.FirstOrDefault(x => x.name == firstAddress?.Amphur && x.provinceId == registProvinceId)?.Id;
+                    var registSubDistrictId = subDistrictsCache.FirstOrDefault(x => x.name == firstAddress?.District && x.districtId == registDistrictId)?.Id;
+                    var currentProvinceId = provincesCache.FirstOrDefault(x => x.name == firstAddress?.Province1)?.Id;
+                    var currentDistrictId = districtsCache.FirstOrDefault(x => x.name == firstAddress?.Amphur1 && x.provinceId == currentProvinceId)?.Id;
+                    var currentSubDistrictId = subDistrictsCache.FirstOrDefault(x => x.name == firstAddress?.District1 && x.districtId == currentDistrictId)?.Id;
+
+                    // log warning when address lookup fails
+                    if (registProvinceId == null && !string.IsNullOrWhiteSpace(firstAddress?.Province))
+                        Console.WriteLine($"[WARN] Regist province not found: {firstAddress?.Province}");
+                    if (registDistrictId == null && !string.IsNullOrWhiteSpace(firstAddress?.Amphur))
+                        Console.WriteLine($"[WARN] Regist district not found: {firstAddress?.Amphur}, Province: {firstAddress?.Province}");
+                    if (registSubDistrictId == null && !string.IsNullOrWhiteSpace(firstAddress?.District))
+                        Console.WriteLine($"[WARN] Regist subdistrict not found: {firstAddress?.District}, District: {firstAddress?.Amphur}");
+                    if (currentProvinceId == null && !string.IsNullOrWhiteSpace(firstAddress?.Province1))
+                        Console.WriteLine($"[WARN] Current province not found: {firstAddress?.Province1}");
+                    if (currentDistrictId == null && !string.IsNullOrWhiteSpace(firstAddress?.Amphur1))
+                        Console.WriteLine($"[WARN] Current district not found: {firstAddress?.Amphur1}, Province: {firstAddress?.Province1}");
+                    if (currentSubDistrictId == null && !string.IsNullOrWhiteSpace(firstAddress?.District1))
+                        Console.WriteLine($"[WARN] Current subdistrict not found: {firstAddress?.District1}, District: {firstAddress?.Amphur1}");
+
                     var placementProfile = new PlacementProfile
                     {
                         Placement = placement,
@@ -3218,15 +3385,15 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
                         Telephone = firstAddress?.Telephone ?? "",
                         MobilePhone = firstAddress?.Mobile ?? "",
                         RegistAddress = registAddress,
-                        RegistProvinceId = provincesCache.FirstOrDefault(x => x.name == firstAddress?.Province)?.Id,
-                        RegistDistrictId = districtsCache.FirstOrDefault(x => x.name == firstAddress?.District)?.Id,
-                        RegistSubDistrictId = subDistrictsCache.FirstOrDefault(x => x.name == firstAddress?.Soi)?.Id,
+                        RegistProvinceId = registProvinceId,
+                        RegistDistrictId = registDistrictId,
+                        RegistSubDistrictId = registSubDistrictId,
                         RegistZipCode = firstAddress?.ZipCode ?? "",
                         RegistSame = false,
                         CurrentAddress = currentAddress,
-                        CurrentProvinceId = provincesCache.FirstOrDefault(x => x.name == firstAddress?.Province1)?.Id,
-                        CurrentDistrictId = districtsCache.FirstOrDefault(x => x.name == firstAddress?.District1)?.Id,
-                        CurrentSubDistrictId = subDistrictsCache.FirstOrDefault(x => x.name == firstAddress?.Soi1)?.Id,
+                        CurrentProvinceId = currentProvinceId,
+                        CurrentDistrictId = currentDistrictId,
+                        CurrentSubDistrictId = currentSubDistrictId,
                         CurrentZipCode = firstAddress?.ZipCode1,
                         Marry = candidate.Marry?.Contains("สมรส") ?? false,
                         OccupationPositionType = "other",