From 20eca20762a7b164af13f00fb6143c0caef045b2 Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Thu, 26 Dec 2024 18:38:49 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E5=8D=B7=E7=BB=9F=E8=AE=A1=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/StatisticsServiceImpl.java | 14 +------ .../vo/statistics/QuestionnaireTaskVo.java | 37 ------------------- 2 files changed, 1 insertion(+), 50 deletions(-) delete mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/vo/statistics/QuestionnaireTaskVo.java diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/statistics/impl/StatisticsServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/statistics/impl/StatisticsServiceImpl.java index cc092c11..739a2865 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/statistics/impl/StatisticsServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/statistics/impl/StatisticsServiceImpl.java @@ -306,14 +306,8 @@ public class StatisticsServiceImpl implements IStatisticsService { //查询问卷任务 List questionnaireTaskStatisticsVos = signPatientManageRouteNodeMapper.questionnaireTaskStatistics(questionnaireTaskStatisticsDto); //遍历计算比例 - List questionnaireTaskVos = new ArrayList<>(); if (CollectionUtils.isNotEmpty(questionnaireTaskStatisticsVos)){ for (QuestionnaireTaskStatisticsVo questionnaireTaskStatisticsVo : questionnaireTaskStatisticsVos) { - QuestionnaireTaskVo questionnaireTaskVo = new QuestionnaireTaskVo(); - questionnaireTaskVo.setQuestionInfoId(questionnaireTaskStatisticsVo.getQuestionInfoId()); - questionnaireTaskVo.setQuestionnaireName(questionnaireTaskStatisticsVo.getQuestionnaireName()); - questionnaireTaskVo.setCreateTime(questionnaireTaskStatisticsVo.getCreateTime()); - questionnaireTaskVos.add(questionnaireTaskVo); //除数不能为空或0 if (CollectionUtils.isNotEmpty(questionnaireTaskStatisticsVo.getQuestionnaireTaskOptionStatisticsVos()) && Objects.nonNull(questionnaireTaskStatisticsVo.getTotal()) && questionnaireTaskStatisticsVo.getTotal() != 0){ questionnaireTaskStatisticsVo.getQuestionnaireTaskOptionStatisticsVos() @@ -324,14 +318,8 @@ public class StatisticsServiceImpl implements IStatisticsService { questionnaireTaskStatisticsVo.getQuestionnaireTaskOptionStatisticsVos().forEach(item -> item.setChoiceProportion(BigDecimal.ZERO)); } } - //组装第一层数据 - questionnaireTaskVos = questionnaireTaskVos.stream().distinct().collect(Collectors.toList()); - for (QuestionnaireTaskVo questionnaireTaskVo : questionnaireTaskVos) { - List collect = questionnaireTaskStatisticsVos.stream().filter(Objects::nonNull).filter(item -> Objects.nonNull(item.getQuestionInfoId()) && questionnaireTaskVo.getQuestionInfoId().equals(item.getQuestionInfoId())).collect(Collectors.toList()); - questionnaireTaskVo.setQuestionnaireTaskStatisticsVos(collect); - } } - return AjaxResult.success(questionnaireTaskVos); + return AjaxResult.success(questionnaireTaskStatisticsVos); } /** diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/statistics/QuestionnaireTaskVo.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/statistics/QuestionnaireTaskVo.java deleted file mode 100644 index 3bda41db..00000000 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/statistics/QuestionnaireTaskVo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.xinelu.manage.vo.statistics; - -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.time.LocalDateTime; -import java.util.List; - -/** - * @description: 问卷任务统计返回值 - * @author: zh - * @create: 2024-12-22 - **/ -@Data -public class QuestionnaireTaskVo { - - /** - * 问卷表id - */ - @ApiModelProperty(value = "问卷表id") - private Long questionInfoId; - - /** - * 问卷标题 - */ - @ApiModelProperty(value = "问卷标题") - private String questionnaireName; - - /** - * 创建时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime createTime; - - List questionnaireTaskStatisticsVos; -}