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
@@ -487,6 +488,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers
                     Note = req.Note,
                     AnnouncementDate = req.AnnouncementDate,
                     CheckDisability = true,
+                    OrganizationId = req.rootDnaId,
                     CreatedAt = DateTime.Now,
                     CreatedUserId = UserId ?? "",
                     CreatedFullName = FullName ?? "System Administrator",
@@ -499,7 +501,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();
@@ -668,8 +670,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)
@@ -1365,7 +1375,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers
                                 District = workSheet?.Cells[row, 54]?.GetValue<string>() ?? "",
                                 Amphur = workSheet?.Cells[row, 55]?.GetValue<string>() ?? "",
                                 Province = workSheet?.Cells[row, 56]?.GetValue<string>() ?? "",
-                                ZipCode = workSheet?.Cells[row, 57]?.GetValue<string>() ?? "",
+                                ZipCode = (workSheet?.Cells[row, 57]?.GetValue<string>() ?? "").Trim(),
                                 Telephone = workSheet?.Cells[row, 58]?.GetValue<string>() ?? "",
                                 Mobile = "",
                                 Address1 = $"{(workSheet?.Cells[row, 61]?.GetValue<string>() ?? "")} {(workSheet?.Cells[row, 62]?.GetValue<string>() ?? "")}",
@@ -1375,7 +1385,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers
                                 District1 = workSheet?.Cells[row, 66]?.GetValue<string>() ?? "",
                                 Amphur1 = workSheet?.Cells[row, 67]?.GetValue<string>() ?? "",
                                 Province1 = workSheet?.Cells[row, 68]?.GetValue<string>() ?? "",
-                                ZipCode1 = workSheet?.Cells[row, 69]?.GetValue<string>() ?? "",
+                                ZipCode1 = (workSheet?.Cells[row, 69]?.GetValue<string>() ?? "").Trim(),
                                 CreatedAt = DateTime.Now,
                                 CreatedUserId = UserId ?? "",
                                 CreatedFullName = FullName ?? "System Administrator",
@@ -1399,7 +1409,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers
                                 TermBranch = workSheet?.Cells[row, 113]?.GetValue<string>() ?? "",
                                 TellerId = workSheet?.Cells[row, 114]?.GetValue<string>() ?? "",
                                 CreditDebit = workSheet?.Cells[row, 115]?.GetValue<string>() ?? "",
-                                PaymentType = workSheet?.Cells[row, 116]?.GetValue<string>(),
+                                PaymentType = workSheet?.Cells[row, 116]?.GetValue<string>() ?? "",
                                 ChequeNo = workSheet?.Cells[row, 117]?.GetValue<string>() ?? "",
                                 Amount = (decimal)workSheet?.Cells[row, 118]?.GetValue<decimal>(),
                                 ChqueBankCode = workSheet?.Cells[row, 119]?.GetValue<string>() ?? "",
@@ -1604,11 +1614,6 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers
 
                             r.ExamId = workSheet?.Cells[row, 2]?.GetValue<string>();
 
