diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.java index 7cd40a42..1b244cc5 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.java @@ -117,4 +117,12 @@ public interface SignPatientManageRouteNodeMapper { * @return 节点列表 */ List selectNodesByManageIds(@Param("manageRouteIds") List manageRouteIds); + + /** + * 查询患者管理路径节点内容 + * + * @param patientId 患者id + * @return 患者管理任务路径节点 + */ + List getRouteNodeContentList(Long patientId); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/impl/LabelFieldContentServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/impl/LabelFieldContentServiceImpl.java index 07f6e841..a4741d81 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/impl/LabelFieldContentServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/impl/LabelFieldContentServiceImpl.java @@ -214,6 +214,10 @@ public class LabelFieldContentServiceImpl implements ILabelFieldContentService { patientTaskDto.setPatientId(patientId); //根据患者id查询节点富文本所需标签 List nodeList = signPatientManageRouteNodeMapper.getNodeList(patientTaskDto); + List routeNodeContentList = signPatientManageRouteNodeMapper.getRouteNodeContentList(patientId); + if (CollectionUtils.isNotEmpty(routeNodeContentList)) { + nodeList.addAll(routeNodeContentList); + } List nodeContentList = nodeList.stream().filter(Objects::nonNull).map(SignPatientManageRouteNode::getNodeContent).filter(Objects::nonNull).collect(Collectors.toList()); String nodeContentListJoin = String.join(",", nodeContentList); Document document = Jsoup.parse(nodeContentListJoin); @@ -247,6 +251,12 @@ public class LabelFieldContentServiceImpl implements ILabelFieldContentService { for (GroupingValue groupingValue : labelFieldContentList) { groupingValue.setPatientId(patientId); String s = asListStrings.stream().filter(Objects::nonNull).filter(item -> item.equals(groupingValue.getFieldCode())).findFirst().orElse(new String()); + List collect = string.stream().filter(Objects::nonNull).filter(item -> item.equals(groupingValue.getFieldCode())).collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(collect)) { + groupingValue.setSign(1); + } else { + groupingValue.setSign(0); + } groupingValue.setFieldValue(paramsValue.getOrDefault(s, "").toString()); } //遍历任务细分id组装数据 diff --git a/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml index 896153a3..1f767dc7 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml @@ -814,4 +814,13 @@ #{manageRouteId} + + \ No newline at end of file