1.住院收费工作站-住院患者收费-重点欠费 非重点人群金额显示调整

WEB-INF/conf/sysds_main.xml

@@ -2517,6 +2517,20 @@
 		</parameter>        
 	</dao>       
 	
+	    <dao id="ScHieZddao" log="true"  type="1">
+        <sql>
+        SELECT COUNT(1) RC FROM HIS_HIE_RYBQ d 
+		WHERE d.JGID =? AND d.JZPKEY =? AND d.HJD_FLAG ='1' 
+        </sql>
+//ZJHM,ZYNO,JJRQ,YJZJE
+        <fields>
+            <f name="RC"  type="12"  />
+        </fields>
+		<parameter>
+			<p>12</p>
+			<p>12</p>
+		</parameter>    
+    </dao>
 	
     <dao id="ScHieJzdao" log="true"  type="1">
         <sql>

WEB-INF/src/com/his/zy/zysfmanage/ZysfPatientBillWindow.java

@@ -1,11 +1,8 @@
 package com.his.zy.zysfmanage;
 
 import java.sql.Timestamp;
-
 import com.dzfp.model.DzfpModel;
 import com.dzfp.service.EIService;
-import com.emr.model.BasyModel;
-import com.emr.service.BasyService;
 import com.his.hie.service.ScHieService;
 import com.his.hie.util.ScHieRybqData;
 import com.his.hie.util.ScHieUtil;
@@ -746,8 +743,10 @@ public class ZysfPatientBillWindow extends WatWebForm {
         	String jsbpkey=dbgrid1.getColumnValueAsString("YBJSB");
         	Object[] aObjRtn =null;
         	if ("0".equals(type)) {
+        		//正常结算
         		aObjRtn =ScHieService.insOrUpdMedRecDataJs(hzpkey,jzpkey,jsbpkey,edit20.getText(),edit21.getText());
     		}else {
+    			//冲销
     			aObjRtn =ScHieService.insOrUpdMedRecDataCx(hzpkey,jzpkey,jsbpkey);
     		}
     		setLabelShow("提示:"+aObjRtn[1]);
@@ -996,10 +995,18 @@ public class ZysfPatientBillWindow extends WatWebForm {
             	panelBar1.setPanelButtonVisible("cxcf", false);
 
             	panelBar5.setPanelButtonVisible("zdrq", true);
+            	//判断 是否上传诊疗信息，已上传取重点欠费金额
             	if ("1".equals(dbgrid1.getColumnValueAsString("ZDZT"))) {
                 	edit20.setText(dbgrid1.getColumnValueAsString("DATA_DEFICIENT_FEE"));
 				}else {
-					edit20.setText(dbedit3.getText());
+					//判断 是否重点人群，是取自付金额
+					//edit20.setText(dbedit3.getText());
+					DxNormalDataManager ScHieZddao= DaoCreator.getNormalDao("ScHieZddao");//
+					ScHieZddao.reload(new Object[] {dbgrid1.getColumnValueAsString("JGID"),dbgrid1.getColumnValueAsString("JZPKEY")});
+					String keyCrowd=ScHieZddao.getColumnValueAsString("RC");
+			    	if (!"0".equals(keyCrowd)) {
+						edit20.setText(dbedit3.getText());
+			    	}
 				}