From b3624da4bc293f37ea542a7b0d397ebf559cd6fd Mon Sep 17 00:00:00 2001
From: lxx <466693313@qq.com>
Date: Tue, 12 Nov 2024 16:37:21 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=A8=E8=AF=8A=E6=94=B6=E8=B4=B9=E7=BC=B4?=
 =?UTF-8?q?=E6=AC=BE=E5=8D=95=E8=B0=83=E6=95=B4=EF=BC=9Ajsb=E8=A1=A8?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4=E5=85=B1=E6=B5=8E=E7=BB=93=E7=AE=97=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WEB-INF/conf/sysds_jimureport_sfcbb.xml | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/WEB-INF/conf/sysds_jimureport_sfcbb.xml b/WEB-INF/conf/sysds_jimureport_sfcbb.xml
index c354c13..efb0d3a 100644
--- a/WEB-INF/conf/sysds_jimureport_sfcbb.xml
+++ b/WEB-INF/conf/sysds_jimureport_sfcbb.xml
@@ -150,7 +150,7 @@ where a.JGID=? and b.JZZT=? and b.SFZT != '0' and a.ZFJE >= 0  and b.SFRY=? and
 select distinct a.pkey,b.pkey mzfppkey,a.ZFLX,a.ZFJE,nvl(c.INSUTYPE,'') INSUTYPE,c.cxzt,c.SETL_ID 
 from HIS_MZJS_MZFPZFFSB a 
 left join HIS_MZJS_MZFPZB b on a.MZFPPKEY=b.pkey and b.JGID=a.JGID 
-left join HIS_YB_JSB c on c.ZDZBPKEY=b.GLZDBPKEY  
+left join HIS_YB_JSB c on c.ZDZBPKEY=b.GLZDBPKEY  and c.GJ_FLAG !='1'
 where a.JGID=? and b.JZZT=? and b.SFZT != '0' and a.ZFJE >= 0  and b.SFRY=? and b.PJLX=? and b.SFRQ > ? and b.SFRQ <=?  and b.pjzt='1'  and (c.cxzt=0 or (c.cxzt='1' and c.OLD_SETL_ID is null) or c.cxzt is null)  order by zflx 
         ]]></sql>
         <fields>
@@ -177,7 +177,7 @@ where a.JGID=? and b.JZZT=? and b.SFZT != '0' and a.ZFJE >= 0  and b.SFRY=? and
 select distinct a.pkey,b.pkey mzfppkey,a.ZFLX,a.ZFJE,nvl(c.INSUTYPE,'') INSUTYPE,c.cxzt,c.SETL_ID 
 from HIS_MZJS_MZFPZFFSB a 
 left join HIS_MZJS_MZFPZB b on a.MZFPPKEY=b.pkey and b.JGID=a.JGID 
-left join HIS_YB_JSB c on c.ZDZBPKEY=b.GLZDBPKEY  
+left join HIS_YB_JSB c on c.ZDZBPKEY=b.GLZDBPKEY  and c.GJ_FLAG !='1'
 where a.JGID=? and b.JZZT=? and b.SFZT != '0' and a.ZFJE < 0  and b.SFRY=? and b.PJLX=? and b.SFRQ > ? and b.SFRQ <=?  and b.pjzt='1'  and (c.cxzt=0 or (c.cxzt='1' and c.OLD_SETL_ID is null) or c.cxzt is null)  order by zflx 
         ]]></sql>
         <fields>
@@ -204,7 +204,7 @@ where a.JGID=? and b.JZZT=? and b.SFZT != '0' and a.ZFJE < 0  and b.SFRY=? and b
  select zflx,sum(zfje)zfje,insutype from( select distinct b.pkey,a.ZFLX,a.ZFJE,c.INSUTYPE from HIS_MZJS_MZFPZFFSB a 
 left join HIS_MZJS_MZFPZB b on a.MZFPPKEY=b.pkey and b.JGID=a.JGID  
 left join HIS_MZJS_MZFPZB e on b.CHPKEY=e.pkey and b.JGID=e.JGID 
-left join HIS_YB_JSB c on c.ZDZBPKEY=e.GLZDBPKEY 
+left join HIS_YB_JSB c on c.ZDZBPKEY=e.GLZDBPKEY and c.GJ_FLAG !='1'
 where a.JGID=? and b.JZZT=? and b.SFZT != '0' and a.ZFJE < 0  and b.SFRY=? and b.PJLX=? and b.SFRQ > ? and b.SFRQ <=?  and b.PJZT = '2'  and ((c.cxzt='1' and c.OLD_SETL_ID is not null) or c.cxzt is null)) group by zflx,INSUTYPE order by zflx 
 
     
