xinyilu/PostDischargePatientManage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

问卷统计修改

Browse Source
This commit is contained in:
zhangheng 2024-12-26 18:38:49 +08:00
parent b6eabdc247
commit 20eca20762
2 changed files with 1 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
postdischarge-manage/src/main/java/com/xinelu/manage/service/statistics/impl/StatisticsServiceImpl.java
View File

@ -306,14 +306,8 @@ public class StatisticsServiceImpl implements IStatisticsService {
//查询问卷任务 //查询问卷任务
List<QuestionnaireTaskStatisticsVo> questionnaireTaskStatisticsVos = signPatientManageRouteNodeMapper.questionnaireTaskStatistics(questionnaireTaskStatisticsDto); List<QuestionnaireTaskStatisticsVo> questionnaireTaskStatisticsVos = signPatientManageRouteNodeMapper.questionnaireTaskStatistics(questionnaireTaskStatisticsDto);
//遍历计算比例 //遍历计算比例
List<QuestionnaireTaskVo> questionnaireTaskVos = new ArrayList<>();
if (CollectionUtils.isNotEmpty(questionnaireTaskStatisticsVos)){ if (CollectionUtils.isNotEmpty(questionnaireTaskStatisticsVos)){
for (QuestionnaireTaskStatisticsVo questionnaireTaskStatisticsVo : 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 //除数不能为空或0
if (CollectionUtils.isNotEmpty(questionnaireTaskStatisticsVo.getQuestionnaireTaskOptionStatisticsVos()) && Objects.nonNull(questionnaireTaskStatisticsVo.getTotal()) && questionnaireTaskStatisticsVo.getTotal() != 0){ if (CollectionUtils.isNotEmpty(questionnaireTaskStatisticsVo.getQuestionnaireTaskOptionStatisticsVos()) && Objects.nonNull(questionnaireTaskStatisticsVo.getTotal()) && questionnaireTaskStatisticsVo.getTotal() != 0){
questionnaireTaskStatisticsVo.getQuestionnaireTaskOptionStatisticsVos() questionnaireTaskStatisticsVo.getQuestionnaireTaskOptionStatisticsVos()
@ -324,14 +318,8 @@ public class StatisticsServiceImpl implements IStatisticsService {
questionnaireTaskStatisticsVo.getQuestionnaireTaskOptionStatisticsVos().forEach(item -> item.setChoiceProportion(BigDecimal.ZERO)); questionnaireTaskStatisticsVo.getQuestionnaireTaskOptionStatisticsVos().forEach(item -> item.setChoiceProportion(BigDecimal.ZERO));
} }
} }
//组装第一层数据
questionnaireTaskVos = questionnaireTaskVos.stream().distinct().collect(Collectors.toList());
for (QuestionnaireTaskVo questionnaireTaskVo : questionnaireTaskVos) {
List<QuestionnaireTaskStatisticsVo> 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);
} }
/** /**

37
postdischarge-manage/src/main/java/com/xinelu/manage/vo/statistics/QuestionnaireTaskVo.java
View File

@ -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<QuestionnaireTaskStatisticsVo> questionnaireTaskStatisticsVos;
}