ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
@@ -542,7 +542,7 @@ } else { tjProjectList = detailService.selectTjOrderDetailListByFlowingWaterIdIsNotNull(OrderId); } String pacId = transitionService.selectPacIdByTbTransitionTjNumAndProId(order.getTjNumber()); String pacId = transitionService.selectPacIdByTbTransitionTjNumAndProId(order.getTjNumber(),order.getCardId()); String s = tjFlowingWaterService.getDiscount(OrderId); if (null != tjProjectList && tjProjectList.size() > 0) { for (TjProject project : tjProjectList) { @@ -634,7 +634,7 @@ wq.ne(TjOrderDetail::getTjStatus, 3); wq.isNotNull(TjOrderDetail::getFlowingWaterId); List<TjOrderDetail> detailList = detailService.list(wq); String pacId = transitionService.selectPacIdByTbTransitionTjNumAndProId(tjOrder.getTjNumber()); String pacId = transitionService.selectPacIdByTbTransitionTjNumAndProId(tjOrder.getTjNumber(),tjOrder.getCardId()); if (null != detailList && detailList.size() > 0) { List<TjRefundProInfoVo> tjRefundProInfoVoList = new ArrayList<>(); for (TjOrderDetail detail : detailList) { ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java
@@ -209,6 +209,6 @@ "WHERE a.cus_id=#{cusId}) AND b.parent_pro_id=#{proId}) ") BigDecimal getTbTransitionDxPriceAndOrdPrice(@Param("cusId")String cusId,@Param("proId")Long proId); @Select("SELECT DISTINCT a.pac_id FROM tb_transition a WHERE a.tj_num=#{tjNum}") String selectPacIdByTbTransitionTjNumAndProId(@Param("tjNum")String tjNum); @Select("SELECT DISTINCT a.pac_id FROM tb_transition a WHERE a.tj_num=#{tjNum}AND a.card_id=#{cardId}") String selectPacIdByTbTransitionTjNumAndProId(@Param("tjNum")String tjNum,@Param("cardId")String cardId); } ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITbTransitionService.java
@@ -107,5 +107,5 @@ BigDecimal getTbTransitionDxPriceAndOrdPrice(String cusId,Long proId); String selectPacIdByTbTransitionTjNumAndProId(String tjNum); String selectPacIdByTbTransitionTjNumAndProId(String tjNum,String cardId); } ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TbTransitionServiceImpl.java
@@ -168,7 +168,7 @@ } @Override public String selectPacIdByTbTransitionTjNumAndProId(String tjNum) { return tbTransitionMapper.selectPacIdByTbTransitionTjNumAndProId(tjNum); public String selectPacIdByTbTransitionTjNumAndProId(String tjNum,String cardId) { return tbTransitionMapper.selectPacIdByTbTransitionTjNumAndProId(tjNum,cardId); } }
