nxwj/dzpt
3
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

37
src/main/java/com/saye/hospitalgd/controller/HisDetailController.java
View File

@@ -160,12 +160,12 @@ public class HisDetailController {
List<HashMap<Object, Object>> list = hisDetailService.findHisDetail(map);
// 支付方式
List<Dicinfo> pay_type = dicinfoService.findDicinfoTreeNodeList("PAY_TYPE");
HashMap<String, String> peyTypeMap = new HashMap<>();
for (Dicinfo dicinfo : pay_type) {
peyTypeMap.put(dicinfo.getDicvalue(), dicinfo.getDicname());
}
// 支付方式 - 不再使用字典转换，直接显示原始值
// List<Dicinfo> pay_type = dicinfoService.findDicinfoTreeNodeList("PAY_TYPE");
// HashMap<String, String> peyTypeMap = new HashMap<>();
// for (Dicinfo dicinfo : pay_type) {
// peyTypeMap.put(dicinfo.getDicvalue(), dicinfo.getDicname());
// }
// 业务类型
List<Dicinfo> biz_type = dicinfoService.findDicinfoTreeNodeList("BIZ_TYPE");
@@ -175,36 +175,37 @@ public class HisDetailController {
}
for (HashMap<Object, Object> hashMap : list) {
String paymethod = StringDUtil.changeNullToEmpty(hashMap.get("VISITZORG"));
String paymethod = StringDUtil.changeNullToEmpty(hashMap.get("PAYMETHOD"));
if ("1".equals(paymethod)) {
hashMap.put("VISITZORG", "门诊");
hashMap.put("PAYMETHOD", "门诊");
} else if ("2".equals(paymethod)) {
hashMap.put("VISITZORG", "住院");
hashMap.put("PAYMETHOD", "住院");
} else {
hashMap.put("VISITZORG", "");
hashMap.put("PAYMETHOD", "");
}
String tradingStatus = StringDUtil.changeNullToEmpty(hashMap.get("H_JYLX"));
String tradingStatus = StringDUtil.changeNullToEmpty(hashMap.get("TRADINGSTATUS"));
if ("1".equals(tradingStatus)) {
hashMap.put("H_JYLX", "收款记录");
hashMap.put("TRADINGSTATUS", "收款记录");
} else if ("2".equals(tradingStatus)) {
hashMap.put("H_JYLX", "退款记录");
hashMap.put("TRADINGSTATUS", "退款记录");
} else {
hashMap.put("H_JYLX", "");
hashMap.put("TRADINGSTATUS", "");
}
String biztype = StringDUtil.changeNullToEmpty(hashMap.get("BIZTYPE"));
hashMap.put("BIZTYPE", bizTypeMap.get(biztype));
String paytype = StringDUtil.changeNullToEmpty(hashMap.get("PAYTYPE"));
hashMap.put("PAYTYPE", peyTypeMap.get(paytype));
// 支付方式 - 直接使用原始值，不进行字典转换
// String paytype = StringDUtil.changeNullToEmpty(hashMap.get("PAYTYPE"));
// hashMap.put("PAYTYPE", peyTypeMap.get(paytype));
}
if (list.size() > 0) {
// 定义标题头和文件名
String[] DISTANCE_HEADERNAME = {"交易状态", "业务类型", "支付方式", "交易时间", "交易日期", "操作员", "总金额", "平台交易号", "his订单号", "患者id", "患者姓名", "来源"};
String[] sqlKey = {"TRADINGSTATUS", "BIZTYPE", "PAYTYPE", "TRADETIME", "TRADE_DATE", "HISOPERCODE", "AMOUNT", "PLATFORMTRANSID", "HISTRANSID", "PATIENTID", "PATIENTNAME", "SOURCE"};
String[] DISTANCE_HEADERNAME = {"交易状态", "业务类型", "支付方式", "交易时间", "交易日期", "操作员", "总金额", "平台交易号", "his订单号", "HIS交易ID", "患者id", "患者姓名", "来源"};
String[] sqlKey = {"TRADINGSTATUS", "BIZTYPE", "PAYTYPE", "TRADETIME", "TRADE_DATE", "HISOPERCODE", "AMOUNT", "PLATFORMTRANSID", "HISTRANSID", "HISTRANSID", "PATIENTID", "PATIENTNAME", "SOURCE"};
List<Object> rulList = new ArrayList<Object>(list);

16
src/main/java/com/saye/hospitalgd/controller/ThirdDetailController.java
View File

@@ -225,17 +225,17 @@ public class ThirdDetailController {
}
for (HashMap<Object, Object> hashMap : list) {
String i_fxk = StringDUtil.changeNullToEmpty(hashMap.get("I_FXK"));
hashMap.put("I_FXK", peyTypeMap.get(i_fxk));
String c_zffs = StringDUtil.changeNullToEmpty(hashMap.get("C_ZFFS"));
hashMap.put("C_ZFFS", peyTypeMap.get(c_zffs));
}
HashMap<Object, Object> tjMap = new HashMap<>();
tjMap.put("I_JZRQ", "合计：");
tjMap.put("I_YHLSH", "交易笔数共" + thirdDetailCount.get(0).get("NUM") + "笔,汇总金额" + thirdDetailCount.get(0).get("MONEY") + "元");
tjMap.put("C_QSRQ", "合计：");
tjMap.put("C_LSH", "交易笔数共" + thirdDetailCount.get(0).get("NUM") + "笔,汇总金额" + thirdDetailCount.get(0).get("MONEY") + "元");
list.add(tjMap);
if (list.size() > 0) {
//定义标题头和文件名
String[] DISTANCE_HEADERNAME = {"交易时间", "交易日期", "记账日期", "银行流水号", "商户流水号", "订单号", "订单状态", "付款方账号/客户号", "付款方户名", "订单金额", "交易金额", "手续费", "结算金额", "柜台代码", "发卡行/通道", "支付卡种", "交易类型", "期数", "授权号", "项目号", "基本户", "备注一"};
String[] sqlKey = {"I_JYSJ", "I_JYRQ", "I_JZRQ", "I_YHLSH", "I_SHLSH", "I_DDH", "I_DDZT", "I_FKFZH", "I_FKFHM", "I_DDJE", "I_JYJE", "I_SXF", "I_JSJE", "I_GTDM", "I_FXK", "I_ZFKZ", "I_JYLX", "I_QS", "I_SQH", "I_XMH", "I_JBH", "I_BZ"};
String[] DISTANCE_HEADERNAME = {"交易日期", "交易时间", "清算日期", "流水号", "商户订单号", "银商订单号", "交易类型", "卡号", "发卡行", "交易金额", "清算金额", "手续费", "实际支付金额", "终端号", "支付方式", "卡类型", "交易类型", "分期期数"};
String[] sqlKey = {"C_JYRQ", "C_JYSJ", "C_QSRQ", "C_LSH", "C_SHDDH", "C_YSDDH", "C_JYLX", "C_CARD", "C_FKH", "C_JYJE", "C_QSJE", "C_SXF", "C_SJZFJE", "C_ZDH", "C_ZFFS", "C_KLX", "C_JYLX", "C_FQQS"};
List<Object> rulList = new ArrayList<Object>(list);
@@ -267,10 +267,6 @@ public class ThirdDetailController {
exportXLS.modifyWidthOfHeader("10000", 15);
exportXLS.modifyWidthOfHeader("6000", 16);
exportXLS.modifyWidthOfHeader("5000", 17);
exportXLS.modifyWidthOfHeader("5000", 18);
exportXLS.modifyWidthOfHeader("5000", 19);
exportXLS.modifyWidthOfHeader("5000", 20);
exportXLS.modifyWidthOfHeader("5000", 21);
// 文件名称
//产生4位长度的随机码（由字母和数字组成）

2
src/main/java/com/saye/hospitalgd/mapper/HisDetailMapper.java
View File

@@ -10,6 +10,8 @@ public interface HisDetailMapper {
List<HashMap<Object, Object>> findHisDetail(HashMap<Object, Object> map) throws Exception;
long findHisDetailCount(HashMap<Object, Object> map) throws Exception;
void deleteHisBillOriginalByParam(HashMap<Object, Object> deleteMap) throws Exception;
void deleteHisBillByParam(HashMap<Object, Object> deleteMap) throws Exception;

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 {

2
src/main/java/com/saye/hospitalgd/service/HisDetailService.java
View File

@@ -7,6 +7,8 @@ public interface HisDetailService {
List<HashMap<Object, Object>> findHisDetail(HashMap<Object, Object> map) throws Exception;
long findHisDetailCount(HashMap<Object, Object> map) throws Exception;
void insertHisBillOriginal(List<HashMap<Object, Object>> list, String trade_date, String his_wsdl_id) throws Exception;
void insertHisBillOriginalWN(List<HashMap<Object, Object>> list, String trade_date, String his_wsdl_id) throws Exception;

5
src/main/java/com/saye/hospitalgd/service/impl/HisDetailServiceImpl.java
View File

@@ -28,6 +28,11 @@ public class HisDetailServiceImpl implements HisDetailService {
return hisDetailMapper.findHisDetail(map);
}
@Override
public long findHisDetailCount(HashMap<Object, Object> map) throws Exception {
return hisDetailMapper.findHisDetailCount(map);
}
/**
* @description: 中联的原始记录表添加
* @author thuang

1
src/main/java/com/saye/hospitalgd/util/HisUtil.java
View File

@@ -782,6 +782,7 @@ public class HisUtil {
addMap.put("hisTime", hisTime);
addMap.put("hisOperCode", hisOperNum); // 修改字段名以匹配HISGetDataMethodByJH中的使用
addMap.put("powerTranID", powerTranID);
addMap.put("hisTransId", receiptNO); // 新增HisTransId字段，使用ReceiptNO的值
addList.add(addMap);
}