From 1c77bc5628e53fa70fda3a8092bf61334301b677 Mon Sep 17 00:00:00 2001
From: Kittapath <kittapath@frappet.com>
Date: Fri, 13 Oct 2023 00:33:22 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89text=20cms=20?=
 =?UTF-8?q?=E0=B8=8A=E0=B8=B7=E0=B9=88=E0=B8=AD=E0=B8=A3=E0=B8=AD=E0=B8=9A?=
 =?UTF-8?q?=E0=B8=AA=E0=B8=AD=E0=B8=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Services/CMSCandidateService.cs | 3 ++-
 Services/CandidateService.cs    | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Services/CMSCandidateService.cs b/Services/CMSCandidateService.cs
index 3c424b8..4e83341 100644
--- a/Services/CMSCandidateService.cs
+++ b/Services/CMSCandidateService.cs
@@ -1,5 +1,6 @@
 using System.Security.Claims;
 using System.Text.Json;
+using BMA.EHR.Extensions;
 using BMA.EHR.Recurit.Exam.Service.Core;
 using BMA.EHR.Recurit.Exam.Service.Data;
 using BMA.EHR.Recurit.Exam.Service.Models;
@@ -463,7 +464,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
                                 Register_endDate = x.RegisterEndDate == null || x.RegisterEndDate == x.RegisterStartDate ? null : x.RegisterEndDate.Value.ToString("yyyy-MM-dd"),
                                 Payment_startDate = x.PaymentStartDate == null ? null : x.PaymentStartDate.Value.ToString("yyyy-MM-dd"),
                                 Payment_endDate = x.PaymentEndDate == null || x.PaymentEndDate == x.PaymentStartDate ? null : x.PaymentEndDate.Value.ToString("yyyy-MM-dd"),
-                                Title = x.Name,
+                                Title = $"{x.Name} ครั้งที่ {x.Round}/{(x.Year == null ? null : x.Year.Value.ToThaiYear())}",
                                 Year = x.Year,
                                 Round = x.Round,
                                 Detail = x.Detail,
diff --git a/Services/CandidateService.cs b/Services/CandidateService.cs
index a8b27ac..cbe675a 100644
--- a/Services/CandidateService.cs
+++ b/Services/CandidateService.cs
@@ -2061,10 +2061,10 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
                     var body = candidate.FirstName + " " + candidate.LastName + " สถานะการสมัครสอบ: รอชำระค่าสมัครสอบ";
                     if (candidate.Email != null && candidate.Email != "") _mailService.SendMailToUser(subject, body, candidate.Email);
                 }
-                if (candidate.Status == "checkSeat")
+                else if (candidate.Status == "checkSeat")
                 {
                     var subject = "แจ้งผลการสมัครสอบคัดเลือก " + candidate.PeriodExam.Name;
-                    var body = candidate.FirstName + " " + candidate.LastName + " สถานะการสมัครสอบ: ได้รับใบสมัครแล้ว";
+                    var body = candidate.FirstName + " " + candidate.LastName + " สถานะการสมัครสอบ: ได้ชำระค่าสมัครสอบแล้ว";
                     if (candidate.Email != null && candidate.Email != "") _mailService.SendMailToUser(subject, body, candidate.Email);
                     // var num = periodExam.Count() + 1;
                     // candidate.ExamIdenNumber = candidate.PositionExam == null ? num.ToString() : candidate.PositionExam.Code + num;