diff --git a/PEIS/ReportFiles/PReport.frx b/PEIS/ReportFiles/PReport.frx index f936f78..d50d027 100644 --- a/PEIS/ReportFiles/PReport.frx +++ b/PEIS/ReportFiles/PReport.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -162,30 +162,30 @@ namespace FastReport - + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - + + + + + + @@ -312,7 +312,7 @@ namespace FastReport - + @@ -344,20 +344,22 @@ namespace FastReport - - + + - + + - - - - + + + + + @@ -367,7 +369,7 @@ namespace FastReport - + @@ -526,7 +528,7 @@ namespace FastReport - + @@ -565,7 +567,7 @@ namespace FastReport - + diff --git a/PEIS/ReportFiles/TReport.frx b/PEIS/ReportFiles/TReport.frx index 9efe1f3..ba3b608 100644 --- a/PEIS/ReportFiles/TReport.frx +++ b/PEIS/ReportFiles/TReport.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -186,19 +186,19 @@ namespace FastReport - + - - - - - + + + + + - + @@ -207,7 +207,7 @@ namespace FastReport - + @@ -224,11 +224,11 @@ namespace FastReport - + - + @@ -236,7 +236,7 @@ namespace FastReport - + @@ -244,7 +244,7 @@ namespace FastReport - + @@ -259,7 +259,7 @@ namespace FastReport - + @@ -282,13 +282,13 @@ namespace FastReport - + - + @@ -303,7 +303,7 @@ namespace FastReport - + @@ -328,7 +328,7 @@ namespace FastReport - + @@ -343,7 +343,7 @@ namespace FastReport - + @@ -368,93 +368,93 @@ namespace FastReport - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - + + + + + + - + @@ -462,7 +462,7 @@ namespace FastReport - + @@ -507,7 +507,7 @@ namespace FastReport - + @@ -598,7 +598,7 @@ namespace FastReport - + diff --git a/PEIS/View/Enrollment/EnrollmentOrgForm.cs b/PEIS/View/Enrollment/EnrollmentOrgForm.cs index c9bf2c7..6a1dc24 100644 --- a/PEIS/View/Enrollment/EnrollmentOrgForm.cs +++ b/PEIS/View/Enrollment/EnrollmentOrgForm.cs @@ -871,6 +871,7 @@ namespace PEIS.View.Enrollment rpt.SetParameterValue("No", _lstExcelEPatient.Where(w => w.SignTime == null).ToList().Count()); rpt.SetParameterValue("Yes", _lstExcelEPatient.Where(w => w.SignTime != null).ToList().Count()); rpt.SetParameterValue("OrgName", DgvOrg.GetRowCellValue(DgvOrg.GetSelectedRows()[0], "Name").ToString()); + rpt.SetParameterValue("TotalFee", _lstExcelEPatient.Sum(s => s.Fee)); // 人员数据 rpt.RegisterData(_lstExcelEPatient, "O"); @@ -930,13 +931,16 @@ namespace PEIS.View.Enrollment var reportFile = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "ReportFiles", "OrgExcel.frx"); rpt.Load(reportFile); - rpt.SetParameterValue("TotalCount", _lstExcelEPatient.Count()); - rpt.SetParameterValue("No", _lstExcelEPatient.Where(w => w.SignTime == null).ToList().Count()); - rpt.SetParameterValue("Yes", _lstExcelEPatient.Where(w => w.SignTime != null).ToList().Count()); + var list = _lstExcelEPatient.Where(w => w.SignTime > begTime.Value.Date && w.SignTime < endTime.Value.AddDays(1).Date); + + rpt.SetParameterValue("TotalCount", list.Count()); + rpt.SetParameterValue("No", list.Where(w => w.SignTime == null).ToList().Count()); + rpt.SetParameterValue("Yes", list.Where(w => w.SignTime != null).ToList().Count()); rpt.SetParameterValue("OrgName", DgvOrg.GetRowCellValue(DgvOrg.GetSelectedRows()[0], "Name").ToString()); + rpt.SetParameterValue("TotalFee", list.Sum(s => s.Fee)); // 人员数据 - rpt.RegisterData(_lstExcelEPatient, "O"); + rpt.RegisterData(list, "O"); DataBand checkCost = rpt.Report.FindObject("OrgExcel") as DataBand; checkCost.DataSource = rpt.Report.GetDataSource("O"); rpt.GetDataSource("O").Enabled = true;