-                            //var recruit = await _context.Disables.AsQueryable()
-                            //                        .Include(x => x.PeriodExam)
-                            //                        .Where(x => x.PeriodExam == rec_import && x.ExamId == r.ExamId)
-                            //                        .FirstOrDefaultAsync();
-
                             // ใช้ dictionary lookup แทน query DB ทีละรอบ
                             if (!string.IsNullOrEmpty(r.ExamId) && recruitsDict.TryGetValue(r.ExamId, out var recruit))
                             {
@@ -1633,26 +1638,19 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers
                                 r.FullScore = 300;
                                 r.TotalScore = string.IsNullOrWhiteSpace(workSheet?.Cells[row, 13]?.GetValue<string>()) ? 0.00 : Math.Round(workSheet.Cells[row, 13].GetValue<double>(), 2);
 
-                                if (workSheet?.Cells[row, 7]?.GetValue<string>() == "ขาดสอบ")
-                                {
-                                    r.ExamStatus = "ขส.";
-                                }
-                                else if (workSheet?.Cells[row, 14]?.GetValue<string>() == "ได้")
-                                {
-                                    r.ExamStatus = "ผ่าน";
-                                }
-                                else if (workSheet?.Cells[row, 14]?.GetValue<string>() == "ตก")
-                                {
-                                    r.ExamStatus = "ไม่ผ่าน";
-                                }
-                                else
-                                {
-                                    r.ExamStatus = "-";
-                                }
+                                var examStatusCol7 = workSheet?.Cells[row, 7]?.GetValue<string>()?.Trim();
+                                var examStatusCol14 = workSheet?.Cells[row, 14]?.GetValue<string>()?.Trim();
+                                r.ExamStatus =
+                                    examStatusCol7 == "ขาดสอบ" ? "ขส." :
+                                    examStatusCol14 == "ได้" ? "ผ่าน" :
+                                    examStatusCol14 == "ตก" ? "ไม่ผ่าน" : "-";
 
                                 r.RemarkScore = string.IsNullOrWhiteSpace(workSheet?.Cells[row, 15]?.GetValue<string>()) ? string.Empty : workSheet?.Cells[row, 15]?.GetValue<string>();
 
-                                r.ExamAttribute = (workSheet?.Cells[row, 16]?.GetValue<string>()?.Trim() == "ผ่าน") ? "มีคุณสมบัติ" : "ไม่มีคุณสมบัติ";
+                                var examAttr = workSheet?.Cells[row, 16]?.GetValue<string>()?.Trim();
+                                r.ExamAttribute = 
+                                    examAttr == "ผ่าน" ? "มีคุณสมบัติ" : 
+                                    examAttr == "ไม่ผ่าน" ? "ไม่มีคุณสมบัติ" : "";
 
                                 r.Major = workSheet.Name;
 
@@ -2098,11 +2096,11 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers
                         //    ? _disableService.CheckValidCertificate(x.disable.Certificates.First().IssueDate, 5)
                         //        ? "มีคุณสมบัติ" : "ไม่มีคุณสมบัติ"
                         //    : "ไม่มีคุณสมบัติ",
-                        examAttribute = x.score == null 
-                            ? "ไม่มีคุณสมบัติ" 
-                            : string.IsNullOrEmpty(x.score.ExamAttribute) 
-                                ? "ไม่มีคุณสมบัติ" 
-                                : x.score.ExamAttribute,
+
+                        examAttribute = x.score != null && !string.IsNullOrEmpty(x.score.ExamAttribute) &&
+                             (x.score.ExamAttribute == "มีคุณสมบัติ" || x.score.ExamAttribute == "ไม่มีคุณสมบัติ")
+                             ? x.score.ExamAttribute : "",
+
                         remark = x.disable.Remark,
                         isSpecial = x.disable.Isspecial == "Y" ? x.disable.Isspecial : "",
                         applyDate = x.disable.ApplyDate.HasValue && x.disable.ApplyDate.Value != DateTime.MinValue
@@ -2190,90 +2188,177 @@ 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 { /*rc.PeriodExam.Year,*/ rc.ExamId },
-                                            sc => new { /*sc.ScoreImport.Year,*/ 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 = p.Certificates.Count > 0 ?
-                                                //     _disableService.CheckValidCertificate(p.Certificates.First().IssueDate, 5)
-                                                //         ? "มีคุณสมบัติ"
-                                                //         : "ไม่มีคุณสมบัติ"
-                                                //     : "ไม่มีคุณสมบัติ",
-                                                ExamAttribute = sr == null 
-                                                    ? "ไม่มีคุณสมบัติ" 
-                                                    : string.IsNullOrEmpty(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();
 
+                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 = 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 = disable.Gendor,
+                    Degree = disable.Educations.First().Degree,
+                    Major = disable.Educations.First().Major,
+                    CertificateNo = disable.Certificates.Count > 0
+                         ? disable.Certificates.First().CertificateNo ?? ""
+                         : "",
+                    CertificateIssueDate = disable.Certificates.Count > 0
+                         ? disable.Certificates.First().IssueDate != DateTime.MinValue
+                             ? disable.Certificates.First().IssueDate.ToThaiShortDate()
+                             : ""
+                         : "",
+                    ExamResult = score == null ? "" : score.ExamStatus,
+
+                    ExamAttribute = score != null && !string.IsNullOrEmpty(score.ExamAttribute) &&
+                        (score.ExamAttribute == "มีคุณสมบัติ" || score.ExamAttribute == "ไม่มีคุณสมบัติ")
+                        ? score.ExamAttribute : "",
+
+                    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),
+                    ScoreExpire = disable.PeriodExam.AnnouncementDate == null
+                        ? ""
+                        : disable.PeriodExam.AnnouncementDate != DateTime.MinValue
+                            ? disable.PeriodExam.AnnouncementDate.Value.AddYears(2).ToThaiShortDate()
+                            : "",
+                    typeTest = disable.typeTest,
+                    ScoreResult = score == null ? null : new
+                    {
+                        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 = disable.Documents.Select(a => new
+                    {
+                        FileName = a.DocumentFile.FileName,
+                        DocumentId = a.DocumentFile.Id
+                    })
+                };
+
                 return Success(data);
             }
             catch (Exception ex)
@@ -2463,7 +2548,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers
         }
 
         /// <summary>
