develop/hrl_20241118_hzfytf

发药费用，退药费用

WEB-INF/conf/sysds_his_zyyz.xml

@@ -2965,14 +2965,11 @@ select a.PKEY,a.HZPKEY,a.JZPKEY,a.JZH,a.CFH,a.YZCL,a.YZLB,a.YZLX,a.YZXPKEY,a.YZS
 		(select sum(ZXSL) zxsl from HIS_YZ_EXEC where yzmx=a.pkey  and jzpkey=a.jzpkey and hzpkey=a.hzpkey and JGID=a.JGID and ZXFLAG='1' and SFFLAG='1') zxsl,
 
 		(select sum(ZXJE) zxje from HIS_YZ_EXEC where yzmx=a.pkey  and jzpkey=a.jzpkey and hzpkey=a.hzpkey and JGID=a.JGID and ZXFLAG='1' and SFFLAG='1') zxje,	 
-			 (select sum(cc.zxje) yffyzje 
- from HIS_YZ_EXEC cc
- where cc.JGID=a.JGID and cc.hzpkey=a.hzpkey and cc.jzpkey=a.jzpkey and cc.yzmx=a.pkey and cc.pkey in (
- select aa.exepkey from HIS_YFFY_ZYFYMXB aa left join HIS_YFFY_PYB bb on aa.PYBPKEY=bb.pkey and aa.yzmx=bb.yzmx and bb.FYZT='1' 
-  where aa.yzmx=a.pkey and aa.JGID=a.JGID and aa.hzpkey=a.hzpkey and aa.jzpkey=a.jzpkey
- ))  yffyzje,
+			 (  select sum(sfx.SFXZFY) yffyzje from HIS_YFFY_ZYFYMXB aa left join HIS_YFFY_PYB bb on aa.PYBPKEY=bb.pkey and aa.yzmx=bb.yzmx and bb.FYZT='1' right join  HIS_SFZD_SFXMXB sfx 
+	on aa.SFXPKEY=sfx.pkey and aa.JGID=sfx.JGID where  aa.yzmx=a.pkey and aa.JGID=a.JGID and aa.hzpkey=a.hzpkey and aa.jzpkey=a.jzpkey)   yffyzje,
 
-		(select sum(cc.zxje) from HIS_YFFY_ZYFYMXB aa left join HIS_YZ_EXEC cc on aa.exepkey=cc.pkey and aa.JGID=cc.JGID and aa.tysl>0 where aa.yzmx=a.pkey  and aa.jzpkey=a.jzpkey and aa.hzpkey=a.hzpkey and aa.JGID=a.JGID) yztyzje,
+		(select sum(sfx.SFXZFY) from HIS_YFFY_ZYFYMXB aa left join HIS_SFZD_SFXMXB sfx on aa.sfxpkey=sfx.pkey and aa.JGID=sfx.JGID and aa.tysl>0  where aa.yzmx=a.pkey  
+	and aa.jzpkey=a.jzpkey and aa.hzpkey=a.hzpkey and aa.JGID=a.JGID) yztyzje,
 
 		(select sum(yzsl*exec.zxje) from HIS_YFFY_PYB pyb left join HIS_YZ_EXEC exec on pyb.DFYPKEY=exec.pkey and pyb.JGID=exec.JGID where pyb.yzmx=a.pkey and pyb.JGID=a.JGID and exec.ZXFLAG=1 and pyb.FYCX=0 and exec.SFFLAG=1 and pyb.FYZT=0) sfdfyzje,
 

release/20241113_1022.text

@@ -52,6 +52,9 @@ develop/xl_20241119_hcmer_dzqh
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 
 <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+develop/hrl_20241118_hzfytf
+
+发药费用，退药费用
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 
 <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<