develop/xl_20241203_srfltj

收入分类统计修正

WEB-INF/src/com/his/cwgl/ksbb/fybb/SrfltjForm.java

@@ -3,9 +3,7 @@ package com.his.cwgl.ksbb.fybb;
 import java.sql.Timestamp;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
-import java.util.Date;
 import java.util.HashMap;
-import com.his.util.DateTimeUtils;
 import com.util.MainUtil;
 import com.wat.component.DxComboBox;
 import com.wat.component.DxDateTimePick;
@@ -118,7 +116,7 @@ public class SrfltjForm extends WatWebForm {
 		}
 		
 		if (dcbWay.getSelectedIndex()==1) {
-			strPjlxstr+=" and dj.djcxzt='0'  and js.CXZT='0' and dj.MDTRT_ID is not null";
+			strPjlxstr+=" and dj.djcxzt='0'  and exists (select 1 from HIS_YB_JSB js where dj.JGID=js.JGID and dj.IPT_NO=js.IPT_NO and dj.MDTRT_ID=js.MDTRT_ID and js.cxzt='0') and dj.MDTRT_ID is not null";
 		}
 		
 		

WEB-INF/src/com/his/cwgl/ksbb/fybb/SrfltjForm.xml

@@ -125,7 +125,7 @@
 						left join MAIN_JGZDB fydlzd on fydlzd.JGID = sfx.JGID and fydlzd.JGZDLB_BH = 'Z00003' and fydlzd.BH = sfx.FYDL
 						left join MAIN_JGZDB fyzlzd on fyzlzd.JGID = sfx.JGID and fyzlzd.JGZDLB_BH = 'Z00004' and fyzlzd.BH = sfx.FYZL
 						left join HIS_YB_DJ dj on b.pkey=dj.ZDZBPKEY and b.JGID=dj.JGID  and dj.djcxzt='0' 
-						left join HIS_YB_JSB js on dj.JGID=js.JGID and dj.IPT_NO=js.IPT_NO and dj.MDTRT_ID=js.MDTRT_ID and js.cxzt='0'
+						--left join HIS_YB_JSB js on dj.JGID=js.JGID and dj.IPT_NO=js.IPT_NO and dj.MDTRT_ID=js.MDTRT_ID and js.cxzt='0'
 					WHERE
 						a.JGID =?
 						AND c.SFRQ >=?

release/20241120_1738.text

@@ -29,6 +29,9 @@ develop/hrl20241203_jmbbxg
 ...........................................................................................................................................
 
 <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+develop/xl_20241203_srfltj
+
+收入分类统计修正
 ...........................................................................................................................................
 
 <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<