l1450637472/dzpt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update:his账单明细查询页面

Browse Source
This commit is contained in:
Yuan
2025-08-21 10:00:57 +08:00
parent f18ec9ff2e
commit b636852ad7
10 changed files with 128 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/saye/hospitalgd/scheduler/jobMethod/HISGetDataMethodByJH.java
View File

@@ -153,6 +153,10 @@ public class HISGetDataMethodByJH {
//数据类型 1-门诊 2-住院 无需修改
String payMethod = StringDUtil.changeNullToEmpty(hisBillHashMap.get("visitzOrg"));
// 添加调试日志，查看payMethod的值和来源
log.info("患者: {}, 从visitzOrg获取的payMethod值: {}",
StringDUtil.changeNullToEmpty(hisBillHashMap.get("patientName")), payMethod);
//业务类型 0发病历1办卡2就诊卡充值3当日挂号-3 挂号退费4门诊缴费-4 单据退费5现场预约-5 预约退费6预约取号7住院缴费-7出院结算退费-77 预存作废退费
String bizType = StringDUtil.changeNullToEmpty(hisBillHashMap.get("bizType"));
@@ -191,6 +195,7 @@ public class HISGetDataMethodByJH {
//交易日期
String thistrade_date = StringDUtil.changeNullToEmpty(hisBillHashMap.get("trade_date"));
//接口厂商
HashMap<Object,Object> addMap=new HashMap<>();
addMap.put("payMethod",payMethod);
@@ -206,6 +211,10 @@ public class HISGetDataMethodByJH {
addMap.put("patientName",patientName);
addMap.put("trade_date",thistrade_date);
addMap.put("his_wsdl_id",his_wsdl_id);
//新增HisTransId字段，使用ReceiptNO
String hisTransId = StringDUtil.changeNullToEmpty(hisBillHashMap.get("receiptNO"));
addMap.put("hisTransId", hisTransId);
//如果是现金记录先放进现金集合内
if (cash_code.equals(payType)){
@@ -243,6 +252,7 @@ public class HISGetDataMethodByJH {
addMap.put("patientName","");
addMap.put("trade_date",trade_date);
addMap.put("his_wsdl_id",his_wsdl_id);
addMap.put("hisTransId",""); // 现金记录HisTransId为空
cashMap.put(hisOperCode+"_"+payMethod,addMap);
}else {
@@ -284,6 +294,7 @@ public class HISGetDataMethodByJH {
addMap.put("patientName","");
addMap.put("trade_date",trade_date);
addMap.put("his_wsdl_id",his_wsdl_id);
addMap.put("hisTransId",""); // 支票记录HisTransId为空
zhipiaoMap.put(hisOperCode+"_"+payMethod,addMap);
}else {