Ver Fonte

修复线上出错的问题

lighter há 3 anos atrás
pai
commit
ed63caced7

+ 4 - 3
src/main/java/thyyxxk/webserver/dao/his/PublicDao.java

@@ -11,6 +11,7 @@ import thyyxxk.webserver.entity.yibao.ZyActpatient;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * <p>
@@ -123,14 +124,14 @@ public interface PublicDao {
     @Select("<script>" +
             "select detail_sn,charge_fee,charge_amount from zy_detail_charge where inpatient_no=#{inpatientNo} and admiss_times = #{admissTimes} and ledger_sn = #{ledgerSn} " +
             "and detail_sn in " +
-            "<foreach collection='oriSn.keys' item='k' open='(' close=')' separator=','>" +
-            "#{k}" +
+            "<foreach collection='oriSn' item='sn' open='(' close=')' separator=','>" +
+            "#{sn}" +
             "</foreach>" +
             "</script>")
     List<ZyDetailCharge> zhenShuLiuShui(@Param("inpatientNo") String inpatientNo,
                                         @Param("admissTimes") Integer admissTimes,
                                         @Param("ledgerSn") Integer ledgerSn,
-                                        @Param("oriSn") Map<Integer, ZyDetailCharge> map);
+                                        @Param("oriSn") Set<Integer> oriSn);
 
     @Update("<script>" +
             "<foreach collection='list' item='item' separator=';'>" +

+ 1 - 1
src/main/java/thyyxxk/webserver/service/PublicServer.java

@@ -192,7 +192,7 @@ public class PublicServer {
                 Collectors.toMap(ZyDetailCharge::getOriDetailSn, a -> a, (k1, k2) -> k1)
         );
         if (!chongFuLiuShuiMap.isEmpty()) {
-            List<ZyDetailCharge> chongFuTuiFeiZhenShu = dao.zhenShuLiuShui(inpatientNo, admissTimes, ledger, chongFuLiuShuiMap);
+            List<ZyDetailCharge> chongFuTuiFeiZhenShu = dao.zhenShuLiuShui(inpatientNo, admissTimes, ledger, chongFuLiuShuiMap.keySet());
             List<Integer> xuYaoChongZhiLiuShui = new ArrayList<>();
             if (ListUtil.notBlank(chongFuTuiFeiZhenShu)) {
                 for (ZyDetailCharge zyDetailCharge : chongFuTuiFeiZhenShu) {