zjh 2024/03/22--1

zjh

2024-03-22 1f086217a887d7c2b4f6083de58b41122f45d1ab

zjh 2024/03/22--1

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

@@ -141,7 +141,7 @@
        if (null != project) {
            return AjaxResult.success(project.getProPrice());
        }
        return AjaxResult.error("没找到对应项目 请自定义费用");
        return AjaxResult.success("没找到对应项目 请自定义费用");
    }



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

@@ -1099,7 +1099,13 @@
                    for (TjPackageProject tjPackageProject : ppList) {
                        TjProject project = projectService.getTjProjectById(String.valueOf(tjPackageProject.getProId()));
                        if (null != project) {
                            BigDecimal divide = tjPackageProject.getPriceNow().divide(project.getProPrice(), 5, RoundingMode.HALF_DOWN);

                            BigDecimal divide = BigDecimal.valueOf(0);
                            if(tjPackageProject.getPriceNow().compareTo(BigDecimal.valueOf(0))==0 || project.getProPrice().compareTo(BigDecimal.valueOf(0))==0 ){
                                divide=BigDecimal.valueOf(0);
                            }else {
                                divide=tjPackageProject.getPriceNow().divide(project.getProPrice(), 5, RoundingMode.HALF_DOWN);
                            }
                            List<TjProject> tjProSonList = projectService.getTjProjectListBySoneId(String.valueOf(project.getProId()));
                            if (null != tjProSonList && tjProSonList.size() > 0) {
                                //addRedisTransitionPac(cusId, tbTransitionList, pacId, tjPackageProject, project, divide, tjProSonList);

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

@@ -83,25 +83,15 @@
    @GetMapping("/getDxList")
    @ApiOperation(value = "选择体检项目选单项时调用的接口")
    public AjaxResult getDxList() {
//        LambdaQueryWrapper<TjProject> wq0 = new LambdaQueryWrapper<>();
//        wq0.eq(TjProject::getProParentId, 0);
        List<TjProject> tjProjects = tjProjectService.getDxTjProjectList();
        String config = configService.selectConfigByKey("tj_dxsxtj");
        if(null !=config && config.equals("N")){
            tjProjects = tjProjectService.getOpenDxTjProjectList();
        }
        //上面的换sql
//        final List<TjProject> tjProjects = tjProjectService.getProBySqlAndName(proName, checkType, deptId);

        if (tjProjects != null) {
            for (TjProject project : tjProjects) {
                List<TjProject> projectList = tjProjectService.getTjProjectListBySoneId(String.valueOf(project.getProId()));
                project.setTjProjectList(projectList);

//                SysDept sysDept = deptService.selectDeptById(project.getDeptId());
//                if (sysDept!=null){
//                    project.setDeptName(sysDept.getDeptName());
//                }
            }
        }
        String key = configService.selectConfigByKey("is_open_sfxm");
@@ -544,13 +534,35 @@
        TjProject tjProject = tjProjectService.getById(proId);
        return AjaxResult.success(tjProject);
    }
//    /**
//     * 获取部门树列表
//     */
//    @GetMapping("/deptTree")
//    @ApiOperation("获取部门树列表")
//    public AjaxResult deptTree(SysDept dept) {
//        return success(deptService.selectDeptTreeList(dept));
//    }


    /**
     * 选择体检项目选单项时调用的接口
     */
    @GetMapping("/getProParentIdDxList")
    @ApiOperation(value = "选择体检项目(所有服项目)选单项时调用的接口")
    public AjaxResult getProParentIdDxList() {
        List<TjProject> tjProjects = tjProjectService.getDxTjProjectList();
        String config = configService.selectConfigByKey("tj_dxsxtj");
        if(null !=config && config.equals("N")){
            tjProjects = tjProjectService.getOpenDxTjProjectList();
        }
        String key = configService.selectConfigByKey("is_open_sfxm");
        Map<String,Object> map=new HashMap<>();
        map.put("list",tjProjects);
        map.put("key",key);
        return AjaxResult.success(map);
    }

    @GetMapping("/getProSonDxList")
    @ApiOperation(value = "选择体检项目(根据父项id选择子项)选单项时调用的接口")
    public AjaxResult getProSonDxList(@RequestParam String proId) {
        List<TjProject> projectList = tjProjectService.getTjProjectListBySoneId(proId);
        String key = configService.selectConfigByKey("is_open_sfxm");
        Map<String,Object> map=new HashMap<>();
        map.put("list",projectList);
        map.put("key",key);
        return AjaxResult.success(map);
    }

}