zjh 2024/04/01-1

zjh

2024-04-01 01e85e31bef040a5bbca4966872467736c25a53b

zjh 2024/04/01-1

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

@@ -1510,7 +1510,10 @@
//        }

        TjOrderRemark remark = remarkService.getTjOrderRemarkByTjNumAndProParentId(tjNumber, proParentId);
        List<TjProject> proParentList = projectService.getTjProjectListBySoneId(proParentId);

//        List<TjProject> proParentList = projectService.getTjProjectListBySoneId(proParentId);
        List<TjProject> proParentList = projectService.getTjProjectListByTbTransition(proParentId,tjNumber);

        if (null == proParentList || proParentList.size()==0) {
            Map<String, Object> map = new HashMap<>();
            map.put("xiaoJieIds", null);

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

@@ -1468,14 +1468,15 @@
                TjPackage aPackage = tjPackageService.getById(entry.getValue().get(0).getPacId());
                map.put("pacName", aPackage.getPacName());
                TjProject tjProject = projectService.getById(entry.getKey());
                TjPackageProject project = tjPackageProjectService.getOne(new LambdaQueryWrapper<TjPackageProject>().eq(TjPackageProject::getPacId, pacId)
                        .eq(TjPackageProject::getProId, entry.getKey()));
//                TjPackageProject project = tjPackageProjectService.getOne(new LambdaQueryWrapper<TjPackageProject>().eq(TjPackageProject::getPacId, pacId)
//                        .eq(TjPackageProject::getProId, entry.getKey()));
                map.put("ordPrice", tjProject.getProPrice());
                if (null != project) {
                    map.put("nowPrice", project.getPriceNow());
                } else {
                    map.put("nowPrice", tjProject.getProPrice());
                }
//                if (null != project) {
//                    map.put("nowPrice", project.getPriceNow());
//                } else {
//                    map.put("nowPrice", tjProject.getProPrice());
//                }
                map.put("nowPrice",transitionService.getTbTransitionDxPriceByPac(cusId,entry.getKey(),cardId,pacId));
            } else {
                map.put("pacName", "单项");
                List<TbTransition> tbTransitionList = entry.getValue();
@@ -1492,8 +1493,6 @@
            }
            map.put("parentName", projectService.getById(entry.getKey()).getProName());
            map.put("list", entry.getValue());


            list.add(map);
        }
        return list;
@@ -1715,7 +1714,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/TbTransitionMapper.java

@@ -128,8 +128,8 @@
            "\tc.pro_name,\n" +
            "\tb.pro_id,\n" +
            "\tb.pro_name,\n" +
            "\tTRUNCATE(c.pro_price * (TRUNCATE ( a.price_now / b.pro_price, 5 )),2),\n" +
            "\tTRUNCATE(c.pro_price * (TRUNCATE ( a.price_now / b.pro_price, 5 )),2),\n" +
            "\tTRUNCATE(c.pro_price,2),\n" +
            " IFNULL(TRUNCATE(c.pro_price * (TRUNCATE ( a.price_now / b.pro_price, 5 )),2),0), " +
            "\tSYSDATE(),\n" +
            "\tc.pro_check_method,\n" +
            "\tIFNULL(c.pro_type,'')\n" +
@@ -211,4 +211,7 @@

    @Select("SELECT DISTINCT a.pac_id FROM tb_transition a WHERE a.tj_num=#{tjNum}AND a.card_id=#{cardId} AND !ISNULL(a.pac_id)")
    String selectPacIdByTbTransitionTjNumAndProId(@Param("tjNum")String tjNum,@Param("cardId")String cardId);

    @Select("SELECT SUM(a.now_price) FROM tb_transition a WHERE a.cus_id=#{cusId} AND a.parent_pro_id=#{proId} and a.card_id=#{cardId} and a.pac_id=#{pacId}")
    BigDecimal getTbTransitionDxPriceByPac(@Param("cusId")String cusId,@Param("proId")Long proId,@Param("cardId")String cardId,@Param("pacId")Long pacId);
}

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

@@ -168,4 +168,9 @@

    @Select("SELECT a.pro_id FROM tj_project a WHERE a.deleted=0 AND  a.need_report='N'")
    List<Long> getNneedReprotProId();


    @Select("SELECT * FROM tj_project WHERE pro_parent_id=#{proId} AND deleted='0' and pro_id in" +
            " (SELECT a.pro_id FROM tb_transition a WHERE a.tj_num=#{tjNumber}) ")
    List<TjProject> getTjProjectListByTbTransition(@Param("proParentId") String proParentId,@Param("tjNumber")String tjNumber);
}

 ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITbTransitionService.java

@@ -107,5 +107,7 @@

    BigDecimal getTbTransitionDxPriceAndOrdPrice(String cusId,Long proId);

    BigDecimal getTbTransitionDxPriceByPac(String cusId,Long proId,String cardId,Long pacId);

    String selectPacIdByTbTransitionTjNumAndProId(String tjNum,String cardId);
}

 ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjProjectService.java

@@ -127,4 +127,5 @@
    List<Long> getNneedReprotProId();


    List<TjProject> getTjProjectListByTbTransition(String proParentId, String tjNumber);
}

 ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TbTransitionServiceImpl.java

@@ -168,6 +168,11 @@
    }

    @Override
    public BigDecimal getTbTransitionDxPriceByPac(String cusId, Long proId, String cardId,Long pacId) {
        return tbTransitionMapper.getTbTransitionDxPriceByPac(cusId,proId,cardId,pacId);
    }

    @Override
    public String selectPacIdByTbTransitionTjNumAndProId(String tjNum,String cardId) {
        return tbTransitionMapper.selectPacIdByTbTransitionTjNumAndProId(tjNum,cardId);
    }

 ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectServiceImpl.java

@@ -246,6 +246,11 @@
        return tjProjectMapper.getNneedReprotProId();
    }

    @Override
    public List<TjProject> getTjProjectListByTbTransition(String proParentId, String tjNumber) {
        return tjProjectMapper.getTjProjectListByTbTransition(proParentId,tjNumber);
    }

    /**
     * 递归列表
     */