1、团体导出模板更改，订单价格合并显示

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");
         }
     }
 }

PEIS/ReportFiles/OrgExcel.frx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="06/26/2023 17:47:58" ReportInfo.Modified="08/29/2024 10:00:30" ReportInfo.CreatorVersion="2022.1.0.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="06/26/2023 17:47:58" ReportInfo.Modified="09/12/2024 16:00:01" ReportInfo.CreatorVersion="2022.1.0.0">
   <ScriptText>using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -32,6 +32,7 @@ namespace FastReport
     <Parameter Name="TotalCount" DataType="System.String"/>
     <Parameter Name="Yes" DataType="System.String"/>
     <Parameter Name="No" DataType="System.String"/>
+    <Parameter Name="TotalFee" DataType="System.String"/>
   </Dictionary>
   <ReportPage Name="Page1" RawPaperSize="9" Watermark.Font="宋体, 60pt">
     <ColumnHeaderBand Name="ColumnHeader1" Width="718.2" Height="56.7" PrintOn="FirstPage">
@@ -94,9 +95,11 @@ namespace FastReport
       </DataHeaderBand>
       <DataFooterBand Name="DataFooter1" Top="138.3" Width="718.2" Height="28.35">
         <TableObject Name="Table5" Width="718.2" Height="28.35" Fill.Color="InactiveBorder">
-          <TableColumn Name="Column35" Width="718.2"/>
+          <TableColumn Name="Column35" Width="652.05"/>
+          <TableColumn Name="Column68"/>
           <TableRow Name="Row5" Height="28.35" AutoSize="true">
             <TableCell Name="Cell55" Border.Lines="All" Fill.Color="InactiveBorder" Text="-总计-：[TotalCount]人，已体检：[Yes]人，未体检：[No]人" VertAlign="Center" Font="微软雅黑, 10pt"/>
+            <TableCell Name="Cell88" Border.Lines="All" Text="[TotalFee]" Font="微软雅黑, 10pt"/>
           </TableRow>
         </TableObject>
       </DataFooterBand>

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;