diff --git a/PEIS/Model/Enrollment/EnrollmentOrgModel.cs b/PEIS/Model/Enrollment/EnrollmentOrgModel.cs index faf0e8c..a83144f 100644 --- a/PEIS/Model/Enrollment/EnrollmentOrgModel.cs +++ b/PEIS/Model/Enrollment/EnrollmentOrgModel.cs @@ -116,15 +116,14 @@ namespace PEIS.Model.Enrollment a.Tel1, c.DeptName, a.SignTime, - d.Fee + (SELECT SUM(Fee) FROM Enrollment_CheckCost WHERE a.ID = EID AND a.OEID = OEID AND DeleteTime IS NULL) AS Fee FROM Enrollment_Patient a LEFT JOIN Base_Patient b ON a.PID = b.ID LEFT JOIN Base_OrgPatient c ON c.OID = a.OID AND c.PID = b.ID LEFT JOIN Enrollment_CheckCost d ON a.ID = d.EID AND a.OEID = d.OEID WHERE - a.OEID = {oeID} AND d.DeleteTime IS NULL - ORDER BY a.SignTime"); + a.OEID = {oeID} ORDER BY a.SignTime"); } } } \ No newline at end of file diff --git a/PEIS/ReportFiles/OrgExcel.frx b/PEIS/ReportFiles/OrgExcel.frx index 7058376..b9cdd03 100644 --- a/PEIS/ReportFiles/OrgExcel.frx +++ b/PEIS/ReportFiles/OrgExcel.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -32,6 +32,7 @@ namespace FastReport + @@ -94,9 +95,11 @@ 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;