diff --git a/src/main/java/com/saye/hospitalgd/scheduler/jobMethod/HISGetDataMethodByJH.java b/src/main/java/com/saye/hospitalgd/scheduler/jobMethod/HISGetDataMethodByJH.java index 077ef17..d1d4eab 100644 --- a/src/main/java/com/saye/hospitalgd/scheduler/jobMethod/HISGetDataMethodByJH.java +++ b/src/main/java/com/saye/hospitalgd/scheduler/jobMethod/HISGetDataMethodByJH.java @@ -153,10 +153,6 @@ 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")); @@ -211,10 +207,6 @@ 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)){ @@ -252,7 +244,6 @@ 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 { @@ -294,7 +285,6 @@ 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 { diff --git a/src/main/resources/mapper/BankbillHistoryMapper.xml b/src/main/resources/mapper/BankbillHistoryMapper.xml index 855f0b5..078703a 100644 --- a/src/main/resources/mapper/BankbillHistoryMapper.xml +++ b/src/main/resources/mapper/BankbillHistoryMapper.xml @@ -41,42 +41,42 @@ @@ -195,24 +195,24 @@ - select count(1) as num,cast(IFNULL(sum(I_JYJE),0) as decimal(19,2)) as money - from bankbills_history + select count(1) as num,cast(IFNULL(sum(C_JYJE),0) as decimal(19,2)) as money + from bankbill_history - and I_JYRQ >= #{startTime} + and C_JYRQ >= #{startTime} - and I_JYRQ <= #{endTime} + and C_JYRQ <= #{endTime} - and I_FXK = #{c_zffs} + and C_ZFFS = #{c_zffs} - and I_DDH like concat('%',concat(#{likeFiled},'%')) + and C_YSDDH like concat('%',concat(#{likeFiled},'%'))