zjh 2024/02/18--1

zjh

2024-02-18 16bf2151e55c07717bb18a1eb3340aeff18ecf67

zjh 2024/02/18--1

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

@@ -737,8 +737,11 @@
            wqqq.eq(TjFlowingWater::getOrderId,tjOrder.getOrderId());
            final List<TjFlowingWater> list1 = tjFlowingWaterService.list(wqqq);
            for (TjFlowingWater tjFlowingWater : list1) {
                if(null !=tjFlowingWater.getPaidIn()){
                shouyi.add(tjFlowingWater.getPaidIn());
            }

            }
        }
        chartVo.setBoysNum(boys);
        chartVo.setGirlsNum(girls);

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

@@ -98,14 +98,6 @@
                            }
                            tjProject.setAllSonProName(allSonProName.toString());   //2023.2.7 套餐内每一父项目的子项目字符串
                            tjProjectList.add(tjProject);
//                            LambdaQueryWrapper<TjProConsumables> wrapper1 = new LambdaQueryWrapper<>();
//                            wrapper1.eq(TjProConsumables::getProId, packageProject.getProId());
//                            List<TjProConsumables> list0 = tjProConsumablesService.list(wrapper1);
//                            List<TjConsumables> list1 = new ArrayList<>();
//                            for (TjProConsumables tjProConsumables : list0) {
//                                list1.add(tjConsumablesService.getById(tjProConsumables.getConsumablesId()));
//                            }
//                            tjProject.setConsumablesList(list1);
                            //现价赋值判断null赋原价  2023.2.8
                            if (packageProject.getPriceNow() != null) {
                                tjProject.setPriceNow(packageProject.getPriceNow());
@@ -118,7 +110,7 @@
                }
                aPackage.setTjProjectList(tjProjectList);
                aPackage.setAllProName(allProName.toString());
                aPackage.setAllSonName(allSonName.toString());
//                aPackage.setAllSonName(allSonName.toString());

                StringBuffer a = new StringBuffer();
                List<String> b = new ArrayList<>();

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

@@ -77,6 +77,41 @@
        return AjaxResult.success(maps);
    }

    /**
     * 选择体检项目选单项时调用的接口
     */
    @GetMapping("/getDxList")
    @ApiOperation(value = "选择体检项目选单项时调用的接口")
    public AjaxResult getDxList() {
        LambdaQueryWrapper<TjProject> wq0 = new LambdaQueryWrapper<>();
        wq0.eq(TjProject::getProParentId, 0);

        List<TjProject> tjProjects = tjProjectService.list(wq0);

        //上面的换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");
        Map<String,Object> map=new HashMap<>();
        map.put("list",tjProjects);
        map.put("key",key);
        return AjaxResult.success(map);
    }





    /**
     * 查询体检项目列表

 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}AND a.card_id=#{cardId}")
    @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);
}