1、上线前准备更新

PEIS.Api/appsettings.json

@@ -1,5 +1,5 @@
 {
-  "urls": "http://192.168.1.37:5200",
+  "urls": "http://192.168.0.188:5200",
   "Logging": {
     "LogLevel": {
       "Default": "Information",

PEIS/App.config

@@ -9,9 +9,11 @@
 	</appSettings> 
 	<connectionStrings>
 
-		<!-- 蒙自中医peisdb2-->
+    <!-- 蒙自中医peisdb-->
-		 <add name="ConnString" connectionString="10C598E364BCAFCFDC6960B18CB026C704A2748FB5D61E41F06B6364853FE182D9FC9283BABF6C8A1505FE989308F14A106D4598DE28CA4C520B9C729801C7B1DDF6642AA1A023443B46E3AE1854C9EC9990732F10C96067"/> 
+    <add name="ConnString" connectionString="10C598E364BCAFCFDC6960B18CB026C704A2748FB5D61E41F06B6364853FE182D9FC9283BABF6C8A1505FE989308F14A00128E081E2BB18B70748D03C4064CF31C4A739EFFBF998EDD22C1959E48486F5415E6D133CD4459"/>
-   
+
+    <!-- 蒙自中医peisdb2-->
+		 <!--<add name="ConnString" connectionString="10C598E364BCAFCFDC6960B18CB026C704A2748FB5D61E41F06B6364853FE182D9FC9283BABF6C8A1505FE989308F14A106D4598DE28CA4C520B9C729801C7B1DDF6642AA1A023443B46E3AE1854C9EC9990732F10C96067"/>--> 
     
 	</connectionStrings>
 	<entityFramework>

PEIS/Model/Enrollment/EnrollmentOrgModel.cs

@@ -51,7 +51,11 @@ namespace PEIS.Model.Enrollment
             var enrollmentPatient = $@"UPDATE Enrollment_Patient SET ExamDate = GETDATE(), SignTime = GETDATE(), SignerCode = '{Global.currentUser.Code}', Signer = '{Global.currentUser.Name}' WHERE ID = {eID} AND SignTime is null";
             var enrollmentFeeItem = $@"UPDATE a SET a.IsSend = 1 FROM Enrollment_FeeItem a LEFT JOIN Enrollment_CheckCost b ON a.OrderNO = b.ID AND a.EID = b.EID WHERE b.SendTime IS NOT NULL AND a.EID = {eID};";
 
-            var dept = $@"UPDATE Enrollment_FeeItem SET DeptCode = '01012',DeptName = '妇科' WHERE FID = 889 AND EID = {eID}";
+            var dept = $@"UPDATE Enrollment_FeeItem SET DeptCode = '01016',DeptName = '内科' WHERE FID = 844 AND EID = {eID};
+                          UPDATE Enrollment_FeeItem SET DeptCode = '01017',DeptName = '外科' WHERE FID = 845 AND EID = {eID};
+                          UPDATE Enrollment_FeeItem SET DeptCode = '01014',DeptName = '口腔科' WHERE FID = 846 AND EID = {eID};
+                          UPDATE Enrollment_FeeItem SET DeptCode = '01015',DeptName = '五官科' WHERE FID = 847 AND EID = {eID};
+                          UPDATE Enrollment_FeeItem SET DeptCode = '01012',DeptName = '心电图室' WHERE FID = 216 AND EID = {eID};";
 
             // 插入分检步骤
             var part = $@"EXEC sp_SyncExamPart {eID}";

PEIS/Model/Enrollment/EnrollmentPatientModel.cs

@@ -115,7 +115,11 @@ namespace PEIS.Model.Enrollment
             var enrollmentFeeItem = $@"UPDATE a SET a.IsSend = 1 FROM Enrollment_FeeItem a LEFT JOIN Enrollment_CheckCost b ON a.OrderNO = b.ID AND a.EID = b.EID WHERE b.SendTime IS NOT NULL AND a.EID = {EId}; ";
 
 
-            var dept = $@"UPDATE Enrollment_FeeItem SET DeptCode = '01012',DeptName = '妇科' WHERE FID = 889 AND EID = {EId}";
+            var dept = $@"UPDATE Enrollment_FeeItem SET DeptCode = '01016',DeptName = '内科' WHERE FID = 844 AND EID = {EId};
+                          UPDATE Enrollment_FeeItem SET DeptCode = '01017',DeptName = '外科' WHERE FID = 845 AND EID = {EId};
+                          UPDATE Enrollment_FeeItem SET DeptCode = '01014',DeptName = '口腔科' WHERE FID = 846 AND EID = {EId};
+                          UPDATE Enrollment_FeeItem SET DeptCode = '01015',DeptName = '五官科' WHERE FID = 847 AND EID = {EId};
+                          UPDATE Enrollment_FeeItem SET DeptCode = '01012',DeptName = '心电图室' WHERE FID = 216 AND EID = {EId};";
 
             // 插入分检步骤
             var part = $@"EXEC sp_SyncExamPart {EId}";
@@ -264,7 +268,7 @@ namespace PEIS.Model.Enrollment
 	                                                             LEFT JOIN Dict_FeeItem b ON a.KeyNo = b.KeyNo 
 	                                                             LEFT JOIN Dict_Dept c ON a.DeptCode = c.HISCode AND a.DeptName = c.Name
                                                               WHERE
-	                                                             a.EID = {EId}");
+	                                                             a.EID = {EId} ORDER BY OrderNo");
         }
 
         public EnrollmentPatient GetEnrollmentPatient(Int64 EId) // 获取个人体检人员信息 

PEIS/Model/EnrollmentFeeItemModel.cs

@@ -33,7 +33,7 @@ namespace PEIS.Model
 
         public List<EnrollmentFeeItem> GetItemsByEnrollmentID(Int64 enrollmentID)
         {
-            return DAOHelp.GetDataBySQL<EnrollmentFeeItem>($"Select a.*, b.Address, c.IsHide From Enrollment_FeeItem a LEFT JOIN Dict_Dept b ON a.DeptCode = b.HISCode LEFT JOIN Dict_FeeItem c ON a.KeyNo = c.KeyNo Where a.EID = {enrollmentID} Order by a.PackName DESC, a.OrderNo, a.DeptName");
+            return DAOHelp.GetDataBySQL<EnrollmentFeeItem>($"Select a.*, b.Address, c.IsHide From Enrollment_FeeItem a LEFT JOIN Dict_Dept b ON a.DeptCode = b.HISCode LEFT JOIN Dict_FeeItem c ON a.KeyNo = c.KeyNo Where a.EID = {enrollmentID} Order by a.OrderNo");
         }
 
         public List<EnrollmentFeeItem> GetItems4CheckCost(Int64 oeID, Int64 enrollmentID)

PEIS/ReportFiles/Guide.frx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="06/08/2023 15:44:02" ReportInfo.Modified="08/19/2024 11:07:09" ReportInfo.CreatorVersion="2022.1.0.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="06/08/2023 15:44:02" ReportInfo.Modified="09/22/2024 15:52:54" ReportInfo.CreatorVersion="2022.1.0.0">
   <ScriptText>using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -123,7 +123,7 @@ namespace FastReport
           <TableCell Name="Cell15" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt"/>
           <TableCell Name="Cell36" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt"/>
           <TableCell Name="Cell37" Border.Lines="All" Text="民族" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt"/>
-          <TableCell Name="Cell38" Border.Lines="All" Text="[Nation]族" VertAlign="Center" Font="微软雅黑, 10pt" ColSpan="3"/>
+          <TableCell Name="Cell38" Border.Lines="All" Text="[Nation]" VertAlign="Center" Font="微软雅黑, 10pt" ColSpan="3"/>
           <TableCell Name="Cell39" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt"/>
           <TableCell Name="Cell40" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 10pt"/>
         </TableRow>
@@ -148,7 +148,7 @@ namespace FastReport
         <TableColumn Name="Column16" Width="160.65"/>
         <TableRow Name="Row5" Height="360.61">
           <TableCell Name="Cell46" Border.Lines="All" Font="宋体, 9pt">
-            <PictureObject Name="Picture2" Left="15.12" Top="9.45" Width="132.3" Height="189" BeforePrintEvent="Picture2_BeforePrint" Image=""/>
+            <PictureObject Name="Picture2" Left="15.12" Top="9.45" Width="132.3" Height="189" BeforePrintEvent="Picture2_BeforePrint"/>
           </TableCell>
         </TableRow>
       </TableObject>

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());
+                        var list = _lstExcelEPatient.Where(w => w.SignTime > begTime.Value.Date && w.SignTime < endTime.Value.AddDays(1).Date);
-                        rpt.SetParameterValue("No", _lstExcelEPatient.Where(w => w.SignTime == null).ToList().Count());
+
-                        rpt.SetParameterValue("Yes", _lstExcelEPatient.Where(w => w.SignTime != null).ToList().Count());
+                        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;