diff --git a/PEIS/ReportFiles/CAPReport.frx b/PEIS/ReportFiles/CAPReport.frx index d328f2e..4d78336 100644 --- a/PEIS/ReportFiles/CAPReport.frx +++ b/PEIS/ReportFiles/CAPReport.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -169,27 +169,27 @@ namespace FastReport - - - + + + - - + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -269,19 +269,19 @@ namespace FastReport - + - + - + - + - + - + - + @@ -302,39 +302,39 @@ namespace FastReport - + - + - + - + - + - + - - + + - + - + - + - + - + - + @@ -343,10 +343,10 @@ namespace FastReport - + - + @@ -355,14 +355,14 @@ namespace FastReport - + - + - + @@ -382,14 +382,14 @@ namespace FastReport - - - - + + + + - + @@ -465,7 +465,7 @@ namespace FastReport - + @@ -586,7 +586,7 @@ namespace FastReport - + @@ -603,11 +603,9 @@ namespace FastReport - + - - @@ -619,6 +617,8 @@ namespace FastReport + + diff --git a/PEIS/Utils/ReportHelper.cs b/PEIS/Utils/ReportHelper.cs index 6ed1c59..8748d93 100644 --- a/PEIS/Utils/ReportHelper.cs +++ b/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");