แก้ค่า report null
This commit is contained in:
parent
7af68ae435
commit
fb217d59d0
1 changed files with 4 additions and 4 deletions
|
|
@ -256,7 +256,7 @@ namespace BMA.EHR.Report.Service.Controllers
|
||||||
FullName = $"{p.Prefix}{p.FirstName} {p.LastName}",
|
FullName = $"{p.Prefix}{p.FirstName} {p.LastName}",
|
||||||
PositionName = p.PositionName,
|
PositionName = p.PositionName,
|
||||||
ExamName =
|
ExamName =
|
||||||
$"{p.RecruitImport.Name} ครั้งที่ {p.RecruitImport.Order.ToString().ToThaiNumber()}/{p.RecruitImport.Year.ToThaiYear().ToString().ToThaiNumber()}",
|
$"ครั้งที่ {(p.RecruitImport != null ? p.RecruitImport.Order.ToString().ToThaiNumber() : "")}/{(p.RecruitImport != null ? p.RecruitImport.Year.ToThaiYear().ToString().ToThaiNumber() : "")}",
|
||||||
}).ToListAsync();
|
}).ToListAsync();
|
||||||
|
|
||||||
if (data.Count == 0) return Error("ไม่พบข้อมูลในระบบ");
|
if (data.Count == 0) return Error("ไม่พบข้อมูลในระบบ");
|
||||||
|
|
@ -337,7 +337,7 @@ namespace BMA.EHR.Report.Service.Controllers
|
||||||
? p.Payments.Select(x => x.RefNo1).FirstOrDefault().ToThaiNumber()
|
? p.Payments.Select(x => x.RefNo1).FirstOrDefault().ToThaiNumber()
|
||||||
: "",
|
: "",
|
||||||
ExamName =
|
ExamName =
|
||||||
$"ครั้งที่ {p.RecruitImport.Order.ToString().ToThaiNumber()}/{p.RecruitImport.Year.ToThaiYear().ToString().ToThaiNumber()}",
|
$"ครั้งที่ {(p.RecruitImport != null ? p.RecruitImport.Order.ToString().ToThaiNumber() : "")}/{(p.RecruitImport != null ? p.RecruitImport.Year.ToThaiYear().ToString().ToThaiNumber() : "")}",
|
||||||
}).ToListAsync();
|
}).ToListAsync();
|
||||||
|
|
||||||
if (data.Count == 0) return Error("ไม่พบข้อมูลในระบบ");
|
if (data.Count == 0) return Error("ไม่พบข้อมูลในระบบ");
|
||||||
|
|
@ -434,8 +434,8 @@ namespace BMA.EHR.Report.Service.Controllers
|
||||||
//SumB = sr.SumB == null ? 0.0 : sr.SumB,
|
//SumB = sr.SumB == null ? 0.0 : sr.SumB,
|
||||||
//FullC = sr.FullC == null ? 0.0 : sr.FullC,
|
//FullC = sr.FullC == null ? 0.0 : sr.FullC,
|
||||||
//SumC = sr.SumC == null ? 0.0 : sr.SumC,
|
//SumC = sr.SumC == null ? 0.0 : sr.SumC,
|
||||||
SumScore = sr == null
|
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 +*/ (sr.SumC > 0 ? sr.SumC : 0)).ToString()).ToThaiNumber(),
|
||||||
})
|
})
|
||||||
.OrderBy(x => x.Number)
|
.OrderBy(x => x.Number)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue