From 282978d1e4faecbb5c6dbaab48e579a5765c8f70 Mon Sep 17 00:00:00 2001
From: lxx <466693313@qq.com>
Date: Tue, 31 Dec 2024 14:21:29 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BD=8F=E9=99=A2=E6=94=B6=E8=B4=B9=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E7=AB=99-=E4=BD=8F=E9=99=A2=E6=82=A3=E8=80=85?=
 =?UTF-8?q?=E6=94=B6=E8=B4=B9-=E9=87=8D=E7=82=B9=E6=AC=A0=E8=B4=B9=20=20?=
 =?UTF-8?q?=E9=9D=9E=E9=87=8D=E7=82=B9=E4=BA=BA=E7=BE=A4=E9=87=91=E9=A2=9D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WEB-INF/conf/sysds_main.xml                               | 14 ++++++++++++++
 .../src/com/his/zy/zysfmanage/ZysfPatientBillWindow.java  | 15 +++++++++++----
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/conf/sysds_main.xml b/WEB-INF/conf/sysds_main.xml
index 3a3e186..f4b26d8 100644
--- a/WEB-INF/conf/sysds_main.xml
+++ b/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>
diff --git a/WEB-INF/src/com/his/zy/zysfmanage/ZysfPatientBillWindow.java b/WEB-INF/src/com/his/zy/zysfmanage/ZysfPatientBillWindow.java
index 9379a8a..74cffa1 100644
--- a/WEB-INF/src/com/his/zy/zysfmanage/ZysfPatientBillWindow.java
+++ b/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());
+			    	}
 				}