From 8f63aa77f7f170b20f740ccdf98ba923abe1f9eb Mon Sep 17 00:00:00 2001 From: lsm Date: Thu, 2 Jan 2025 14:11:24 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BD=93=E6=A3=80=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E6=8F=92=E5=85=A5=E7=AC=AC=E4=B8=89=E6=8A=A5=E5=91=8A=E5=9B=BE?= =?UTF-8?q?=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PEIS/Utils/ReportHelper.cs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/PEIS/Utils/ReportHelper.cs b/PEIS/Utils/ReportHelper.cs index 7806c0c..0b54447 100644 --- a/PEIS/Utils/ReportHelper.cs +++ b/PEIS/Utils/ReportHelper.cs @@ -221,6 +221,7 @@ namespace PEIS.Utils var lstLis = new ReportModel().GetLisResult(eid); var lstPacs = new ReportModel().GetPacsResult(eid); var lstPacsPhotos = new ReportModel().GetPacsPhoto(eid); + var lstExts = new ReportModel().GetReportExt(eid); // 登记信息 rpt.SetParameterValue("PatientName", patient.Name); @@ -231,9 +232,9 @@ namespace PEIS.Utils rpt.SetParameterValue("ExamID", patient.ID.ToString()); rpt.SetParameterValue("ExamDate", patient.SignTime?.ToShortDateString()); rpt.SetParameterValue("Marriage", patient.Marriage); - rpt.SetParameterValue("TeamName", patient.OrgName); + rpt.SetParameterValue("TeamName", string.IsNullOrEmpty(patient.OrgName) ? "" : patient.OrgName); rpt.SetParameterValue("GroupName", patient.GroupName); - rpt.SetParameterValue("Company", patient.Company); + rpt.SetParameterValue("Company", string.IsNullOrEmpty(patient.Company) ? "" : patient.Company); rpt.SetParameterValue("ExamType", patient.Type); rpt.SetParameterValue("Address", patient.Address1); rpt.SetParameterValue("Tel", patient.Tel1); @@ -272,8 +273,9 @@ namespace PEIS.Utils SetDataSource(ref rpt, lstPacs, "P", "PACS"); //LIS SetDataSource(ref rpt, lstLis, "L", "LIS"); + // PacsImage - SetDataSource(ref rpt, lstPacsPhotos, "I", "PACSImage"); + SetDataSource(ref rpt, lstPacsPhotos.Concat(lstExts.Where(w => w.ReportImg != null).Select(s => new Entity.Report { ReportImage = s.ReportImg })), "I", "PACSImage"); rpt.Prepare(); //准备 return rpt;