Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong

liujie

3 天以前 7df0337148d9d6d6158ad93564aa2a3c827265cc

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysAppUserServiceImpl.java

@@ -83,19 +83,27 @@
        }
        List<TSysChronicDisease> sysChronicDiseaseList = sysChronicDiseaseMapper.selectList(Wrappers.lambdaQuery(TSysChronicDisease.class));
        for (TSysAppUserVO sysAppUserVO : list) {
            String chronicDiseaseId = sysAppUserVO.getChronicDiseaseId();
            String[] split = chronicDiseaseId.split(",");
            StringBuilder stringBuilder = new StringBuilder();
            for (String diseaseId : split) {
                List<TSysChronicDisease> chronicDiseaseList = sysChronicDiseaseList.stream().filter(disease -> disease.getId().equals(diseaseId)).collect(Collectors.toList());
                // 最后一位不拼接逗号
                if(diseaseId.equals(split[split.length-1])){
                    stringBuilder.append(chronicDiseaseList.get(0).getChronicName());
                }else{
                    stringBuilder.append(chronicDiseaseList.get(0).getChronicName()).append(",");
                }
            if(sysAppUserVO.getBirthTime() != null){
                long age = ChronoUnit.YEARS.between(sysAppUserVO.getBirthTime(), LocalDateTime.now());
                sysAppUserVO.setAge(age);
            }
            sysAppUserVO.setSysChronicDiseaseNames(stringBuilder.toString());
            String chronicDiseaseId = sysAppUserVO.getChronicDiseaseId();
            if(StringUtils.isNotBlank(chronicDiseaseId)){
                String[] split = chronicDiseaseId.split(",");
                StringBuilder stringBuilder = new StringBuilder();
                for (String diseaseId : split) {
                    List<TSysChronicDisease> chronicDiseaseList = sysChronicDiseaseList.stream().filter(disease -> disease.getId().equals(diseaseId)).collect(Collectors.toList());
                    if(!CollectionUtils.isEmpty(chronicDiseaseList)){
                        // 最后一位不拼接逗号
                        if(diseaseId.equals(split[split.length-1])){
                            stringBuilder.append(chronicDiseaseList.get(0).getChronicName());
                        }else{
                            stringBuilder.append(chronicDiseaseList.get(0).getChronicName()).append(",");
                        }
                    }
                }
                sysAppUserVO.setSysChronicDiseaseNames(stringBuilder.toString());
            }
        }

        pageInfo.setRecords(list);
@@ -110,19 +118,27 @@
        }
        List<TSysChronicDisease> sysChronicDiseaseList = sysChronicDiseaseMapper.selectList(Wrappers.lambdaQuery(TSysChronicDisease.class));
        for (TSysAppUserListExport sysAppUserListExport : list) {
            String chronicDiseaseId = sysAppUserListExport.getChronicDiseaseId();
            String[] split = chronicDiseaseId.split(",");
            StringBuilder stringBuilder = new StringBuilder();
            for (String diseaseId : split) {
                List<TSysChronicDisease> chronicDiseaseList = sysChronicDiseaseList.stream().filter(disease -> disease.getId().equals(diseaseId)).collect(Collectors.toList());
                // 最后一位不拼接逗号
                if(diseaseId.equals(split[split.length-1])){
                    stringBuilder.append(chronicDiseaseList.get(0).getChronicName());
                }else{
                    stringBuilder.append(chronicDiseaseList.get(0).getChronicName()).append(",");
                }
            if(sysAppUserListExport.getBirthTime() != null){
                long age = ChronoUnit.YEARS.between(sysAppUserListExport.getBirthTime(), LocalDateTime.now());
                sysAppUserListExport.setAge(age);
            }
            sysAppUserListExport.setSysChronicDiseaseNames(stringBuilder.toString());
            String chronicDiseaseId = sysAppUserListExport.getChronicDiseaseId();
            if(StringUtils.isNotBlank(chronicDiseaseId)){
                String[] split = chronicDiseaseId.split(",");
                StringBuilder stringBuilder = new StringBuilder();
                for (String diseaseId : split) {
                    List<TSysChronicDisease> chronicDiseaseList = sysChronicDiseaseList.stream().filter(disease -> disease.getId().equals(diseaseId)).collect(Collectors.toList());
                    if(!CollectionUtils.isEmpty(chronicDiseaseList)){
                        // 最后一位不拼接逗号
                        if(diseaseId.equals(split[split.length-1])){
                            stringBuilder.append(chronicDiseaseList.get(0).getChronicName());
                        }else{
                            stringBuilder.append(chronicDiseaseList.get(0).getChronicName()).append(",");
                        }
                    }
                }
                sysAppUserListExport.setSysChronicDiseaseNames(stringBuilder.toString());
            }
        }
        return list;
    }
@@ -135,19 +151,27 @@
        }
        List<TSysChronicDisease> sysChronicDiseaseList = sysChronicDiseaseMapper.selectList(Wrappers.lambdaQuery(TSysChronicDisease.class));
        for (TSysAppUserClinicExport sysAppUserClinicExport : list) {
            String chronicDiseaseId = sysAppUserClinicExport.getChronicDiseaseId();
            String[] split = chronicDiseaseId.split(",");
            StringBuilder stringBuilder = new StringBuilder();
            for (String diseaseId : split) {
                List<TSysChronicDisease> chronicDiseaseList = sysChronicDiseaseList.stream().filter(disease -> disease.getId().equals(diseaseId)).collect(Collectors.toList());
                // 最后一位不拼接逗号
                if(diseaseId.equals(split[split.length-1])){
                    stringBuilder.append(chronicDiseaseList.get(0).getChronicName());
                }else{
                    stringBuilder.append(chronicDiseaseList.get(0).getChronicName()).append(",");
                }
            if(sysAppUserClinicExport.getBirthTime() != null){
                long age = ChronoUnit.YEARS.between(sysAppUserClinicExport.getBirthTime(), LocalDateTime.now());
                sysAppUserClinicExport.setAge(age);
            }
            sysAppUserClinicExport.setSysChronicDiseaseNames(stringBuilder.toString());
            String chronicDiseaseId = sysAppUserClinicExport.getChronicDiseaseId();
            if(StringUtils.isNotBlank(chronicDiseaseId)){
                String[] split = chronicDiseaseId.split(",");
                StringBuilder stringBuilder = new StringBuilder();
                for (String diseaseId : split) {
                    List<TSysChronicDisease> chronicDiseaseList = sysChronicDiseaseList.stream().filter(disease -> disease.getId().equals(diseaseId)).collect(Collectors.toList());
                    if(!CollectionUtils.isEmpty(chronicDiseaseList)){
                        // 最后一位不拼接逗号
                        if(diseaseId.equals(split[split.length-1])){
                            stringBuilder.append(chronicDiseaseList.get(0).getChronicName());
                        }else{
                            stringBuilder.append(chronicDiseaseList.get(0).getChronicName()).append(",");
                        }
                    }
                }
                sysAppUserClinicExport.setSysChronicDiseaseNames(stringBuilder.toString());
            }
        }
        return list;
    }