diff --git a/PEIS/ReportFiles/CAPReport.frx b/PEIS/ReportFiles/CAPReport.frx
index b7ba590..4d78336 100644
--- a/PEIS/ReportFiles/CAPReport.frx
+++ b/PEIS/ReportFiles/CAPReport.frx
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<<<<<<< HEAD
-<Report ScriptLanguage="CSharp" ReportInfo.Created="05/23/2023 15:50:00" ReportInfo.Modified="01/03/2025 14:46:45" ReportInfo.CreatorVersion="2022.1.0.0">
-=======
 <Report ScriptLanguage="CSharp" ReportInfo.Created="05/23/2023 15:50:00" ReportInfo.Modified="01/02/2025 15:07:23" ReportInfo.CreatorVersion="2022.1.0.0">
->>>>>>> c53782894805b252b3ad82c0049c159c1ba791d2
   <ScriptText>using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -589,15 +585,10 @@ namespace FastReport
       <TextObject Name="Text401" Left="368.55" Top="9.45" Width="66.15" Height="18.9" Text="体检日期:" AutoShrink="FontWidth" HorzAlign="Center" VertAlign="Center" WordWrap="false" Font="微软雅黑, 10pt"/>
       <TextObject Name="Text402" Left="434.7" Top="9.45" Width="92.61" Height="18.9" Text="[ExamDate]" AutoShrink="FontWidth" VertAlign="Center" WordWrap="false" Font="微软雅黑, 10pt"/>
     </PageHeaderBand>
-<<<<<<< HEAD
-    <DataBand Name="PACSImage" Top="39.8" Width="718.2" Height="971.46" CanGrow="true" CanShrink="true">
-      <PictureObject Name="Picture5" Width="718.2" Height="971.46" BeforePrintEvent="Picture5_BeforePrint"/>
-=======
     <DataBand Name="PACSImage" Top="41.8" Width="718.2" Height="1009.26" CanGrow="true" CanShrink="true">
       <PictureObject Name="Picture5" Width="718.2" Height="1009.26" BeforePrintEvent="Picture5_BeforePrint" Image=""/>
->>>>>>> c53782894805b252b3ad82c0049c159c1ba791d2
     </DataBand>
-    <PageFooterBand Name="PageFooter1" Top="1013.26" Width="718.2" Height="37.8">
+    <PageFooterBand Name="PageFooter1" Top="1055.06" Width="718.2" Height="37.8">
       <TextObject Name="Text410" Width="718.2" Height="37.8" Text="第[Page#]页，共[TotalPages#]页" VertAlign="Center" Font="微软雅黑, 8pt, style=Bold"/>
     </PageFooterBand>
   </ReportPage>
@@ -611,13 +602,8 @@ namespace FastReport
       <TextObject Name="Text528" Left="463.05" Top="9.45" Width="92.61" Height="18.9" Text="[ExamDate]" AutoShrink="FontWidth" VertAlign="Center" WordWrap="false" Font="微软雅黑, 10pt"/>
       <LineObject Name="Line42" Top="28.35" Width="727.65"/>
     </ReportTitleBand>
-<<<<<<< HEAD
-    <PageHeaderBand Name="PageHeader10" Top="39.8" Width="718.2" Height="9.45"/>
-    <DataBand Name="Conclusion1000" Top="51.25" Width="718.2" Height="727.65">
-=======
     <PageHeaderBand Name="PageHeader10" Top="41.8" Width="718.2" Height="9.45"/>
     <DataBand Name="Conclusion00011" Top="55.25" Width="718.2" Height="727.65">
->>>>>>> c53782894805b252b3ad82c0049c159c1ba791d2
       <TextObject Name="Text529" Width="718.2" Height="28.35" Border.Lines="All" Text="职业健康检查结论：" VertAlign="Center" Font="微软雅黑, 12pt, style=Bold"/>
       <TextObject Name="Text531" Top="207.9" Width="718.2" Height="28.35" Border.Lines="All" Text="职业健康检查处理意见：" VertAlign="Center" Font="微软雅黑, 12pt, style=Bold"/>
       <TextObject Name="Text533" Top="415.8" Width="718.2" Height="311.85" Border.Lines="All" Padding="0, 0, 0, 0" Font="微软雅黑, 12pt"/>
@@ -634,7 +620,7 @@ namespace FastReport
       <TextObject Name="Text546" Top="28.35" Width="718.2" Height="179.55" Border.Lines="Left, Right" Text="[Conclusion]" Padding="2, 0, 0, 0" Font="微软雅黑, 12pt"/>
       <TextObject Name="Text547" Top="236.25" Width="718.2" Height="179.55" Border.Lines="Left, Right" Text="[Suggestion]" Padding="2, 0, 0, 0" Font="微软雅黑, 12pt"/>
     </DataBand>
-    <PageFooterBand Name="PageFooter9" Top="780.9" Width="718.2" Height="37.8">
+    <PageFooterBand Name="PageFooter9" Top="786.9" Width="718.2" Height="37.8">
       <TextObject Name="Text545" Width="718.2" Height="37.8" Dock="Fill" Text="第[Page#]页，共[TotalPages#]页" VertAlign="Center" Font="微软雅黑, 8pt, style=Bold"/>
     </PageFooterBand>
   </ReportPage>