1、体检报告插入第三报告图片

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;