diff --git a/Controllers/ExamReportController.cs b/Controllers/ExamReportController.cs index 65ef477..8c69929 100644 --- a/Controllers/ExamReportController.cs +++ b/Controllers/ExamReportController.cs @@ -392,8 +392,8 @@ namespace BMA.EHR.Report.Service.Controllers ExamName = $"{p.PeriodExam.Name} ครั้งที่ {p.PeriodExam.Round}/{p.PeriodExam.Year.Value.ToThaiYear()}", - Number = sr == null ? "" : sr.Number, - + Number = sr == null ? 99999 : Convert.ToInt32(sr.Number), + FullA = sr == null ? 0 : sr.FullA, @@ -456,29 +456,29 @@ namespace BMA.EHR.Report.Service.Controllers var data = await _context.Candidates.AsQueryable() .Include(x => x.PeriodExam) .ThenInclude(x => x.ScoreImport) - + .Select(p => new - { - Id = p.PeriodExam.Id, - ExamId = p.SeatNumber, - CitizenId = p.CitizenId, - FullName = $"{p.FirstName} {p.LastName}", - DateOfBirth = p.DateOfBirth.Value.ToThaiShortDate(), - - ExamName = $"{p.PeriodExam.Name} ครั้งที่ {p.PeriodExam.Round}/{p.PeriodExam.Year.Value.ToThaiYear()}", + { + Id = p.PeriodExam.Id, + ExamId = p.SeatNumber, + CitizenId = p.CitizenId, + FullName = $"{p.FirstName} {p.LastName}", + DateOfBirth = p.DateOfBirth.Value.ToThaiShortDate(), - Number = p.Number, + ExamName = $"{p.PeriodExam.Name} ครั้งที่ {p.PeriodExam.Round}/{p.PeriodExam.Year.Value.ToThaiYear()}", - FullA = 0, - SumA =0, - FullB = p.PointTotalB, - SumB = p.PointB, - FullC = p.PointTotalC, - SumC = p.PointC, - SumScore = p.PointB + p.PointC, - ExamResult = p.Pass + Number = p.Number == null ? 99999 : Convert.ToInt32(p.Number), - }) + FullA = 0, + SumA = 0, + FullB = p.PointTotalB, + SumB = p.PointB, + FullC = p.PointTotalC, + SumC = p.PointC, + SumScore = p.PointB + p.PointC, + ExamResult = p.Pass + + }) .OrderBy(x => x.Number) .Where(x => x.Id == id) .Where(x => x.ExamResult == "ผ่าน") diff --git a/Controllers/RecruitReportController.cs b/Controllers/RecruitReportController.cs index 497ceb4..b5a4a44 100644 --- a/Controllers/RecruitReportController.cs +++ b/Controllers/RecruitReportController.cs @@ -310,7 +310,7 @@ namespace BMA.EHR.Report.Service.Controllers ExamName = $"{p.RecruitImport.Name} ครั้งที่ {p.RecruitImport.Order}/{p.RecruitImport.Year.ToThaiYear()}", - Number = sr == null ? "" : sr.Number, + Number = sr == null ? 99999 : Convert.ToInt32(sr.Number), ExamCount = _recruitService.GetExamCount(p.CitizenId), ScoreExpire = p.RecruitImport.AnnouncementDate == null ? "" : p.RecruitImport.AnnouncementDate.Value.AddYears(2).ToThaiShortDate(),