diff --git a/src/main/java/com/saye/hospitalgd/scheduler/jobMethod/ReconciliationMethod.java b/src/main/java/com/saye/hospitalgd/scheduler/jobMethod/ReconciliationMethod.java index c9dc0f6..3950cbb 100644 --- a/src/main/java/com/saye/hospitalgd/scheduler/jobMethod/ReconciliationMethod.java +++ b/src/main/java/com/saye/hospitalgd/scheduler/jobMethod/ReconciliationMethod.java @@ -91,6 +91,17 @@ public class ReconciliationMethod { } searchMap.put("medical_insurance_code", medical_insurance_code); + // 查询预交金支付方式(payType=7)的dicvalue,常规对账需要排除 + String prepayment_code = ""; + HashMap prepaymentSearchMap = new HashMap<>(); + prepaymentSearchMap.put("parentCode", "PAY_TYPE"); + prepaymentSearchMap.put("dicname", "预交金"); + List> prepaymentPayTypeList = dicinfoService.selectDicinfoListByCondition(prepaymentSearchMap); + if (prepaymentPayTypeList != null && prepaymentPayTypeList.size() > 0) { + prepayment_code = StringDUtil.changeNullToEmpty(prepaymentPayTypeList.get(0).get("DICVALUE")); + } + searchMap.put("prepayment_code", prepayment_code); + //查询his和三方记录 List> hisbillsList = hisbillsHistoryService.findHisBillsByDate(searchMap); diff --git a/src/main/resources/mapper/HisbillsHistoryMapper.xml b/src/main/resources/mapper/HisbillsHistoryMapper.xml index 93128a4..91d65b9 100644 --- a/src/main/resources/mapper/HisbillsHistoryMapper.xml +++ b/src/main/resources/mapper/HisbillsHistoryMapper.xml @@ -30,6 +30,9 @@ and PayType != #{medical_insurance_code} + + and PayType != #{prepayment_code} +