-        /// โอนคนสรรหาไปบรรจุ
+        /// โอนคนสรรหาไปบรรจุ (คัดเลือกอื่นๆ)
         /// </summary>
         /// <param name="examId">รหัสรอบสมัคร</param>
         /// <returns></returns>
@@ -2508,49 +2593,106 @@ 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() : "",
+                    Expire = disable.PeriodExam.AnnouncementDate == null
+                        ? ""
+                        : disable.PeriodExam.AnnouncementDate != DateTime.MinValue
+                            ? disable.PeriodExam.AnnouncementDate.Value.AddYears(2).ToThaiShortDate().ToString().ToThaiNumber()
+                            : "",
+                };
+
                 var result = new
                 {
                     template = "recruit-exam",

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

@@ -1,9 +1,8 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Configuration;
 using Nest;
-using Newtonsoft.Json;
 using System.Diagnostics;
-using System.Net.Http.Headers;
+using System.IdentityModel.Tokens.Jwt;
 using System.Security.Claims;
 using System.Text.Encodings.Web;
 using System.Text.Json;
@@ -19,7 +18,6 @@ namespace BMA.EHR.Recurit.Exam.Service.Core
         private string Uri = "";
         private string IndexFormat = "";
         private string SystemName = "";
-        private string APIKey = "";
 
         public RequestLoggingMiddleware(RequestDelegate next, IConfiguration configuration)
         {
@@ -32,65 +30,48 @@ namespace BMA.EHR.Recurit.Exam.Service.Core
             SystemName = "recruiting";
         }
 
-        protected async Task<string> GetExternalAPIAsync(string apiPath, string accessToken, string apiKey)
+        /// <summary>
+        /// แกะ JWT token เพื่อดึง claims ต่างๆ
+        /// </summary>
+        private JwtSecurityToken? ParseToken(string token)
         {
             try
             {
-                using (var client = new HttpClient())
-                {
-                    // Set timeout to 30 seconds instead of default 100 seconds
-                    client.Timeout = TimeSpan.FromSeconds(30);
-                    client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", accessToken.Replace("Bearer ", ""));
-                    client.DefaultRequestHeaders.Add("api_key", apiKey);
-
-                    using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(30));
-                    var _res = await client.GetAsync(apiPath, cts.Token);
-                    if (_res.IsSuccessStatusCode)
-                    {
-                        var _result = await _res.Content.ReadAsStringAsync();
-                        return _result;
-                    }
-                    return string.Empty;
-                }
+                var tokenHandler = new JwtSecurityTokenHandler();
+                var jwtToken = tokenHandler.ReadJwtToken(token.Replace("Bearer ", ""));
+                return jwtToken;
             }
-            catch (TaskCanceledException)
+            catch
             {
-                // Log timeout but don't throw - return empty result instead
-                Console.WriteLine($"API call timed out: {apiPath}");
-                return string.Empty;
-            }
-            catch (Exception ex)
-            {
-                // Log other exceptions but don't throw - return empty result instead  
-                Console.WriteLine($"API call failed: {apiPath}, Error: {ex.Message}");
-                return string.Empty;
+                return null;
             }
         }
 
