|
@@ -155,21 +155,20 @@ public class PushProcess {
|
|
|
if (ListUtil.isNotEmpty(pushDiags)) {
|
|
|
//先把所有疾病推出来
|
|
|
if (ruleTypeList.contains("7")) {
|
|
|
- List<String> highriskDiags = Lists.newArrayList();
|
|
|
if(MapUtils.isNotEmpty(diag_sign)){
|
|
|
- diag_sign.forEach((x,y) -> {
|
|
|
- if(y==1) highriskDiags.add(x);
|
|
|
- });
|
|
|
- }
|
|
|
- if(ListUtil.isNotEmpty(highriskDiags)){
|
|
|
- List<String> first = highriskDiags.subList(0, 1);
|
|
|
- List<PushBaseDTO> collect_highrisk = first.stream().map(x -> {
|
|
|
- PushBaseDTO pushBaseDTO = new PushBaseDTO();
|
|
|
- pushBaseDTO.setName(x);
|
|
|
- return pushBaseDTO;
|
|
|
- }).collect(Collectors.toList());
|
|
|
- dis.put(DiseaseTypeEnum.highriskDis.getName(), collect_highrisk);
|
|
|
+ Map.Entry<String, Integer> first = diag_sign.entrySet().stream().findFirst().get();
|
|
|
+ if (first.getValue() == 1){
|
|
|
+ List<String> firstdiag = Lists.newArrayList(first.getKey());
|
|
|
+ List<PushBaseDTO> collect_highrisk = firstdiag.stream().map(x -> {
|
|
|
+ PushBaseDTO pushBaseDTO = new PushBaseDTO();
|
|
|
+ pushBaseDTO.setName(x);
|
|
|
+ return pushBaseDTO;
|
|
|
+ }).collect(Collectors.toList());
|
|
|
+ dis.put(DiseaseTypeEnum.highriskDis.getName(), collect_highrisk);
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
+
|
|
|
List<PushBaseDTO> diseeases = pushDiags.stream().map(x -> {
|
|
|
PushBaseDTO pushBaseDTO = new PushBaseDTO();
|
|
|
pushBaseDTO.setName(x);
|