From ba9771f054b53067eb6d278498fe8fd4cbf786e6 Mon Sep 17 00:00:00 2001 From: Bright Date: Thu, 4 Jul 2024 00:28:00 +0700 Subject: [PATCH] =?UTF-8?q?fix=20=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=87?= =?UTF-8?q?=E0=B8=B2=E0=B8=99=E0=B9=80=E0=B8=9A=E0=B8=B4=E0=B9=89=E0=B8=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Controllers/ExamReportController.cs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Controllers/ExamReportController.cs b/Controllers/ExamReportController.cs index 1ec9eb7..62a2176 100644 --- a/Controllers/ExamReportController.cs +++ b/Controllers/ExamReportController.cs @@ -354,7 +354,7 @@ namespace BMA.EHR.Report.Service.Controllers report = (Telerik.Reporting.Report)reportPackager.UnpackageDocument(sourceStream); } - report.DataSource = data; + report.DataSource = data[0]; var table = (Telerik.Reporting.Table)report.Items["detailSection1"].Items["table1"]; table.DataSource = data; 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(), SumC = p.PointC == null ? "-" : p.PointC.ToString(), 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 == "ได้") .ToList(); @@ -529,7 +530,7 @@ namespace BMA.EHR.Report.Service.Controllers report = (Telerik.Reporting.Report)reportPackager.UnpackageDocument(sourceStream); } - report.DataSource = data; + report.DataSource = data[0]; var table = (Telerik.Reporting.Table)report.Items["detailSection1"].Items["table1"]; table.DataSource = data; System.Collections.Hashtable deviceInfo = new System.Collections.Hashtable();