-        public async Task<GetProfileByKeycloakIdLocal?> GetProfileByKeycloakIdAsync(Guid keycloakId, string? accessToken)
+        /// <summary>
+        /// ดึงค่า claim จาก token โดยลองชื่อหลายแบบ
+        /// </summary>
+        private string? GetClaimValue(JwtSecurityToken? token, params string[] claimNames)
         {
-            try
-            {
-                //var apiPath = $"{_configuration["API"]}/org/dotnet/keycloak/{keycloakId}";
-                var apiPath = $"{_configuration["API"]}/org/dotnet/user-logs/{keycloakId}";
-                var apiKey = _configuration["API_KEY"] ?? "";
+            if (token == null) return null;
 
-                var apiResult = await GetExternalAPIAsync(apiPath, accessToken ?? "", apiKey);
-                if (!string.IsNullOrEmpty(apiResult))
-                {
-                    var raw = JsonConvert.DeserializeObject<GetProfileByKeycloakIdResultLocal>(apiResult);
-                    if (raw != null)
-                        return raw.Result;
-                }
-
-                return null;
-            }
-            catch (Exception ex)
+            foreach (var name in claimNames)
             {
-                // Log exception but don't throw - return null instead
-                Console.WriteLine($"GetProfileByKeycloakIdAsync failed for {keycloakId}: {ex.Message}");
-                return null;
+                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)
@@ -155,19 +136,22 @@ namespace BMA.EHR.Recurit.Exam.Service.Core
                 // เปลี่ยน stream ของ Response เพื่อให้สามารถอ่านได้
                 context.Response.Body = memoryStream;
 
-
-
                 var keycloakId = context.User?.FindFirst(ClaimTypes.NameIdentifier)?.Value ?? Guid.Empty.ToString("D");
-                var token = context.Request.Headers["Authorization"];
+                var tokenHeader = context.Request.Headers["Authorization"].ToString();
 
-                var pf = await GetProfileByKeycloakIdAsync(Guid.Parse(keycloakId), token);
-                var _userFullname = string.Empty;
-                var _userName = string.Empty;
-                if (keycloakId != "00000000-0000-0000-0000-000000000000" && pf == null)
-                {
-                    _userFullname = context.User?.FindFirst("name")?.Value;
-                    _userName = context.User?.FindFirst("preferred_username")?.Value;
-                }
+                // แกะ JWT token เพื่อดึง claims ต่างๆ
+                var jwtToken = ParseToken(tokenHeader);
+
+                // ดึงข้อมูลจาก 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 อื่น ๆ
 
@@ -254,8 +238,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Core
                 {
                     logType = logType,
                     ip = context.Connection.RemoteIpAddress?.ToString(),
-                    //rootId = pf == null ? null : pf.RootId,
-                    rootId = pf == null ? null : pf.RootDnaId,
+                    rootId = orgRootDnaId?.ToString("D"),
                     systemName = SystemName,
                     startTimeStamp = startTime.ToString("o"),
                     endTimeStamp = endTime.ToString("o"),
@@ -269,8 +252,8 @@ namespace BMA.EHR.Recurit.Exam.Service.Core
                     output = responseBodyJson,
 
                     userId = keycloakId,
-                    userName = pf != null ? $"{pf?.Prefix ?? ""}{pf?.FirstName ?? ""} {pf?.LastName ?? ""}" : _userFullname ?? "",
-                    user = pf != null ? pf?.CitizenId ?? "" : _userName ?? ""
+                    userName = $"{prefix ?? ""}{firstName ?? ""} {lastName ?? ""}".Trim(),
+                    user = preferredUsername ?? ""
 
                 };
 
@@ -295,47 +278,4 @@ namespace BMA.EHR.Recurit.Exam.Service.Core
             return body;
         }
     }
-
-    public class GetProfileByKeycloakIdLocal
-    {
-        public Guid Id { get; set; }
-
-        public string? Prefix { get; set; }
-        public string? FirstName { get; set; }
-        public string? LastName { get; set; }
-        public string? CitizenId { get; set; }
-
-        public string? Root { get; set; }
-        public string? Child1 { get; set; }
-        public string? Child2 { get; set; }
-        public string? Child3 { get; set; }
-        public string? Child4 { get; set; }
-        public Guid? RootId { get; set; }
-        public Guid? Child1Id { get; set; }
-        public Guid? Child2Id { get; set; }
-        public Guid? Child3Id { get; set; }
-        public Guid? Child4Id { get; set; }
-        public Guid? RootDnaId { get; set; }
-        public Guid? Child1DnaId { get; set; }
-        public Guid? Child2DnaId { get; set; }
-        public Guid? Child3DnaId { get; set; }
-        public Guid? Child4DnaId { get; set; }
-        public double? Amount { get; set; }
-        public double? PositionSalaryAmount { get; set; }
-        public string? Commander { get; set; }
-
-        public Guid? CommanderId { get; set; }
-
-        public Guid? CommanderKeycloak { get; set; }
-
-    }
-
-    public class GetProfileByKeycloakIdResultLocal
-    {
-        public string Message { get; set; } = string.Empty;
-
-        public int Status { get; set; } = -1;
-
-        public GetProfileByKeycloakIdLocal? Result { get; set; }
-    }
 }

