From a3b9d14117e73a1379319ac43622cdded1179f69 Mon Sep 17 00:00:00 2001
From: lsm <zlysdm@163.com>
Date: Mon, 19 Aug 2024 11:17:23 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=AF=BC=E6=A3=80=E5=8D=95=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=87=91=E5=9F=9F=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PEIS/ReportFiles/Guide.frx                | 18 +++++++++---------
 PEIS/View/Enrollment/EnrollmentOrgForm.cs |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/PEIS/ReportFiles/Guide.frx b/PEIS/ReportFiles/Guide.frx
index e15e44a..7062285 100644
--- a/PEIS/ReportFiles/Guide.frx
+++ b/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="07/10/2024 13:07:07" ReportInfo.CreatorVersion="2022.1.0.0">
+<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">
   <ScriptText>using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -148,25 +148,25 @@ 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"/>
+            <PictureObject Name="Picture2" Left="15.12" Top="9.45" Width="132.3" Height="189" BeforePrintEvent="Picture2_BeforePrint" Image=""/>
           </TableCell>
         </TableRow>
       </TableObject>
       <BarcodeObject Name="Barcode1" Left="9.45" Top="9.45" Width="143.75" Height="56.7" AutoSize="false" Expression="[ExamID]" Text="" Barcode="Code128" Barcode.AutoEncode="true"/>
     </ReportTitleBand>
-    <DataBand Name="FeeItems" Top="438.21" Width="718.2" Height="85.05" CanGrow="true" CanShrink="true">
-      <TableObject Name="Table2" Width="718.2" Height="85.05">
+    <DataBand Name="FeeItems" Top="438.21" Width="718.2" Height="81.27" CanGrow="true" CanShrink="true">
+      <TableObject Name="Table2" Width="718.2" Height="81.27">
         <TableColumn Name="Column11" Width="143.64"/>
         <TableColumn Name="Column12" Width="143.64"/>
         <TableColumn Name="Column13" Width="143.64"/>
         <TableColumn Name="Column14" Width="143.64"/>
         <TableColumn Name="Column15" Width="143.64"/>
-        <TableRow Name="Row4" Height="85.05" AutoSize="true">
+        <TableRow Name="Row4" Height="81.27" AutoSize="true">
           <TableCell Name="Cell41" Border.Lines="All" Font="宋体, 9pt" ColSpan="5">
             <TextObject Name="Text10" Top="18.9" Width="75.6" Height="18.9" CanBreak="false" Text="参检项目:" VertAlign="Center" Font="微软雅黑, 10pt"/>
-            <TextObject Name="Text11" Left="378" Top="66.15" Width="85.05" Height="18.9" Text="医师签字：" VertAlign="Center" Font="微软雅黑, 10pt"/>
-            <TextObject Name="Text12" Left="548.1" Top="66.15" Width="85.05" Height="18.9" Text="弃检签字：" VertAlign="Center" Font="微软雅黑, 10pt"/>
-            <TextObject Name="Text13" Left="66.15" Top="18.9" Width="642.6" Height="18.9" CanGrow="true" CanShrink="true" CanBreak="false" Text="[F.FeeItemName]" VertAlign="Center" Font="微软雅黑, 10pt" LineHeight="20"/>
+            <TextObject Name="Text11" Left="378" Top="62.37" Width="85.05" Height="18.9" Text="医师签字：" VertAlign="Center" Font="微软雅黑, 10pt"/>
+            <TextObject Name="Text12" Left="548.1" Top="62.37" Width="85.05" Height="18.9" Text="弃检签字：" VertAlign="Center" Font="微软雅黑, 10pt"/>
+            <TextObject Name="Text13" Left="66.15" Top="18.9" Width="642.6" Height="18.9" CanGrow="true" CanShrink="true" CanBreak="false" Text="[F.FeeItemName]" VertAlign="Center" Font="微软雅黑, 10pt"/>
             <TextObject Name="Text9" Width="548.1" Height="18.9" CanGrow="true" CanBreak="false" Text="[F.DeptName]" AutoWidth="true" VertAlign="Center" Font="微软雅黑, 10pt, style=Bold"/>
             <TextObject Name="Text14" Top="37.8" Width="75.6" Height="18.9" CanBreak="false" Text="科室地址:" VertAlign="Center" Font="微软雅黑, 10pt"/>
             <TextObject Name="Text15" Left="66.15" Top="37.8" Width="642.6" Height="18.9" CanGrow="true" CanShrink="true" CanBreak="false" Text="[F.Address]" VertAlign="Center" Font="微软雅黑, 10pt"/>
@@ -178,7 +178,7 @@ namespace FastReport
         </TableRow>
       </TableObject>
     </DataBand>
-    <PageFooterBand Name="PageFooter1" Top="525.26" Width="718.2" Height="37.8" Border.Lines="Top">
+    <PageFooterBand Name="PageFooter1" Top="521.48" Width="718.2" Height="37.8" Border.Lines="Top">
       <TextObject Name="Text7" Width="160.65" Height="28.35" Text="第[Page#]页，共[TotalPages#]页" Font="微软雅黑, 10pt"/>
       <TextObject Name="Text8" Left="500.85" Width="217.35" Height="28.35" Text="打印时间：[Date]" Font="微软雅黑, 10pt"/>
     </PageFooterBand>
diff --git a/PEIS/View/Enrollment/EnrollmentOrgForm.cs b/PEIS/View/Enrollment/EnrollmentOrgForm.cs
index a9bb60d..511637b 100644
--- a/PEIS/View/Enrollment/EnrollmentOrgForm.cs
+++ b/PEIS/View/Enrollment/EnrollmentOrgForm.cs
@@ -685,7 +685,7 @@ namespace PEIS.View.Enrollment
             try
             {
                 var items = new List<EnrollmentFeeItem>();
-                _lstEnrollmentFeeItem.Where(w => w.OrderNo != null && !w.IsHide && !(w.DeptName.Contains("金域"))).GroupBy(g => g.DeptCode).ForEach(dept =>
+                _lstEnrollmentFeeItem.Where(w => w.OrderNo != null && !w.IsHide ).GroupBy(g => g.DeptCode).ForEach(dept =>
                 {
                     var item = new EnrollmentFeeItem()
                     {