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

Correct Sort Order

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2023-05-23 11:37:41 +07:00
parent 58b890d6a5
commit 4c1c3f5da8
2 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

42
Controllers/ExamReportController.cs
View file

@ -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 == "ผ่าน")