From 126083cc482067213533021ba58a1864d8bfbb09 Mon Sep 17 00:00:00 2001
From: Kittapath <kittapath@frappet.com>
Date: Thu, 17 Aug 2023 06:22:10 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=8A=E0=B8=B7?=
 =?UTF-8?q?=E0=B9=88=E0=B8=AD=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B9=80=E0=B8=A0?=
 =?UTF-8?q?=E0=B8=97=E0=B8=9A=E0=B8=A3=E0=B8=A3=E0=B8=88=E0=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Controllers/DisableController.cs | 2 +-
 Services/PeriodExamService.cs    | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Controllers/DisableController.cs b/Controllers/DisableController.cs
index 470eb85..bbf456e 100644
--- a/Controllers/DisableController.cs
+++ b/Controllers/DisableController.cs
@@ -1688,7 +1688,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Controllers
                                                 Score = sr == null ? 0 : sr.SumA + sr.SumB + sr.SumC,
                                                 Number = sr == null ? "" : sr.Number,
                                                 CitizenId = p.CitizenId,
-                                                ExamCount = 0,
+                                                ExamCount = GetExamCountTe(p.CitizenId),
                                                 ScoreExpire = p.PeriodExam.AnnouncementDate == null ? "" : p.PeriodExam.AnnouncementDate.Value.AddYears(2).ToThaiShortDate(),
                                                 ScoreResult = sr == null ? null : new
                                                 {
diff --git a/Services/PeriodExamService.cs b/Services/PeriodExamService.cs
index 8e7e5ab..f444de6 100644
--- a/Services/PeriodExamService.cs
+++ b/Services/PeriodExamService.cs
@@ -1855,7 +1855,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
                 Round = periodExam.Round == null ? "" : periodExam.Round.ToString(),
                 Year = (int)(periodExam.Year == null ? 0 : periodExam.Year),
                 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("คัดเลือก")),
+                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),
                 CreatedAt = DateTime.Now,
@@ -1866,7 +1866,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
                 LastUpdateFullName = FullName ?? "",
             };
             await _contextMetadata.Placements.AddAsync(placement);
-            foreach (var candidate in periodExam.Candidate)
+            foreach (var candidate in periodExam.Candidate.Where(x => x.Status == "done"))
             {
                 var placementProfile = new PlacementProfile
                 {
@@ -1984,7 +1984,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
                 Round = periodExam.Round == null ? "" : periodExam.Round.ToString(),
                 Year = (int)(periodExam.Year == null ? 0 : periodExam.Year),
                 Number = await _context.Disables.AsQueryable().Where(x => x.PeriodExam == periodExam).CountAsync(),
-                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("ผู้พิการ")),
+                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),
                 CreatedAt = DateTime.Now,
@@ -2017,7 +2017,10 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
                 var disableScore = await _context.DisableScores.AsQueryable()
                                         .Where(x => x.ScoreImport == scoreImport)
                                         .Where(x => x.ExamId == candidate.ExamId)
+                                        .Where(x => x.ExamStatus == "ผ่าน")
                                         .FirstOrDefaultAsync(x => x.ExamId == candidate.ExamId && x.ScoreImport == scoreImport);
+                if (disableScore == null)
+                    continue;
                 var placementProfile = new PlacementProfile
                 {
                     Placement = placement,