From 38ea68ffc3bfe203a276646ff4fdc006d814671e Mon Sep 17 00:00:00 2001 From: Ray Shaw Date: Mon, 9 Dec 2024 15:15:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WEB-INF/classes/.gitignore | 1 - WEB-INF/conf/sysds_jimureport_normal_mzsr.xml | 16 ++++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/WEB-INF/classes/.gitignore b/WEB-INF/classes/.gitignore index 698657d..c2d9872 100644 --- a/WEB-INF/classes/.gitignore +++ b/WEB-INF/classes/.gitignore @@ -1,2 +1 @@ /com/ -/compiler/ diff --git a/WEB-INF/conf/sysds_jimureport_normal_mzsr.xml b/WEB-INF/conf/sysds_jimureport_normal_mzsr.xml index 8d32512..fa53377 100644 --- a/WEB-INF/conf/sysds_jimureport_normal_mzsr.xml +++ b/WEB-INF/conf/sysds_jimureport_normal_mzsr.xml @@ -703,10 +703,10 @@ order by jjks,jzno,pkey,hzpkey,fylb select sum(fy) fy,fylb,jjks from ( - select sum(d.SFXSJZFY) fy,sfx.fyzl fylb,a.jjks from HIS_JZ_BASEINFO a left join HIS_SFZD_ZB b on a.pkey=b.jzpkey and a.JGID=b.JGID left join HIS_MZJS_MZFPZB c on b.pkey=c.GLZDBPKEY and b.JGID=c.JGID left join HIS_SFZD_SFXMXB d on b.pkey=d.ZDZBPKEY and b.JGID=d.JGID left join HIS_YZ_MXB e on d.YZMX=e.pkey and d.JGID=e.JGID left join HIS_SFX sfx on d.sfx=sfx.bm and d.JGID=sfx.JGID where a.JGID=? and (c.PJLX='MG' or c.PJLX='MS') and nvl(a.jjks,'%') like ? and c.SFRQ > ? and c.SFRQ <= ? and c.PJZT = 1 group by sfx.fyzl,a.jjks + select sum(d.SFXSJZFY) fy,sfx.fyzl fylb,a.jjks from HIS_JZ_BASEINFO a left join HIS_SFZD_ZB b on a.pkey=b.jzpkey and a.JGID=b.JGID left join HIS_MZJS_MZFPZB c on b.pkey=c.GLZDBPKEY and b.JGID=c.JGID left join HIS_SFZD_SFXMXB d on b.pkey=d.ZDZBPKEY and b.JGID=d.JGID left join HIS_YZ_MXB e on d.YZMX=e.pkey and d.JGID=e.JGID left join HIS_SFX sfx on d.sfx=sfx.bm and d.JGID=sfx.JGID where a.JGID=? and (c.PJLX='MG' or c.PJLX='MS') and nvl(a.jjks,'%') like ? and c.SFRQ > ? and c.SFRQ <= ? and c.PJZT = 1 and b.JSZT =1 group by sfx.fyzl,a.jjks union all - select sum(d.SFXSJZFY) fy,sfx.fyzl fylb,a.jjks from HIS_JZ_BASEINFO a left join HIS_SFZD_ZB b on a.pkey=b.jzpkey and a.JGID=b.JGID left join HIS_MZJS_MZFPZB c on b.pkey=c.GLZDBPKEY and b.JGID=c.JGID left join HIS_SFZD_SFXMXB d on b.pkey=d.ZDZBPKEY and b.JGID=d.JGID left join HIS_YZ_MXB e on d.YZMX=e.pkey and d.JGID=e.JGID left join HIS_SFX sfx on d.sfx=sfx.bm and d.JGID=sfx.JGID where a.JGID=? and (c.PJLX='MG' or c.PJLX='MS') and nvl(a.jjks,'%') like ? and c.SFRQ > ? and c.SFRQ <= ? and c.CHPKEY is not null and c.SFZT != 0 group by sfx.fyzl,a.jjks + select sum(d.SFXSJZFY) fy,sfx.fyzl fylb,a.jjks from HIS_JZ_BASEINFO a left join HIS_SFZD_ZB b on a.pkey=b.jzpkey and a.JGID=b.JGID left join HIS_MZJS_MZFPZB c on b.pkey=c.GLZDBPKEY and b.JGID=c.JGID left join HIS_SFZD_SFXMXB d on b.pkey=d.ZDZBPKEY and b.JGID=d.JGID left join HIS_YZ_MXB e on d.YZMX=e.pkey and d.JGID=e.JGID left join HIS_SFX sfx on d.sfx=sfx.bm and d.JGID=sfx.JGID where a.JGID=? and (c.PJLX='MG' or c.PJLX='MS') and nvl(a.jjks,'%') like ? and c.SFRQ > ? and c.SFRQ <= ? and c.CHPKEY is not null and c.SFZT != 0 and b.JSZT =1 group by sfx.fyzl,a.jjks ) group by fylb,jjks @@ -736,11 +736,11 @@ order by jjks,fylb select sum(fy) fy,fylb,jjks from ( -select sum(d.SFXSJZFY) fy,sfx.KJZFL fylb,a.jjks from HIS_JZ_BASEINFO a left join HIS_SFZD_ZB b on a.pkey=b.jzpkey and a.JGID=b.JGID left join HIS_MZJS_MZFPZB c on b.pkey=c.GLZDBPKEY and b.JGID=c.JGID left join HIS_SFZD_SFXMXB d on b.pkey=d.ZDZBPKEY and b.JGID=d.JGID left join HIS_YZ_MXB e on d.YZMX=e.pkey and d.JGID=e.JGID left join HIS_SFX sfx on d.sfx=sfx.bm and d.JGID=sfx.JGID where a.JGID=? and (c.PJLX='MG' or c.PJLX='MS') and nvl(a.jjks,'%') like ? and c.SFRQ > ? and c.SFRQ <= ? and c.PJZT = 1 group by sfx.KJZFL,a.jjks +select sum(d.SFXSJZFY) fy,sfx.KJZFL fylb,a.jjks from HIS_JZ_BASEINFO a left join HIS_SFZD_ZB b on a.pkey=b.jzpkey and a.JGID=b.JGID left join HIS_MZJS_MZFPZB c on b.pkey=c.GLZDBPKEY and b.JGID=c.JGID left join HIS_SFZD_SFXMXB d on b.pkey=d.ZDZBPKEY and b.JGID=d.JGID left join HIS_YZ_MXB e on d.YZMX=e.pkey and d.JGID=e.JGID left join HIS_SFX sfx on d.sfx=sfx.bm and d.JGID=sfx.JGID where a.JGID=? and (c.PJLX='MG' or c.PJLX='MS') and nvl(a.jjks,'%') like ? and c.SFRQ > ? and c.SFRQ <= ? and c.PJZT = 1 and b.JSZT =1 group by sfx.KJZFL,a.jjks union all -select sum(d.SFXSJZFY) fy,sfx.KJZFL fylb,a.jjks from HIS_JZ_BASEINFO a left join HIS_SFZD_ZB b on a.pkey=b.jzpkey and a.JGID=b.JGID left join HIS_MZJS_MZFPZB c on b.pkey=c.GLZDBPKEY and b.JGID=c.JGID left join HIS_SFZD_SFXMXB d on b.pkey=d.ZDZBPKEY and b.JGID=d.JGID left join HIS_YZ_MXB e on d.YZMX=e.pkey and d.JGID=e.JGID left join HIS_SFX sfx on d.sfx=sfx.bm and d.JGID=sfx.JGID where a.JGID=? and (c.PJLX='MG' or c.PJLX='MS') and nvl(a.jjks,'%') like ? and c.SFRQ > ? and c.SFRQ <= ? and c.CHPKEY is not null and c.SFZT != 0 group by sfx.KJZFL,a.jjks +select sum(d.SFXSJZFY) fy,sfx.KJZFL fylb,a.jjks from HIS_JZ_BASEINFO a left join HIS_SFZD_ZB b on a.pkey=b.jzpkey and a.JGID=b.JGID left join HIS_MZJS_MZFPZB c on b.pkey=c.GLZDBPKEY and b.JGID=c.JGID left join HIS_SFZD_SFXMXB d on b.pkey=d.ZDZBPKEY and b.JGID=d.JGID left join HIS_YZ_MXB e on d.YZMX=e.pkey and d.JGID=e.JGID left join HIS_SFX sfx on d.sfx=sfx.bm and d.JGID=sfx.JGID where a.JGID=? and (c.PJLX='MG' or c.PJLX='MS') and nvl(a.jjks,'%') like ? and c.SFRQ > ? and c.SFRQ <= ? and c.CHPKEY is not null and c.SFZT != 0 and b.JSZT =1 group by sfx.KJZFL,a.jjks ) group by fylb,jjks @@ -771,10 +771,10 @@ order by jjks,fylb select sum(fy) fy,fylb,jjks from ( -select sum(d.SFXSJZFY) fy,sfx.HSZFL fylb,a.jjks from HIS_JZ_BASEINFO a left join HIS_SFZD_ZB b on a.pkey=b.jzpkey and a.JGID=b.JGID left join HIS_MZJS_MZFPZB c on b.pkey=c.GLZDBPKEY and b.JGID=c.JGID left join HIS_SFZD_SFXMXB d on b.pkey=d.ZDZBPKEY and b.JGID=d.JGID left join HIS_YZ_MXB e on d.YZMX=e.pkey and d.JGID=e.JGID left join HIS_SFX sfx on d.sfx=sfx.bm and d.JGID=sfx.JGID where a.JGID=? and (c.PJLX='MG' or c.PJLX='MS') and nvl(a.jjks,'%') like ? and c.SFRQ > ? and c.SFRQ <= ? and c.PJZT = 1 group by sfx.HSZFL,a.jjks +select sum(d.SFXSJZFY) fy,sfx.HSZFL fylb,a.jjks from HIS_JZ_BASEINFO a left join HIS_SFZD_ZB b on a.pkey=b.jzpkey and a.JGID=b.JGID left join HIS_MZJS_MZFPZB c on b.pkey=c.GLZDBPKEY and b.JGID=c.JGID left join HIS_SFZD_SFXMXB d on b.pkey=d.ZDZBPKEY and b.JGID=d.JGID left join HIS_YZ_MXB e on d.YZMX=e.pkey and d.JGID=e.JGID left join HIS_SFX sfx on d.sfx=sfx.bm and d.JGID=sfx.JGID where a.JGID=? and (c.PJLX='MG' or c.PJLX='MS') and nvl(a.jjks,'%') like ? and c.SFRQ > ? and c.SFRQ <= ? and c.PJZT = 1 and b.JSZT =1 group by sfx.HSZFL,a.jjks union all -select sum(d.SFXSJZFY) fy,sfx.HSZFL fylb,a.jjks from HIS_JZ_BASEINFO a left join HIS_SFZD_ZB b on a.pkey=b.jzpkey and a.JGID=b.JGID left join HIS_MZJS_MZFPZB c on b.pkey=c.GLZDBPKEY and b.JGID=c.JGID left join HIS_SFZD_SFXMXB d on b.pkey=d.ZDZBPKEY and b.JGID=d.JGID left join HIS_YZ_MXB e on d.YZMX=e.pkey and d.JGID=e.JGID left join HIS_SFX sfx on d.sfx=sfx.bm and d.JGID=sfx.JGID where a.JGID=? and (c.PJLX='MG' or c.PJLX='MS') and nvl(a.jjks,'%') like ? and c.SFRQ > ? and c.SFRQ <= ? and c.CHPKEY is not null and c.SFZT != 0 group by sfx.HSZFL,a.jjks +select sum(d.SFXSJZFY) fy,sfx.HSZFL fylb,a.jjks from HIS_JZ_BASEINFO a left join HIS_SFZD_ZB b on a.pkey=b.jzpkey and a.JGID=b.JGID left join HIS_MZJS_MZFPZB c on b.pkey=c.GLZDBPKEY and b.JGID=c.JGID left join HIS_SFZD_SFXMXB d on b.pkey=d.ZDZBPKEY and b.JGID=d.JGID left join HIS_YZ_MXB e on d.YZMX=e.pkey and d.JGID=e.JGID left join HIS_SFX sfx on d.sfx=sfx.bm and d.JGID=sfx.JGID where a.JGID=? and (c.PJLX='MG' or c.PJLX='MS') and nvl(a.jjks,'%') like ? and c.SFRQ > ? and c.SFRQ <= ? and c.CHPKEY is not null and c.SFZT != 0 and b.JSZT =1 group by sfx.HSZFL,a.jjks ) group by fylb,jjks @@ -805,11 +805,11 @@ order by jjks,fylb select sum(fy) fy,fylb,jjks from ( -select sum(d.SFXSJZFY) fy,sfx.BASYFL fylb,a.jjks from HIS_JZ_BASEINFO a left join HIS_SFZD_ZB b on a.pkey=b.jzpkey and a.JGID=b.JGID left join HIS_MZJS_MZFPZB c on b.pkey=c.GLZDBPKEY and b.JGID=c.JGID left join HIS_SFZD_SFXMXB d on b.pkey=d.ZDZBPKEY and b.JGID=d.JGID left join HIS_YZ_MXB e on d.YZMX=e.pkey and d.JGID=e.JGID left join HIS_SFX sfx on d.sfx=sfx.bm and d.JGID=sfx.JGID where a.JGID=? and (c.PJLX='MG' or c.PJLX='MS') and nvl(a.jjks,'%') like ? and c.SFRQ > ? and c.SFRQ <= ? and c.PJZT = 1 group by sfx.BASYFL,a.jjks +select sum(d.SFXSJZFY) fy,sfx.BASYFL fylb,a.jjks from HIS_JZ_BASEINFO a left join HIS_SFZD_ZB b on a.pkey=b.jzpkey and a.JGID=b.JGID left join HIS_MZJS_MZFPZB c on b.pkey=c.GLZDBPKEY and b.JGID=c.JGID left join HIS_SFZD_SFXMXB d on b.pkey=d.ZDZBPKEY and b.JGID=d.JGID left join HIS_YZ_MXB e on d.YZMX=e.pkey and d.JGID=e.JGID left join HIS_SFX sfx on d.sfx=sfx.bm and d.JGID=sfx.JGID where a.JGID=? and (c.PJLX='MG' or c.PJLX='MS') and nvl(a.jjks,'%') like ? and c.SFRQ > ? and c.SFRQ <= ? and c.PJZT = 1 and b.JSZT =1 group by sfx.BASYFL,a.jjks union all -select sum(d.SFXSJZFY) fy,sfx.BASYFL fylb,a.jjks from HIS_JZ_BASEINFO a left join HIS_SFZD_ZB b on a.pkey=b.jzpkey and a.JGID=b.JGID left join HIS_MZJS_MZFPZB c on b.pkey=c.GLZDBPKEY and b.JGID=c.JGID left join HIS_SFZD_SFXMXB d on b.pkey=d.ZDZBPKEY and b.JGID=d.JGID left join HIS_YZ_MXB e on d.YZMX=e.pkey and d.JGID=e.JGID left join HIS_SFX sfx on d.sfx=sfx.bm and d.JGID=sfx.JGID where a.JGID=? and (c.PJLX='MG' or c.PJLX='MS') and nvl(a.jjks,'%') like ? and c.SFRQ > ? and c.SFRQ <= ? and c.CHPKEY is not null and c.SFZT != 0 group by sfx.BASYFL,a.jjks +select sum(d.SFXSJZFY) fy,sfx.BASYFL fylb,a.jjks from HIS_JZ_BASEINFO a left join HIS_SFZD_ZB b on a.pkey=b.jzpkey and a.JGID=b.JGID left join HIS_MZJS_MZFPZB c on b.pkey=c.GLZDBPKEY and b.JGID=c.JGID left join HIS_SFZD_SFXMXB d on b.pkey=d.ZDZBPKEY and b.JGID=d.JGID left join HIS_YZ_MXB e on d.YZMX=e.pkey and d.JGID=e.JGID left join HIS_SFX sfx on d.sfx=sfx.bm and d.JGID=sfx.JGID where a.JGID=? and (c.PJLX='MG' or c.PJLX='MS') and nvl(a.jjks,'%') like ? and c.SFRQ > ? and c.SFRQ <= ? and c.CHPKEY is not null and c.SFZT != 0 and b.JSZT =1 group by sfx.BASYFL,a.jjks ) group by fylb,jjks