zjh 2024/03/26--1

zjh

2024-03-26 e62aa00fe99dd983f35dc09830d3166bc46b1fb1

zjh 2024/03/26--1

 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java

@@ -207,7 +207,7 @@
        TjOrder order = orderService.getById(tjFlowingWater.getOrderId());
        TjCustomer customer = customerService.getById(order.getUserId());
        if (null != tjFlowingWater.getTjProIds() && tjFlowingWater.getTjProIds().length > 0) {
            tjFlowingWater.setWaterId(PinyinUtil.getFirstLetter(customer.getCusName(), "").toUpperCase() + DateUtil.format(new Date(), "yyMMddHHmmssSSS"));
            tjFlowingWater.setWaterId(PinyinUtil.getFirstLetter(customer.getCusName(), "").toUpperCase() +SecurityUtils.getUsername() + DateUtil.format(new Date(), "yyMMddHHmmssSSS"));
            tjFlowingWater.setIsAddition("Y");
            if (tjFlowingWaterService.save(tjFlowingWater)) {
                //异步单项收费明细

 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java

@@ -1712,7 +1712,7 @@
        tjOrderDetailService.saveTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()));
        tjOrderDetailService.saveTjPureToneTesByCusId(tjCustomer.getCusIdcard(), tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()));
        //修改每项的原价现价 //修改临时表体检号
        transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(), discount, tjOrder.getTjNumber());
//        transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(), discount, tjOrder.getTjNumber());
        //添加remark表数据
        remarkService.saveTjOrderRemarkByOrderId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjOrder.getOrderId()));
        //判断是否交钱

 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjFlowingWaterMapper.java

@@ -72,7 +72,7 @@
            "    tj_flowing_water b ON a.order_id = b.order_id WHERE a.tj_number =#{tjNum} AND a.deleted='0' AND b.deleted='0'")
    List<String> getFlowingWaterIds(String tjNum);

    @Select("\tSELECT a.discount/10 FROM tj_flowing_water a WHERE 1=1 AND a.deleted =0 AND  a.order_id=#{orderId} AND a.discount !='/'")
    @Select("SELECT a.discount/10 FROM tj_flowing_water a WHERE 1=1 AND a.deleted =0 AND  a.order_id=#{orderId} AND a.discount !='/'AND a.is_addition='N' AND a.pay_stasus !=2 ")
    String getDiscount(String orderId);



 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java

@@ -68,14 +68,14 @@
     * 查询已缴费项目
     */
    @Select("SELECT * FROM tj_project p WHERE p.pro_parent_id =0 AND p.pro_id IN (\n" +
            "  SELECT a.pro_id FROM tj_order_detail a WHERE !ISNULL(flowing_water_id) AND order_id=#{orderId})")
            "  SELECT a.pro_id FROM tj_order_detail a WHERE !ISNULL(flowing_water_id) AND order_id=#{orderId} and a.deleted=0 )")
    public List<TjProject> selectTjOrderDetailListByFlowingWaterIdIsNotNull(String orderId);

    /**
     * 查询未缴费项目
     */
    @Select("SELECT * FROM tj_project p WHERE p.pro_parent_id =0 AND p.pro_id IN (\n" +
            "  SELECT a.pro_id FROM tj_order_detail a WHERE ISNULL(flowing_water_id) AND order_id=#{orderId})")
            "  SELECT a.pro_id FROM tj_order_detail a WHERE ISNULL(flowing_water_id) AND order_id=#{orderId} and a.deleted=0 )")
    public List<TjProject> selectTjOrderDetailListByFlowingWaterIdIsNull(String orderId);