From 582f9ce3e2b6102c7ce20fa69bcefb83df8a3df7 Mon Sep 17 00:00:00 2001
From: lsm <zlysdm@163.com>
Date: Thu, 12 Sep 2024 16:01:26 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=9B=A2=E4=BD=93=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E6=9B=B4=E6=94=B9=EF=BC=8C=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E4=BB=B7=E6=A0=BC=E5=90=88=E5=B9=B6=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PEIS/Model/Enrollment/EnrollmentOrgModel.cs |  5 ++---
 PEIS/ReportFiles/OrgExcel.frx               |  7 +++++--
 PEIS/View/Enrollment/EnrollmentOrgForm.cs   | 12 ++++++++----
 3 files changed, 15 insertions(+), 9 deletions(-)

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 @@
 <?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>
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;