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

Merge branch 'develop' of github.com:Frappet/BMA-EHR-Report-Service into develop

Browse source
This commit is contained in:
kittapath-Jool 2025-09-15 16:03:36 +07:00
commit 9d5145806f
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Controllers/RecruitReportController.cs
View file

@ -402,7 +402,7 @@ namespace BMA.EHR.Report.Service.Controllers
{
try
{
var data = await _context.Recruits.AsQueryable()
var data = await _context.Recruits.AsQueryable()
.Include(x => x.RecruitImport)
.ThenInclude(x => x.ScoreImport)
.Include(x => x.Documents)
@ -435,8 +435,7 @@ namespace BMA.EHR.Report.Service.Controllers
? ""
: $"{p.RecruitImport.Name} ครั้งที่ {p.RecruitImport.Order.ToString().ToThaiNumber()}/{p.RecruitImport.Year.ToThaiYear().ToString().ToThaiNumber()}",
Number = sr.Number == null ? "๐" : sr.Number,
Number = sr == null || sr.Number == null ? 0 : Convert.ToInt32(sr.Number),
//ExamCount = _recruitService.GetExamCount(p.CitizenId),
//ScoreExpire = p.RecruitImport.AnnouncementDate == null ? "" : p.RecruitImport.AnnouncementDate.Value.AddYears(2).ToThaiShortDate(),
@ -449,19 +448,20 @@ namespace BMA.EHR.Report.Service.Controllers
//SumC = sr.SumC == null ? 0.0 : sr.SumC,
SumScore = sr == null
? "๐"
: (((sr.SumA > 0 ? sr.SumA : 0) + /*sr.SumB +*/ (sr.SumC > 0 ? sr.SumC : 0)).ToString()).ToThaiNumber(),
: (((sr.SumA > 0 ? sr.SumA : 0) + (sr.SumB > 0 ? sr.SumB : 0) + (sr.SumC > 0 ? sr.SumC : 0)).ToString()).ToThaiNumber(),
})
.OrderBy(x => x.Number)
.Where(x => x.Id == id)
.Where(x => x.ExamResult == "ผ่าน")
.ToListAsync();
if (data.Count == 0) return Error("ไม่พบข้อมูลในระบบ");
if (data.Count == 0)
return Error("ไม่พบข้อมูลในระบบ");
var data_ = data.Select(x => new
{
x.ExamName,
Number = x.Number.ToThaiNumber(),
Number = x.Number.ToString().ToThaiNumber(),
x.ExamId,
x.FullName,
x.SumScore