hrms-bangkok/hrms-api-report-v1
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix

Browse source
This commit is contained in:
Bright 2025-06-25 17:19:57 +07:00
parent b69f7e3027
commit f52b750ac0
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Controllers/ExamReportController.cs
View file

@ -350,11 +350,11 @@ namespace BMA.EHR.Report.Service.Controllers
.Include(x => x.PeriodExam) .Include(x => x.PeriodExam)
.Where(x => x.PeriodExam == periodExam) .Where(x => x.PeriodExam == periodExam)
.Where(x => x.Status != "register") .Where(x => x.Status != "register")
.Where(x => x.SeatNumber != null || x.SeatNumber != "") .Where(x => x.ExamIdenNumber != null || x.ExamIdenNumber != "")
.OrderBy(x => x.SeatNumber) .OrderBy(x => x.ExamIdenNumber)
.Select(p => new .Select(p => new
{ {
ExamId = p.SeatNumber == null ? null : (p.SeatNumber.ToThaiNumber()), ExamId = p.ExamIdenNumber == null ? null : (p.ExamIdenNumber.ToThaiNumber()),
FullName = $"{p.PrefixName}{p.FirstName} {p.LastName}", FullName = $"{p.PrefixName}{p.FirstName} {p.LastName}",
PositionName = "", PositionName = "",
ExamName = ExamName =
@ -550,9 +550,9 @@ namespace BMA.EHR.Report.Service.Controllers
var data = candidates.Select((p, idx) => new var data = candidates.Select((p, idx) => new
{ {
ExamId = p.SeatNumber == null ? "-" : (p.SeatNumber.ToThaiNumber()), SeatNumber = p.SeatNumber == null ? "-" : (p.SeatNumber.ToThaiNumber()),
CitizenId = p.CitizenId == null ? "-" : (p.CitizenId.ToThaiNumber()), CitizenId = p.CitizenId == null ? "-" : (p.CitizenId.ToThaiNumber()),
FullName = $"{p.FirstName} {p.LastName}", FullName = $"{p.PrefixName}{p.FirstName} {p.LastName}",
DateOfBirth = p.DateOfBirth == null ? "-" : (p.DateOfBirth.Value.ToThaiShortDate()), DateOfBirth = p.DateOfBirth == null ? "-" : (p.DateOfBirth.Value.ToThaiShortDate()),
ExamName = ($"{p.PeriodExam.Name} ครั้งที่ {p.PeriodExam.Round}/{p.PeriodExam.Year.Value.ToThaiYear()}").ToThaiNumber(), ExamName = ($"{p.PeriodExam.Name} ครั้งที่ {p.PeriodExam.Round}/{p.PeriodExam.Year.Value.ToThaiYear()}").ToThaiNumber(),
Number = p.Number == null ? (idx + 1).ToString().ToThaiNumber() : p.Number.ToThaiNumber(), Number = p.Number == null ? (idx + 1).ToString().ToThaiNumber() : p.Number.ToThaiNumber(),
@ -564,9 +564,10 @@ namespace BMA.EHR.Report.Service.Controllers
SumC = p.PointC == null ? "-" : p.PointC.ToString(), SumC = p.PointC == null ? "-" : p.PointC.ToString(),
SumScore = ((Convert.ToInt32(p.PointB ?? "0") + Convert.ToInt32(p.PointC ?? "0")).ToString()).ToThaiNumber(), SumScore = ((Convert.ToInt32(p.PointB ?? "0") + Convert.ToInt32(p.PointC ?? "0")).ToString()).ToThaiNumber(),
ExamResult = p.Pass, ExamResult = p.Pass,
ExamIdenNumber = p.ExamIdenNumber ExamThaiId = p.ExamIdenNumber == null ? "-" : p.ExamIdenNumber.ToThaiNumber(),
ExamId = p.ExamIdenNumber,
}) })
.OrderBy(x => x.ExamIdenNumber) .OrderBy(x => x.ExamId)
.Where(x => x.ExamResult?.Trim() == "ได้") .Where(x => x.ExamResult?.Trim() == "ได้")
.ToList(); .ToList();