1、合并分支

PEIS/Utils/ReportHelper.cs

@@ -254,9 +254,9 @@ namespace PEIS.Utils
             var lstPacs = new ReportModel().GetPacsResult(eid);
             var lstPacsPhotos = new ReportModel().GetPacsPhoto(eid);
 
-            var lstSymptom = new CareerHisInqModel().GetCareerHisInqSymptom(10154);
-            var examCareerHisInq = new CareerHisInqModel().GetExamCareerHisInqByEid(10008);
-            var examEmploymentHis = new CareerHisInqModel().GetEmploymentHises(10028);
+            var lstSymptom = new CareerHisInqModel().GetCareerHisInqSymptom(eid);
+            var examCareerHisInq = new CareerHisInqModel().GetExamCareerHisInqByEid(eid);
+            var examEmploymentHis = new CareerHisInqModel().GetEmploymentHises(eid);
 
             // 登记信息
             rpt.SetParameterValue("PatientName", patient.Name);
@@ -389,10 +389,20 @@ namespace PEIS.Utils
                 eCInqReport.SleepCondition = "/";
                 eCInqReport.Other = "/";
             }
-
-
             careerHisInq.Add(eCInqReport);
 
+            string Conclusion = string.Empty;
+            string Suggestion = string.Empty;
+            if (lstConclusions!=null&& lstConclusions.Count>0)
+            {
+                for (int i = 0; i < lstConclusions.Count; i++)
+                {
+                    Conclusion +=$"{(i + 1)}、{lstConclusions[i].Conclusion}。";
+                    Suggestion+= $"{(i + 1)}、{lstConclusions[i].Suggestion}";
+                }
+            }
+            rpt.SetParameterValue("Conclusion", Conclusion);
+            rpt.SetParameterValue("Suggestion", Suggestion);
 
             // 收费列表
             SetDataSource(ref rpt, lstEFeeItems, "F", "FeeItems");