Data/Migrations/ApplicationDbContextModelSnapshot.cs

@@ -1296,13 +1296,13 @@ namespace BMA.EHR.Recurit.Exam.Service.Data.Migrations
 
                     b.Property<string>("ZipCode")
                         .IsRequired()
-                        .HasMaxLength(5)
-                        .HasColumnType("varchar(5)");
+                        .HasMaxLength(10)
+                        .HasColumnType("varchar(10)");
 
                     b.Property<string>("ZipCode1")
                         .IsRequired()
-                        .HasMaxLength(5)
-                        .HasColumnType("varchar(5)");
+                        .HasMaxLength(10)
+                        .HasColumnType("varchar(10)");
 
                     b.HasKey("Id");
 

Migrations/20260324084215_update_DisableAddress.cs

@@ -0,0 +1,66 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace BMA.EHR.Recurit.Exam.Service.Migrations
+{
+    /// <inheritdoc />
+    public partial class update_DisableAddress : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<string>(
+                name: "ZipCode1",
+                table: "DisableAddresses",
+                type: "varchar(10)",
+                maxLength: 10,
+                nullable: false,
+                oldClrType: typeof(string),
+                oldType: "varchar(5)",
+                oldMaxLength: 5)
+                .Annotation("MySql:CharSet", "utf8mb4")
+                .OldAnnotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "ZipCode",
+                table: "DisableAddresses",
+                type: "varchar(10)",
+                maxLength: 10,
+                nullable: false,
+                oldClrType: typeof(string),
+                oldType: "varchar(5)",
+                oldMaxLength: 5)
+                .Annotation("MySql:CharSet", "utf8mb4")
+                .OldAnnotation("MySql:CharSet", "utf8mb4");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<string>(
+                name: "ZipCode1",
+                table: "DisableAddresses",
+                type: "varchar(5)",
+                maxLength: 5,
+                nullable: false,
+                oldClrType: typeof(string),
+                oldType: "varchar(10)",
+                oldMaxLength: 10)
+                .Annotation("MySql:CharSet", "utf8mb4")
+                .OldAnnotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "ZipCode",
+                table: "DisableAddresses",
+                type: "varchar(5)",
+                maxLength: 5,
+                nullable: false,
+                oldClrType: typeof(string),
+                oldType: "varchar(10)",
+                oldMaxLength: 10)
+                .Annotation("MySql:CharSet", "utf8mb4")
+                .OldAnnotation("MySql:CharSet", "utf8mb4");
+        }
+    }
+}

Models/Disable/DisableAddress.cs

@@ -25,7 +25,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Models.Disables
         [MaxLength(200)]
         public string Province { get; set; }//
 
-        [MaxLength(5)]
+        [MaxLength(10)]
         public string ZipCode { get; set; }//
 
         [MaxLength(200)]
@@ -55,7 +55,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Models.Disables
         [MaxLength(200)]
         public string Province1 { get; set; }//
 
-        [MaxLength(5)]
+        [MaxLength(10)]
         public string ZipCode1 { get; set; }//
 
         public Disable Disable { get; set; }

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/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

@@ -82,5 +82,10 @@ namespace BMA.EHR.Recurit.Exam.Service.Request.Disables
         /// วันที่ประกาศผลสอบ
         /// </summary>
         public DateTime AnnouncementDate { get; set; }
+
+        /// <summary>
+        /// รหัส DNA หน่วยงาน
+        /// </summary>
+        public Guid? rootDnaId { 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; }
+
     }
 }

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)
@@ -2651,7 +2663,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

@@ -1232,30 +1232,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;
@@ -1309,30 +1336,30 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
                         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);
+                        // 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;
@@ -1625,6 +1652,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()
@@ -2860,7 +2982,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 +3177,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,7 +3195,7 @@ 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),
                     CreatedAt = DateTime.Now,
@@ -3197,6 +3319,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 +3362,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",