@@ -248,7 +248,11 @@ where a.JGID=? and b.JZZT=? and b.SFZT != '0' and a.ZFJE < 0  and b.SFRY=? and b
 
 	     <dao id="sfzffsZsByJzhMxDao" log="true"  type="1" memo="收费支付方式正数的明细dao">
         <sql><![CDATA[
-select distinct a.pkey,b.pkey mzfppkey,a.ZFLX,a.ZFJE,nvl(c.INSUTYPE,'') INSUTYPE,c.cxzt,c.SETL_ID from HIS_MZJS_MZFPZFFSB a left join HIS_MZJS_MZFPZB b on a.MZFPPKEY=b.pkey and b.JGID=a.JGID left join HIS_YB_JSB c on c.ZDZBPKEY=b.GLZDBPKEY  where a.JGID=? and b.JZZT=? and b.SFZT != '0' and a.ZFJE >= 0  and b.SFRY=? and b.PJLX=? and b.CLOSEPKEY=? and b.pjzt='1'  and (c.cxzt=0 or (c.cxzt='1' and c.OLD_SETL_ID is null) or c.cxzt is null) order by zflx
+select distinct a.pkey,b.pkey mzfppkey,a.ZFLX,a.ZFJE,nvl(c.INSUTYPE,'') INSUTYPE,c.cxzt,c.SETL_ID 
+from HIS_MZJS_MZFPZFFSB a 
+left join HIS_MZJS_MZFPZB b on a.MZFPPKEY=b.pkey and b.JGID=a.JGID 
+left join HIS_YB_JSB c on c.ZDZBPKEY=b.GLZDBPKEY  and c.GJ_FLAG !='1'
+where a.JGID=? and b.JZZT=? and b.SFZT != '0' and a.ZFJE >= 0  and b.SFRY=? and b.PJLX=? and b.CLOSEPKEY=? and b.pjzt='1'  and (c.cxzt=0 or (c.cxzt='1' and c.OLD_SETL_ID is null) or c.cxzt is null) order by zflx
  
         
         ]]></sql>
@@ -272,7 +276,10 @@ select distinct a.pkey,b.pkey mzfppkey,a.ZFLX,a.ZFJE,nvl(c.INSUTYPE,'') INSUTYPE
 
    <dao id="sfzffsZsTfByJzhMxDao" log="true"  type="1" memo="收费支付方式退费的明细dao">
         <sql><![CDATA[
-select distinct a.pkey,b.pkey mzfppkey,a.ZFLX,a.ZFJE,nvl(c.INSUTYPE,'') INSUTYPE,c.cxzt,c.SETL_ID from HIS_MZJS_MZFPZFFSB a left join HIS_MZJS_MZFPZB b on a.MZFPPKEY=b.pkey and b.JGID=a.JGID left join HIS_YB_JSB c on c.ZDZBPKEY=b.GLZDBPKEY  where a.JGID=? and b.JZZT=? and b.SFZT != '0' and a.ZFJE < 0  and b.SFRY=? and b.PJLX=? and b.CLOSEPKEY=? and b.pjzt='1'  and (c.cxzt=0 or (c.cxzt='1' and c.OLD_SETL_ID is null) or c.cxzt is null) order by zflx
+select distinct a.pkey,b.pkey mzfppkey,a.ZFLX,a.ZFJE,nvl(c.INSUTYPE,'') INSUTYPE,c.cxzt,c.SETL_ID from HIS_MZJS_MZFPZFFSB a 
+left join HIS_MZJS_MZFPZB b on a.MZFPPKEY=b.pkey and b.JGID=a.JGID 
+left join HIS_YB_JSB c on c.ZDZBPKEY=b.GLZDBPKEY  and c.GJ_FLAG !='1'
+where a.JGID=? and b.JZZT=? and b.SFZT != '0' and a.ZFJE < 0  and b.SFRY=? and b.PJLX=? and b.CLOSEPKEY=? and b.pjzt='1'  and (c.cxzt=0 or (c.cxzt='1' and c.OLD_SETL_ID is null) or c.cxzt is null) order by zflx
  
         
         ]]></sql>
@@ -296,7 +303,11 @@ select distinct a.pkey,b.pkey mzfppkey,a.ZFLX,a.ZFJE,nvl(c.INSUTYPE,'') INSUTYPE
             
      <dao id="sfzffsFsByJzhDao" log="true"  type="1" memo="收费支付方式负数的合计dao">
         <sql><![CDATA[
- select zflx,sum(zfje)zfje,insutype from( select distinct b.pkey,a.ZFLX,a.ZFJE,c.INSUTYPE from HIS_MZJS_MZFPZFFSB a left join HIS_MZJS_MZFPZB b on a.MZFPPKEY=b.pkey and b.JGID=a.JGID  left join HIS_MZJS_MZFPZB e on b.CHPKEY=e.pkey and b.JGID=e.JGID left join HIS_YB_JSB c on c.ZDZBPKEY=e.GLZDBPKEY where a.JGID=? and b.JZZT=? and b.SFZT != '0' and a.ZFJE < 0  and b.SFRY=? and b.PJLX=? and b.CLOSEPKEY =?  and b.PJZT = '2' and ((c.cxzt='1' and c.OLD_SETL_ID is not null) or c.cxzt is null) order by a.zflx )  group by zflx,INSUTYPE order by zflx
+ select zflx,sum(zfje)zfje,insutype from( select distinct b.pkey,a.ZFLX,a.ZFJE,c.INSUTYPE from HIS_MZJS_MZFPZFFSB a 
+ left join HIS_MZJS_MZFPZB b on a.MZFPPKEY=b.pkey and b.JGID=a.JGID  
+ left join HIS_MZJS_MZFPZB e on b.CHPKEY=e.pkey and b.JGID=e.JGID 
+ left join HIS_YB_JSB c on c.ZDZBPKEY=e.GLZDBPKEY and c.GJ_FLAG !='1'
+ where a.JGID=? and b.JZZT=? and b.SFZT != '0' and a.ZFJE < 0  and b.SFRY=? and b.PJLX=? and b.CLOSEPKEY =?  and b.PJZT = '2' and ((c.cxzt='1' and c.OLD_SETL_ID is not null) or c.cxzt is null) order by a.zflx )  group by zflx,INSUTYPE order by zflx
       
       
         ]]></sql>