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

liujie

2 天以前 7df0337148d9d6d6158ad93564aa2a3c827265cc

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

@@ -83,6 +83,10 @@
        }
        List<TSysChronicDisease> sysChronicDiseaseList = sysChronicDiseaseMapper.selectList(Wrappers.lambdaQuery(TSysChronicDisease.class));
        for (TSysAppUserVO sysAppUserVO : list) {
            if(sysAppUserVO.getBirthTime() != null){
                long age = ChronoUnit.YEARS.between(sysAppUserVO.getBirthTime(), LocalDateTime.now());
                sysAppUserVO.setAge(age);
            }
            String chronicDiseaseId = sysAppUserVO.getChronicDiseaseId();
            if(StringUtils.isNotBlank(chronicDiseaseId)){
                String[] split = chronicDiseaseId.split(",");
@@ -114,6 +118,10 @@
        }
        List<TSysChronicDisease> sysChronicDiseaseList = sysChronicDiseaseMapper.selectList(Wrappers.lambdaQuery(TSysChronicDisease.class));
        for (TSysAppUserListExport sysAppUserListExport : list) {
            if(sysAppUserListExport.getBirthTime() != null){
                long age = ChronoUnit.YEARS.between(sysAppUserListExport.getBirthTime(), LocalDateTime.now());
                sysAppUserListExport.setAge(age);
            }
            String chronicDiseaseId = sysAppUserListExport.getChronicDiseaseId();
            if(StringUtils.isNotBlank(chronicDiseaseId)){
                String[] split = chronicDiseaseId.split(",");
@@ -143,6 +151,10 @@
        }
        List<TSysChronicDisease> sysChronicDiseaseList = sysChronicDiseaseMapper.selectList(Wrappers.lambdaQuery(TSysChronicDisease.class));
        for (TSysAppUserClinicExport sysAppUserClinicExport : list) {
            if(sysAppUserClinicExport.getBirthTime() != null){
                long age = ChronoUnit.YEARS.between(sysAppUserClinicExport.getBirthTime(), LocalDateTime.now());
                sysAppUserClinicExport.setAge(age);
            }
            String chronicDiseaseId = sysAppUserClinicExport.getChronicDiseaseId();
            if(StringUtils.isNotBlank(chronicDiseaseId)){
                String[] split = chronicDiseaseId.split(",");