|
@@ -430,6 +430,9 @@ public class PushProcess {
|
|
if (ruleTypeList.contains("9")) {
|
|
if (ruleTypeList.contains("9")) {
|
|
relationType.add(RelationshipEnum.R507.getKey()); // 手术
|
|
relationType.add(RelationshipEnum.R507.getKey()); // 手术
|
|
}
|
|
}
|
|
|
|
+ if (ruleTypeList.contains("12")) {
|
|
|
|
+ relationType.add(RelationshipEnum.R510.getKey()); // 护理
|
|
|
|
+ }
|
|
reverseVO.setRelationType(relationType);
|
|
reverseVO.setRelationType(relationType);
|
|
List<ReverseDTO> reverseDTOList1 = conceptInfoFacade.getReverseFac(reverseVO);
|
|
List<ReverseDTO> reverseDTOList1 = conceptInfoFacade.getReverseFac(reverseVO);
|
|
reverseDTOList.addAll(reverseDTOList1);
|
|
reverseDTOList.addAll(reverseDTOList1);
|
|
@@ -740,6 +743,14 @@ public class PushProcess {
|
|
pushDTO.setScale(generatePushBaseDTO(list, length)); // 放入对象返回
|
|
pushDTO.setScale(generatePushBaseDTO(list, length)); // 放入对象返回
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ // 护理
|
|
|
|
+ if (ruleTypeList.contains("12")) {
|
|
|
|
+ if (map.get(LexiconEnum.Nurse.getKey()) != null) {
|
|
|
|
+ List<String> list = map.get(LexiconEnum.Nurse.getKey()).stream().map(r -> r.getSonName()).collect(Collectors.toList());
|
|
|
|
+ // CoreUtil.removeRepeat(list, filterMap.get(StandConvertEnum.operation.toString())); // 过滤界面已有
|
|
|
|
+ pushDTO.setNurse(generatePushBaseDTO(list, length)); // 放入对象返回
|
|
|
|
+ }
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -808,15 +819,16 @@ public class PushProcess {
|
|
if (ruleTypeList.contains("7")) {
|
|
if (ruleTypeList.contains("7")) {
|
|
relationType.add(RelationshipEnum.R508.getKey()); // 鉴别诊断
|
|
relationType.add(RelationshipEnum.R508.getKey()); // 鉴别诊断
|
|
}
|
|
}
|
|
- if (ruleTypeList.contains("8")) {
|
|
|
|
- if (flag) {
|
|
|
|
|
|
+ if (flag) {
|
|
|
|
+ if (ruleTypeList.contains("8")) {
|
|
relationType.add(RelationshipEnum.R506.getKey()); // 药品
|
|
relationType.add(RelationshipEnum.R506.getKey()); // 药品
|
|
}
|
|
}
|
|
- }
|
|
|
|
- if (ruleTypeList.contains("9")) {
|
|
|
|
- if (flag) {
|
|
|
|
|
|
+ if (ruleTypeList.contains("9")) {
|
|
relationType.add(RelationshipEnum.R507.getKey()); // 手术
|
|
relationType.add(RelationshipEnum.R507.getKey()); // 手术
|
|
}
|
|
}
|
|
|
|
+ if (ruleTypeList.contains("12")) {
|
|
|
|
+ relationType.add(RelationshipEnum.R510.getKey()); // 护理
|
|
|
|
+ }
|
|
}
|
|
}
|
|
if (ruleTypeList.contains("11")) {
|
|
if (ruleTypeList.contains("11")) {
|
|
relationType.add(RelationshipEnum.R509.getKey()); // 量表
|
|
relationType.add(RelationshipEnum.R509.getKey()); // 量表
|