zjh20250730-1

zjh

3 天以前 027c1328165a0d37a778ec7f58760bb0fe1ffebb

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

@@ -97,7 +97,7 @@
        List<TjProject> tjProjects = tjProjectService.getDxTjProjectList();
        String config = configService.selectConfigByKey("tj_dxsxtj");
        if (null != config && config.equals("N")) {
            tjProjects = tjProjectService.getOpenDxTjProjectList(null);
            tjProjects = tjProjectService.getOpenDxTjProjectList(null, null);
        }
        if (tjProjects != null) {
            for (TjProject project : tjProjects) {
@@ -596,7 +596,7 @@
        List<TjProject> tjProjects = tjProjectService.getDxTjProjectList();
        String config = configService.selectConfigByKey("tj_dxsxtj");
        if (null != config && config.equals("N")) {
            tjProjects = tjProjectService.getOpenDxTjProjectList(null);
            tjProjects = tjProjectService.getOpenDxTjProjectList(null, null);
        }
        String key = configService.selectConfigByKey("is_open_sfxm");
        Map<String, Object> map = new HashMap<>();
@@ -609,11 +609,16 @@

    @GetMapping("/getProParentIdDxListByFenYe")
    @ApiOperation(value = "选择体检项目(所有页面项目)选单项时调用的接口(有分页)")
    public AjaxResult getProParentIdDxListByFenYe(@RequestParam(defaultValue = "1") int page,@RequestParam(defaultValue = "10") int pageSize,String nr) {
    public AjaxResult getProParentIdDxListByFenYe(@RequestParam(defaultValue = "1") int page,@RequestParam(defaultValue = "10") int pageSize,String nr,String xb) {
        List<TjProject> tjProjects = tjProjectService.getDxTjProjectList();
        String config = configService.selectConfigByKey("tj_dxsxtj");
        if(StringUtil.isNotBlank(xb)){
            if(xb.contains("4"))xb="0";
            if(xb.contains("5"))xb="1";
            if(xb.contains("4") && xb.contains("5"))xb=null;
        }
        if (null != config && config.equals("N")) {
            tjProjects = tjProjectService.getOpenDxTjProjectList(nr);
            tjProjects = tjProjectService.getOpenDxTjProjectList(nr,xb);
        }
        String key = configService.selectConfigByKey("is_open_sfxm");
        Map<String, Object> map = new HashMap<>();
@@ -794,6 +799,10 @@
            if(StringUtil.isNotBlank(bz)){
                tjBzProLambdaQueryWrapper.eq(TjBzPro::getBzId, bz);
                List<TjBzPro> list = bzProService.list(tjBzProLambdaQueryWrapper);
                for (TjBzPro bzPro : list) {
                    TjProject tjProject = tjProjectService.getById(bzPro.getProId());
                    if(null != tjProject)bzPro.setProName(tjProject.getProName());
                }
                return AjaxResult.success(list);
            }else {
                List<TjProject> list = tjProjectService.selectTjProjectListByBz();