diff --git a/.project b/.project index d212e81..b739ade 100644 --- a/.project +++ b/.project @@ -1,6 +1,6 @@ - klintersrv + kl_hisimpserv 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