|
@@ -1,10 +1,7 @@
|
|
package com.diagbot.facade;
|
|
package com.diagbot.facade;
|
|
|
|
|
|
import com.diagbot.biz.push.entity.Item;
|
|
import com.diagbot.biz.push.entity.Item;
|
|
-import com.diagbot.dto.NeoPushDTO;
|
|
|
|
-import com.diagbot.dto.PushBaseDTO;
|
|
|
|
-import com.diagbot.dto.PushDTO;
|
|
|
|
-import com.diagbot.dto.WordCrfDTO;
|
|
|
|
|
|
+import com.diagbot.dto.*;
|
|
import com.diagbot.enums.DiseaseTypeEnum;
|
|
import com.diagbot.enums.DiseaseTypeEnum;
|
|
import com.diagbot.enums.MedicalAdviceEnum;
|
|
import com.diagbot.enums.MedicalAdviceEnum;
|
|
import com.diagbot.enums.StandConvertEnum;
|
|
import com.diagbot.enums.StandConvertEnum;
|
|
@@ -186,8 +183,14 @@ public class PushFacade {
|
|
dis.put(DiseaseTypeEnum.identify.getName(),pushDiffBaseDTOS);
|
|
dis.put(DiseaseTypeEnum.identify.getName(),pushDiffBaseDTOS);
|
|
pushDTO.setDis(dis);
|
|
pushDTO.setDis(dis);
|
|
}
|
|
}
|
|
-
|
|
|
|
-
|
|
|
|
|
|
+ }
|
|
|
|
+ if (ruleTypeList.contains("10") && ListUtil.isNotEmpty(pushVO.getDiagVo().getDiags())) {
|
|
|
|
+ TreatDTO treatDTO = new TreatDTO();
|
|
|
|
+ List<TreatDTO> collect = pushVO.getDiagVo().getDiags().stream().map(x -> {
|
|
|
|
+ treatDTO.setName(x.getName());
|
|
|
|
+ return treatDTO;
|
|
|
|
+ }).collect(Collectors.toList());
|
|
|
|
+ pushDTO.setGeneraTreat(collect);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
// return pushDTO;
|
|
// return pushDTO;
|