|
@@ -939,6 +939,16 @@ public class PushProcess {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ // 量表
|
|
|
+ if (ruleTypeList.contains("12")) {
|
|
|
+ if (ListUtil.isNotEmpty(reversePush.getScales())) {
|
|
|
+ List<String> scales = reversePush.getScales().stream().map(x -> x.getName()).collect(Collectors.toList());
|
|
|
+ if (scales.size() > 0) {
|
|
|
+ List<PushBaseDTO> filterpacs = getPackagePushBaseDTO(scales);
|
|
|
+ pushDTO.setScale(filterpacs.subList(0, filterpacs.size() >= length ? length : filterpacs.size()));
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
}
|
|
|
|
|
@@ -954,5 +964,17 @@ public class PushProcess {
|
|
|
}).collect(Collectors.toList());
|
|
|
return symptomPush;
|
|
|
}
|
|
|
+ private List<PushBaseDTO> getPackagePushBaseDTO(List<String> symptoms) {
|
|
|
+ List<PushBaseDTO> symptomPush = new ArrayList<>();
|
|
|
+ if(ListUtil.isNotEmpty(symptoms)){
|
|
|
+ symptomPush = symptoms.stream().map(x ->{
|
|
|
+ PushBaseDTO pushBaseDTO = new PushBaseDTO();
|
|
|
+ pushBaseDTO.setName(x);
|
|
|
+ return pushBaseDTO;
|
|
|
+ }).collect(Collectors.toList());
|
|
|
+ }
|
|
|
+
|
|
|
+ return symptomPush;
|
|
|
+ }
|
|
|
}
|
|
|
|