From 946bda8297320260edd6b028752c72ba94403a46 Mon Sep 17 00:00:00 2001
From: lsm <zlysdm@163.com>
Date: Fri, 26 Jul 2024 14:42:55 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=A3=80=E6=9F=A5=E9=A1=B9=E7=9B=AES?=
 =?UTF-8?q?QL=E8=AF=AD=E5=8F=A5=E6=94=B9=E5=8A=A8=EF=BC=8C=E5=8C=B9?=
 =?UTF-8?q?=E9=85=8DoldId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PEIS/App.config              | 17 +++--------------
 PEIS/Model/Exam/PartModel.cs |  4 ++--
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/PEIS/App.config b/PEIS/App.config
index e35a23d..1c4d84e 100644
--- a/PEIS/App.config
+++ b/PEIS/App.config
@@ -6,23 +6,12 @@
 	<appSettings> 
 		<!-- <add value="1.0.3" key="Version"/> --> 
 		<!-- <add value="http://200.200.200.71:5200/version/download" key="DownloadUrl"/> -->  
-		<add value="0513" key="UserCode"/> 
-		<add value="赵翠回" key="UserName"/>  
 	</appSettings> 
 	<connectionStrings>
 
-		<!-- 德宏州中医院 peisdb2-->
-		<!-- <add name="ConnString" connectionString="10C598E364BCAFCF71617738597417B368D095FA1A37D76CC4755C411E5B6E792E0D4950863434F9B242AA9F134426A2922569235322E2342030D4AE0170168D8F1BC9B44D56F367DE9614CDCCBB6CDAEF20B4992B3758AD9FF39A400D08CC48"/> -->
-
-		<!-- 德宏州中医院 peisdb-->
-		 <add name="ConnString" connectionString="10C598E364BCAFCF71617738597417B368D095FA1A37D76CC4755C411E5B6E792E0D4950863434F9B242AA9F134426A27810AC34D6EDC4F6ABFC4BE6027BB990824DB7092BFDA15709314FEBC2C3C9E312752DFBDF33BC1BF3C0FC84EAA83A4F"/> 
-		<!-- 192.168.12.188 -->
-		 <!--<add name="ConnString" connectionString="10C598E364BCAFCFDC6960B18CB026C75BD46245729DFD1D3D78E221B3E0300765B697A8C044694AA8A0575480464D83E79206ED689FE4A1CE0C479D02BC880B7FDEDDC464EE6B74BDB082FD5B1B9EFC"/>-->
-		<!-- 盈江妇幼YJFY  -->	
-		 <!--<add name="ConnString" connectionString="10C598E364BCAFCF5A016EA6C7463FAC7D75379F63924F4F82C1749BDA88D9414EC0303E1ECC3E76895E07FCFC13332D1D79643A2AD3AA60507FD3EAF9A41761B30F4FDE900F983F1FE6ED6F0245E5BF8BFCFC5F0A2C03E4"/>--> 
-		<!-- 芒市妇幼MSFY -->
-		 <!-- <add name="ConnString" connectionString="10C598E364BCAFCFDC6960B18CB026C71974C5748654F280FDC48E754851202242B4E7B1AA07112A874114ABFCB682AC3D64541EBBF807FEB54E514CC3815F4A0521AC62245D6E0B29E34ADCAE07492C51045002E903C53C8DC45FF6FC4A547A"/>  -->
-
+		<!-- 德宏州妇幼-->
+		 <add name="ConnString" connectionString="10C598E364BCAFCFDC6960B18CB026C763905B6860F9682000563332FCAB5C73858C4F5055412BEEA4250C4B7F818B1131EA88AF653A3B4CDDD0C5B34F70F0976C1EC0593C316079F518B5004345A3C4193D7E6027C8D88A50914E14B8A91B91"/> 
+    
 	</connectionStrings>
 	<entityFramework>
 		<providers>
diff --git a/PEIS/Model/Exam/PartModel.cs b/PEIS/Model/Exam/PartModel.cs
index 9fcdb49..52d1347 100644
--- a/PEIS/Model/Exam/PartModel.cs
+++ b/PEIS/Model/Exam/PartModel.cs
@@ -439,8 +439,8 @@ namespace PEIS.Model
 
                 FROM
 	                Enrollment_FeeItem A
-	                LEFT JOIN Report B ON A.EID = B.EID  AND A.ID= B.ReportNo
-LEFT JOIN Dict_FeeItem  FeeItem ON A.FID= FeeItem.ID
+	                LEFT JOIN Report B ON A.EID = B.EID  AND ( A.ID= B.ReportNo OR A.OldId = B.ReportNo)
+                    LEFT JOIN Dict_FeeItem  FeeItem ON A.FID= FeeItem.ID
                 WHERE
 	                A.ItemClass = '检查' AND FeeItem.IsHide=0 	AND A.eid = {eid}").ToList();
             return reportList;