From b832327f508412c7297442365937fa26c6d2c0f6 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 22 十月 2025 11:49:21 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysAppUserServiceImpl.java | 72 +++++++++++++++++++++---------------
1 files changed, 42 insertions(+), 30 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysAppUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysAppUserServiceImpl.java
index b957e81..35f0595 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysAppUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysAppUserServiceImpl.java
@@ -84,18 +84,22 @@
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(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());
}
- sysAppUserVO.setSysChronicDiseaseNames(stringBuilder.toString());
}
pageInfo.setRecords(list);
@@ -111,18 +115,22 @@
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(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());
}
- sysAppUserListExport.setSysChronicDiseaseNames(stringBuilder.toString());
}
return list;
}
@@ -136,18 +144,22 @@
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(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());
}
- sysAppUserClinicExport.setSysChronicDiseaseNames(stringBuilder.toString());
}
return list;
}
--
Gitblit v1.7.1