项目录入优化

src/main/java/thyyxxk/webserver/dao/his/yibao/XiangMuLuRuDao.java

@@ -52,7 +52,7 @@ public interface XiangMuLuRuDao extends BaseMapper<ZyDetailCharge> {
             "            a.ori_detail_sn  " +
             "FROM zy_detail_charge a  ,zd_charge_item b,yp_zd_dict c , a_employee_mi d  " +
             "where a.charge_code=b.code and  a.serial=c.serial and a.charge_code like 'BILL%' and  c.code= a.charge_code_mx  and a.ledger_sn &gt; 0  " +
-            "and d.code = a.op_id_code and trans_flag_yb !=2 and inpatient_no = #{inpatientNo} and admiss_times = #{admissTimes} and a.infant_flag = #{infantFlag} " +
+            "and d.code = a.op_id_code and trans_flag_yb !=2 and a.order_no != 6 and inpatient_no = #{inpatientNo} and admiss_times = #{admissTimes} and a.infant_flag = #{infantFlag} " +
             "<if test=\"chargeCode != null and chargeCode != '' \">" +
             "and charge_code_mx = #{chargeCode} " +
             "</if>" +
@@ -114,7 +114,7 @@ public interface XiangMuLuRuDao extends BaseMapper<ZyDetailCharge> {
             "       where    a.inpatient_no= #{inpatientNo} and   " +
             "       a.admiss_times= #{admissTimes} and   " +
             "       a.infant_flag = #{infantFlag} and c.code = a.op_id_code and trans_flag_yb !=2   " +
-            "       AND a.charge_code not like 'BILL%' and a.ledger_sn &gt; 0  and a.charge_code=b.code " +
+            "       AND a.charge_code not like 'BILL%' and  a.order_no != 6 and a.ledger_sn &gt; 0  and a.charge_code=b.code " +
             "<if test=\"chargeCode != null and chargeCode != '' \">" +
             "and charge_code_mx = #{chargeCode} " +
             "</if>" +
@@ -150,7 +150,7 @@ public interface XiangMuLuRuDao extends BaseMapper<ZyDetailCharge> {
             "       where    a.inpatient_no= #{inpatientNo} and   " +
             "       a.admiss_times= #{admissTimes} and   " +
             "       a.infant_flag = #{infantFlag}  and trans_flag_yb !=2   " +
-            "       AND a.charge_code ${isLike} 'BILL%' and a.ledger_sn &gt;0  " +
+            "       AND a.charge_code ${isLike} 'BILL%' and a.order_no != 6 and a.ledger_sn &gt;0  " +
             "<if test=\"chargeCode != null and chargeCode != '' \">" +
             "and charge_code_mx = #{chargeCode} " +
             "</if>" +

src/main/java/thyyxxk/webserver/service/yibao/XiangMuLuRuService.java

@@ -439,7 +439,6 @@ public class XiangMuLuRuService {
                 Collectors.groupingBy(item -> item.getOrderNo() + DateUtil.formatDatetime(item.getChargeDate()) + item.getChargeCodeMx() + item.getChargeAmount() + item.getChargeFee() + item.getLedgerSn())
         );
         // 用负数拼接的 key 去查找
-        log.info("开始退费匹配住院号：{}，次数：{}", inpatientNo, admissTimes);
         for (ZyDetailCharge fuShu : getYiZhuFeiYongFuShu) {
             String key = fuShu.getOrderNo() + DateUtil.formatDatetime(fuShu.getChargeDate()) + fuShu.getChargeCodeMx() + fuShu.getChargeAmount().negate()
                     + fuShu.getChargeFee().negate() + fuShu.getLedgerSn();