nxwj/dzpt
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bugfix：过滤军保支付对账

Browse Source
This commit is contained in:
Yuan
2025-11-19 11:37:49 +08:00
parent 9d3dd6c048
commit 0a344423e5
3 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -102,6 +102,17 @@ public class ReconciliationMethod {
} }
searchMap.put("prepayment_code", prepayment_code); searchMap.put("prepayment_code", prepayment_code);
// 查询军保支付方式的dicvalue，常规对账需要排除
String military_payment_code = "";
HashMap<String, String> militaryPaymentSearchMap = new HashMap<>();
militaryPaymentSearchMap.put("parentCode", "PAY_TYPE");
militaryPaymentSearchMap.put("dicname", "军保支付");
List<HashMap<Object, Object>> 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和三方记录 //查询his和三方记录
List<HashMap<Object, Object>> hisbillsList = hisbillsHistoryService.findHisBillsByDate(searchMap); List<HashMap<Object, Object>> hisbillsList = hisbillsHistoryService.findHisBillsByDate(searchMap);

6
src/main/resources/mapper/HisbillsHistoryMapper.xml
View File

@@ -33,6 +33,9 @@
<if test="prepayment_code != null and prepayment_code != ''"> <if test="prepayment_code != null and prepayment_code != ''">
and PayType != #{prepayment_code} and PayType != #{prepayment_code}
</if> </if>
<if test="military_payment_code != null and military_payment_code != ''">
and PayType != #{military_payment_code}
</if>
</select> </select>
<select id="findHisDetailByParam" parameterType="HashMap" resultType="HashMap"> <select id="findHisDetailByParam" parameterType="HashMap" resultType="HashMap">
@@ -62,6 +65,9 @@
<if test="prepayment_code != null and prepayment_code != ''"> <if test="prepayment_code != null and prepayment_code != ''">
and PayType != #{prepayment_code} and PayType != #{prepayment_code}
</if> </if>
<if test="military_payment_code != null and military_payment_code != ''">
and PayType != #{military_payment_code}
</if>
<if test="tranID!=null and tranID!=''"> <if test="tranID!=null and tranID!=''">
and HisTransId=#{tranID} and HisTransId=#{tranID}
</if> </if>

12
src/main/resources/mapper/TransactionDetailMapper.xml
View File

@@ -83,6 +83,9 @@
<if test="prepayment_code != null and prepayment_code != ''"> <if test="prepayment_code != null and prepayment_code != ''">
and a.PayType != #{prepayment_code} and a.PayType != #{prepayment_code}
</if> </if>
<if test="military_payment_code != null and military_payment_code != ''">
and a.PayType != #{military_payment_code}
</if>
<if test="excludeMilitaryOperators != null and excludeMilitaryOperators.size() > 0"> <if test="excludeMilitaryOperators != null and excludeMilitaryOperators.size() > 0">
and a.HisOperCode not in and a.HisOperCode not in
<foreach collection="excludeMilitaryOperators" item="operator" open="(" separator="," close=")"> <foreach collection="excludeMilitaryOperators" item="operator" open="(" separator="," close=")">
@@ -126,6 +129,9 @@
<if test="prepayment_code != null and prepayment_code != ''"> <if test="prepayment_code != null and prepayment_code != ''">
and payType!=#{prepayment_code} and payType!=#{prepayment_code}
</if> </if>
<if test="military_payment_code != null and military_payment_code != ''">
and payType!=#{military_payment_code}
</if>
) a ) a
inner join inner join
(select * from bankbill_history where C_JYRQ = #{trade_date}) b (select * from bankbill_history where C_JYRQ = #{trade_date}) b
@@ -166,6 +172,9 @@
<if test="prepayment_code != null and prepayment_code != ''"> <if test="prepayment_code != null and prepayment_code != ''">
and payType!=#{prepayment_code} and payType!=#{prepayment_code}
</if> </if>
<if test="military_payment_code != null and military_payment_code != ''">
and payType!=#{military_payment_code}
</if>
) a ) a
left join left join
(select * from bankbill_history where C_JYRQ = #{trade_date}) b (select * from bankbill_history where C_JYRQ = #{trade_date}) b
@@ -207,6 +216,9 @@
<if test="prepayment_code != null and prepayment_code != ''"> <if test="prepayment_code != null and prepayment_code != ''">
and payType!=#{prepayment_code} and payType!=#{prepayment_code}
</if> </if>
<if test="military_payment_code != null and military_payment_code != ''">
and payType!=#{military_payment_code}
</if>
) a ) a
right join right join
(select * from bankbill_history where C_JYRQ = #{trade_date}) b (select * from bankbill_history where C_JYRQ = #{trade_date}) b