修改bug

liujie

4 天以前 ce531d3bb32f5221b35f9e24d027ef83450ebbc6

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

@@ -4,12 +4,16 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.export.TSysAppUserClinicExport;
import com.ruoyi.system.export.TSysAppUserExport;
import com.ruoyi.system.export.TSysAppUserListExport;
import com.ruoyi.system.mapper.TSysAppUserMapper;
import com.ruoyi.system.mapper.TSysChronicDiseaseMapper;
import com.ruoyi.system.model.TSysAppUser;
import com.ruoyi.system.model.TSysActivity;
import com.ruoyi.system.model.TSysAppUser;
import com.ruoyi.system.model.TSysChronicDisease;
import com.ruoyi.system.query.TCrmClinicQuery;
import com.ruoyi.system.query.TSysAppUserQuery;
import com.ruoyi.system.service.TSysAppUserService;
import com.ruoyi.system.vo.TSysAppUserVO;
@@ -48,6 +52,11 @@
            if(tSysAppUserVO.getBirthTime() != null){
                long age = ChronoUnit.YEARS.between(tSysAppUserVO.getBirthTime(), LocalDateTime.now());
                tSysAppUserVO.setAge(age);
            }
            if(StringUtils.isNotEmpty(tSysAppUserVO.getChronicDiseaseId())){
                tSysAppUserVO.setIsInspection(1);
            }else {
                tSysAppUserVO.setIsInspection(0);
            }
        });
        pageInfo.setRecords(list);
@@ -92,4 +101,75 @@
        pageInfo.setRecords(list);
        return pageInfo;
    }

    @Override
    public List<TSysAppUserListExport> exportList(TSysAppUserQuery query) {
        List<TSysAppUserListExport> list = this.baseMapper.exportList(query);
        if(CollectionUtils.isEmpty(list)){
            return list;
        }
        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(",");
                }
            }
            sysAppUserListExport.setSysChronicDiseaseNames(stringBuilder.toString());
        }
        return list;
    }

    @Override
    public List<TSysAppUserClinicExport> exportListClinic(TSysAppUserQuery query) {
        List<TSysAppUserClinicExport> list = this.baseMapper.exportListClinic(query);
        if(CollectionUtils.isEmpty(list)){
            return list;
        }
        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(",");
                }
            }
            sysAppUserClinicExport.setSysChronicDiseaseNames(stringBuilder.toString());
        }
        return list;
    }

    @Override
    public List<TSysAppUserExport> exportListAppUser(TSysAppUserQuery query) {
        List<TSysAppUserExport> list = this.baseMapper.exportListAppUser(query);
        if(CollectionUtils.isEmpty(list)){
            return list;
        }
        // 年龄计算
        list.forEach(tSysAppUserVO -> {
            if(tSysAppUserVO.getBirthTime() != null){
                long age = ChronoUnit.YEARS.between(tSysAppUserVO.getBirthTime(), LocalDateTime.now());
                tSysAppUserVO.setAge(age);
            }
            if(StringUtils.isNotEmpty(tSysAppUserVO.getChronicDiseaseId())){
                tSysAppUserVO.setIsInspection(1);
            }else {
                tSysAppUserVO.setIsInspection(0);
            }
        });
        return list;
    }
}