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 2024-07-04 00:28:00 +07:00
parent 5725cdbb95
commit ba9771f054
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Controllers/ExamReportController.cs
View file

@ -354,7 +354,7 @@ namespace BMA.EHR.Report.Service.Controllers
report = (Telerik.Reporting.Report)reportPackager.UnpackageDocument(sourceStream); report = (Telerik.Reporting.Report)reportPackager.UnpackageDocument(sourceStream);
} }
report.DataSource = data; report.DataSource = data[0];
var table = (Telerik.Reporting.Table)report.Items["detailSection1"].Items["table1"]; var table = (Telerik.Reporting.Table)report.Items["detailSection1"].Items["table1"];
table.DataSource = data; table.DataSource = data;
System.Collections.Hashtable deviceInfo = new System.Collections.Hashtable(); System.Collections.Hashtable deviceInfo = new System.Collections.Hashtable();
@ -512,9 +512,10 @@ namespace BMA.EHR.Report.Service.Controllers
FullC = p.PointTotalC == null ? "-" : p.PointTotalC.ToString(), FullC = p.PointTotalC == null ? "-" : p.PointTotalC.ToString(),
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
}) })
.OrderBy(x => x.Number) .OrderBy(x => x.ExamIdenNumber)
.Where(x => x.ExamResult == "ได้") .Where(x => x.ExamResult == "ได้")
.ToList(); .ToList();
@ -529,7 +530,7 @@ namespace BMA.EHR.Report.Service.Controllers
report = (Telerik.Reporting.Report)reportPackager.UnpackageDocument(sourceStream); report = (Telerik.Reporting.Report)reportPackager.UnpackageDocument(sourceStream);
} }
report.DataSource = data; report.DataSource = data[0];
var table = (Telerik.Reporting.Table)report.Items["detailSection1"].Items["table1"]; var table = (Telerik.Reporting.Table)report.Items["detailSection1"].Items["table1"];
table.DataSource = data; table.DataSource = data;
System.Collections.Hashtable deviceInfo = new System.Collections.Hashtable(); System.Collections.Hashtable deviceInfo = new System.Collections.Hashtable();