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 282429e..2ab3643 100644 --- a/src/main/java/com/saye/hospitalgd/scheduler/jobMethod/ReconciliationMethod.java +++ b/src/main/java/com/saye/hospitalgd/scheduler/jobMethod/ReconciliationMethod.java @@ -101,6 +101,17 @@ public class ReconciliationMethod { prepayment_code = StringDUtil.changeNullToEmpty(prepaymentPayTypeList.get(0).get("DICVALUE")); } searchMap.put("prepayment_code", prepayment_code); + + // 查询军保支付方式的dicvalue,常规对账需要排除 + String military_payment_code = ""; + HashMap militaryPaymentSearchMap = new HashMap<>(); + militaryPaymentSearchMap.put("parentCode", "PAY_TYPE"); + militaryPaymentSearchMap.put("dicname", "军保支付"); + List> militaryPaymentPayTypeList = dicinfoService.selectDicinfoListByCondition(militaryPaymentSearchMap); + if (militaryPaymentPayTypeList != null && militaryPaymentPayTypeList.size() > 0) { + military_payment_code = StringDUtil.changeNullToEmpty(militaryPaymentPayTypeList.get(0).get("DICVALUE")); + } + searchMap.put("military_payment_code", military_payment_code); //查询his和三方记录 List> hisbillsList = hisbillsHistoryService.findHisBillsByDate(searchMap); diff --git a/src/main/resources/mapper/HisbillsHistoryMapper.xml b/src/main/resources/mapper/HisbillsHistoryMapper.xml index 91d65b9..2b105c2 100644 --- a/src/main/resources/mapper/HisbillsHistoryMapper.xml +++ b/src/main/resources/mapper/HisbillsHistoryMapper.xml @@ -33,6 +33,9 @@ and PayType != #{prepayment_code} + + and PayType != #{military_payment_code} +