diff --git a/Services/PeriodExamService.cs b/Services/PeriodExamService.cs index 2d417e5..f4ffe78 100644 --- a/Services/PeriodExamService.cs +++ b/Services/PeriodExamService.cs @@ -1334,8 +1334,8 @@ 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; + 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 + " สถานะการสมัครสอบ: สอบคัดเลือกสำเร็จ
" + "ผลการสอบของท่าน คือ " + candidate.Pass; // if (candidate.Email != null && candidate.Email != "") _mailService.SendMailToUser(subject, body, candidate.Email); @@ -1569,7 +1569,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Services { _data.Add(new { - Number = item.Number != null ? item.Number.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() : "-", @@ -1597,9 +1597,9 @@ namespace BMA.EHR.Recurit.Exam.Service.Services 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(), + 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() : "-" + ExamReason = item.ExamReason != null ? item.ExamReason.ToString() : "" }); } } @@ -1607,7 +1607,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Services { _data.Add(new { - Number = "-", + Number = "", ExamIdenNumber = "-", CitizenId = "-", SeatNumber = "-", @@ -1635,9 +1635,9 @@ namespace BMA.EHR.Recurit.Exam.Service.Services Pass = "-", PaymentStatus = "-", - PaymentDate = "-", + PaymentDate = "", RegisterDate = "-", - ExamReason = "-" + ExamReason = "" }); }