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

6
Controllers/ExamReportController.cs
View file

@ -477,7 +477,7 @@ namespace BMA.EHR.Report.Service.Controllers
//University = p.Educations.First().University,
//PositionName = p.PositionName,
ExamName = $"{p.PeriodExam.Name} ครั้งที่ {p.PeriodExam.Round.ToString().ToThaiNumber()}/{p.PeriodExam.Year.Value.ToThaiYear().ToString().ToThaiNumber()}",
Number = sr == null ? "๐" : sr.Number,
Number = sr == null || sr.Number == null ? 0 : Convert.ToInt32(sr.Number),
//FullA = sr == null ? "๐" : (sr.FullA.ToString()),
//SumA = sr == null ? "๐" : (sr.SumA.ToString()),
//FullB = sr == null ? "๐" : (sr.FullB.ToString()),
@ -486,7 +486,6 @@ namespace BMA.EHR.Report.Service.Controllers
//SumC = sr == null ? "๐" : (sr.SumC.ToString()),
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)
@ -496,10 +495,11 @@ namespace BMA.EHR.Report.Service.Controllers
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