From cf3ce879611acfe018f238d520924d63e01968e6 Mon Sep 17 00:00:00 2001
From: Ray Shaw <savageno2@hotmail.com>
Date: Tue, 21 Jan 2025 17:20:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .project                                      |  2 +-
 WEB-INF/conf/sysds_jimureport_normal_mzsr.xml | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.project b/.project
index d212e81..b739ade 100644
--- a/.project
+++ b/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>klintersrv</name>
+	<name>kl_hisimpserv</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/WEB-INF/conf/sysds_jimureport_normal_mzsr.xml b/WEB-INF/conf/sysds_jimureport_normal_mzsr.xml
index 8d32512..619bbad 100644
--- a/WEB-INF/conf/sysds_jimureport_normal_mzsr.xml
+++ b/WEB-INF/conf/sysds_jimureport_normal_mzsr.xml
@@ -1069,7 +1069,8 @@ select sum(d.SFXSJZFY) fy,a.jjks,a.jjys,jgzdb.value4 from HIS_JZ_BASEINFO  a lef
 			and (c.PJLX='MG' or c.PJLX='MS') 
 			and nvl(e.YZZXKS,'%') like ? 
 			and c.SFRQ >=? and c.SFRQ <= ?  
-			and c.SFZT =1 and b.JSZT =1 
+			and c.SFZT != 0
+			--and c.SFZT =1 and b.JSZT =1 
 			--and dj.djcxzt='0'  and js.CXZT='0' and dj.MDTRT_ID is not null
 			group by sfx.fyzl,e.YZZXKS 
 			order by e.YZZXKS,sfx.fyzl
@@ -1105,7 +1106,8 @@ select sum(d.SFXSJZFY) fy,a.jjks,a.jjys,jgzdb.value4 from HIS_JZ_BASEINFO  a lef
 			and (c.PJLX='MG' or c.PJLX='MS') 
 			and nvl(e.YZZXKS,'%') like ? 
 			and c.SFRQ >=? and c.SFRQ <= ?  
-			and c.SFZT =1 and b.JSZT =1 
+			and c.SFZT != 0
+			--and c.SFZT =1 and b.JSZT =1 
 			--and dj.djcxzt='0'  and js.CXZT='0' and dj.MDTRT_ID is not null
 			group by sfx.KJZFL,e.YZZXKS 
 			order by e.YZZXKS,sfx.KJZFL
@@ -1141,7 +1143,8 @@ select sum(d.SFXSJZFY) fy,a.jjks,a.jjys,jgzdb.value4 from HIS_JZ_BASEINFO  a lef
 			and (c.PJLX='MG' or c.PJLX='MS') 
 			and nvl(e.YZZXKS,'%') like ? 
 			and c.SFRQ >=? and c.SFRQ <= ?  
-			and c.SFZT =1 and b.JSZT =1 
+			and c.SFZT != 0
+			--and c.SFZT =1 and b.JSZT =1 
 			--and dj.djcxzt='0'  and js.CXZT='0' and dj.MDTRT_ID is not null
 			group by sfx.HSZFL,e.YZZXKS 
 			order by e.YZZXKS,sfx.HSZFL
@@ -1177,7 +1180,8 @@ select sum(d.SFXSJZFY) fy,a.jjks,a.jjys,jgzdb.value4 from HIS_JZ_BASEINFO  a lef
 			and (c.PJLX='MG' or c.PJLX='MS') 
 			and nvl(e.YZZXKS,'%') like ? 
 			and c.SFRQ >=? and c.SFRQ <= ?  
-			and c.SFZT =1 and b.JSZT =1 
+			and c.SFZT != 0
+			--and c.SFZT =1 and b.JSZT =1 
 			--and dj.djcxzt='0'  and js.CXZT='0' and dj.MDTRT_ID is not null
 			group by sfx.BASYFL,e.YZZXKS 
 			order by e.YZZXKS,sfx.BASYFL