From 59099ec96f7a2da11df4b0b1593092b0aff38e90 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 23 十月 2025 13:45:52 +0800
Subject: [PATCH] 修改bug
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysAppUserServiceImpl.java | 140 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 128 insertions(+), 12 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 fcc0411..f37ddc2 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
@@ -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;
@@ -17,6 +21,8 @@
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import java.time.LocalDateTime;
+import java.time.temporal.ChronoUnit;
import java.util.List;
import java.util.stream.Collectors;
@@ -38,6 +44,21 @@
public PageInfo<TSysAppUserVO> pageList(TSysAppUserQuery query) {
PageInfo<TSysAppUserVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
List<TSysAppUserVO> list = this.baseMapper.pageList(query,pageInfo);
+ if(CollectionUtils.isEmpty(list)){
+ return pageInfo;
+ }
+ // 年龄计算
+ 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);
+ }
+ });
pageInfo.setRecords(list);
return pageInfo;
}
@@ -62,22 +83,117 @@
}
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);
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) {
+ 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(",");
+ 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;
+ }
+
+ @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) {
+ 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(",");
+ 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;
+ }
+
+ @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;
+ }
}
--
Gitblit v1.7.1