From c9ba7ae8c830bc5ec979f558ae97b4db306b8e30 Mon Sep 17 00:00:00 2001
From: lsm <zlysdm@163.com>
Date: Mon, 2 Sep 2024 10:55:39 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=BB=86=E8=8A=82=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PEIS/ReportFiles/Guide.frx                   | 8 ++++----
 PEIS/View/Enrollment/EnrollmentPersonForm.cs | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/PEIS/ReportFiles/Guide.frx b/PEIS/ReportFiles/Guide.frx
index c82d1d8..ea295ad 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="08/22/2024 14:47:00" ReportInfo.CreatorVersion="2022.1.0.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="06/08/2023 15:44:02" ReportInfo.Modified="08/30/2024 09:08:38" ReportInfo.CreatorVersion="2022.1.0.0">
   <ScriptText>using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -124,7 +124,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>
@@ -156,7 +156,7 @@ namespace FastReport
       </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="81.27" CanGrow="true" CanShrink="true">
+    <DataBand Name="FeeItems" Top="438.88" 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"/>
@@ -180,7 +180,7 @@ namespace FastReport
         </TableRow>
       </TableObject>
     </DataBand>
-    <PageFooterBand Name="PageFooter1" Top="521.48" Width="718.2" Height="37.8" Border.Lines="Top">
+    <PageFooterBand Name="PageFooter1" Top="522.81" 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/EnrollmentPersonForm.cs b/PEIS/View/Enrollment/EnrollmentPersonForm.cs
index d81b178..ea22905 100644
--- a/PEIS/View/Enrollment/EnrollmentPersonForm.cs
+++ b/PEIS/View/Enrollment/EnrollmentPersonForm.cs
@@ -510,7 +510,7 @@ namespace PEIS.View.Enrollment
             try
             {
                 var items = new List<EnrollmentFeeItem>();
-                _lstEFeeItem.Where(w => w.OrderNo != null && !w.IsHide && !(w.DeptName.Contains("金域"))).GroupBy(g => g.DeptCode).ForEach(dept =>
+                _lstEFeeItem.Where(w => w.OrderNo != null && !w.IsHide ).GroupBy(g => g.DeptCode).ForEach(dept =>
                 {
                     var item = new EnrollmentFeeItem()
                     {