diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientmanageroutenode/SignPatientManageRouteNodeDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientmanageroutenode/SignPatientManageRouteNodeDto.java index 2982f146..d30298bc 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientmanageroutenode/SignPatientManageRouteNodeDto.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientmanageroutenode/SignPatientManageRouteNodeDto.java @@ -1,5 +1,6 @@ package com.xinelu.manage.dto.signpatientmanageroutenode; +import com.xinelu.common.annotation.Excel; import io.swagger.annotations.ApiModelProperty; import java.util.List; import lombok.Data; @@ -32,6 +33,13 @@ public class SignPatientManageRouteNodeDto { @ApiModelProperty(value = "任务类型,电话外呼:PHONE_OUTBOUND,问卷量表:QUESTIONNAIRE_SCALE,宣教文章:PROPAGANDA_ARTICLE,文字提醒:TEXT_REMIND,人工随访:ARTIFICIAL_FOLLOW_UP") private String taskType; + /** + * 任务节点类型:PHONE_OUTBOUND:电话外呼(默认自动。人工或自动);QUESTIONNAIRE_SCALE:问卷量表(消息推送或人工随访);PROPAGANDA_ARTICLE:宣教文章;TEXT_REMIND:文字提醒(微信、短信、公众号) + */ + @ApiModelProperty(value = "任务节点类型") + @Excel(name = "任务节点类型") + private String taskNodeType; + /** 任务状态 */ @ApiModelProperty(value = "任务状态") private String taskStatus; diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/impl/SignPatientManageRouteNodeServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/impl/SignPatientManageRouteNodeServiceImpl.java index bb61fe84..4e6854fe 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/impl/SignPatientManageRouteNodeServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/impl/SignPatientManageRouteNodeServiceImpl.java @@ -839,6 +839,12 @@ public class SignPatientManageRouteNodeServiceImpl implements ISignPatientManage @Override public List replaceNodeContent(SignPatientManageNodeAuditVo manageRouteNode, Long taskPartitionDictId, List labelFieldContentList) { List manageNodeList = new ArrayList<>(); + // 过滤掉适用范围为空的字段 + labelFieldContentList.forEach(labelFieldInfoContentVo -> { + if (StringUtils.isBlank(labelFieldInfoContentVo.getApplyRange())) { + labelFieldInfoContentVo.setApplyRange(ApplyRangeContant.PUBLIC); + } + }); Map> groupByRang = labelFieldContentList.stream().collect(Collectors.groupingBy(LabelFieldInfoContentVo::getApplyRange)); // 筛选应用范围是否有私用的画像 List privateLabelFields = groupByRang.get(ApplyRangeContant.PRIVATE);