|
@@ -53,7 +53,7 @@ public class PushFacade {
|
|
Map<String, List<PushBaseDTO>> dis = new HashMap<>();
|
|
Map<String, List<PushBaseDTO>> dis = new HashMap<>();
|
|
//如果下的诊断有数据就反推
|
|
//如果下的诊断有数据就反推
|
|
if(pushVO.getDiagVo() != null && pushVO.getDiagVo().getDiags().size() > 0){
|
|
if(pushVO.getDiagVo() != null && pushVO.getDiagVo().getDiags().size() > 0){
|
|
- reversePushPackage(length, pushDTO, ruleTypeList, typeWords, pushVO,dis,wordCrfDTO);
|
|
|
|
|
|
+ reversePushPackage(length, pushDTO, ruleTypeList, typeWords, pushVO,dis,wordCrfDTO.getDiag());
|
|
}else {
|
|
}else {
|
|
//正推
|
|
//正推
|
|
List<NeoPushDTO> push = neoFacade.getPush(pushVO);
|
|
List<NeoPushDTO> push = neoFacade.getPush(pushVO);
|
|
@@ -68,7 +68,7 @@ public class PushFacade {
|
|
//把第一个推送出来的诊断set到diagOrder中,再反推
|
|
//把第一个推送出来的诊断set到diagOrder中,再反推
|
|
setPushVo(pushVO, push);
|
|
setPushVo(pushVO, push);
|
|
//调用反推
|
|
//调用反推
|
|
- reversePushPackage(length, pushDTO, ruleTypeList, typeWords, pushVO,dis,wordCrfDTO);
|
|
|
|
|
|
+ reversePushPackage(length, pushDTO, ruleTypeList, typeWords, pushVO,dis,wordCrfDTO.getDiag());
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -86,7 +86,7 @@ public class PushFacade {
|
|
pushVO.setDiagVo(diagVo);
|
|
pushVO.setDiagVo(diagVo);
|
|
}
|
|
}
|
|
|
|
|
|
- private void reversePushPackage(int length, PushDTO pushDTO, List<String> ruleTypeList, Map<String, List<String>> typeWords, NeoPushVO pushVO,Map<String, List<PushBaseDTO>> dis,WordCrfDTO wordCrfDTO) {
|
|
|
|
|
|
+ private void reversePushPackage(int length, PushDTO pushDTO, List<String> ruleTypeList, Map<String, List<String>> typeWords, NeoPushVO pushVO, Map<String, List<PushBaseDTO>> dis, List<Item> diags) {
|
|
List<NeoPushDTO> reversePush = neoFacade.getReversePush(pushVO);
|
|
List<NeoPushDTO> reversePush = neoFacade.getReversePush(pushVO);
|
|
if(ListUtil.isNotEmpty(reversePush)){
|
|
if(ListUtil.isNotEmpty(reversePush)){
|
|
// 症状
|
|
// 症状
|
|
@@ -184,8 +184,8 @@ public class PushFacade {
|
|
pushDTO.setDis(dis);
|
|
pushDTO.setDis(dis);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- if (ruleTypeList.contains("10") && ListUtil.isNotEmpty(wordCrfDTO.getDiag())) {
|
|
|
|
- List<TreatDTO> collect = wordCrfDTO.getDiag().stream().map(x -> {
|
|
|
|
|
|
+ if (ruleTypeList.contains("10") && ListUtil.isNotEmpty(diags)) {
|
|
|
|
+ List<TreatDTO> collect = diags.stream().map(x -> {
|
|
TreatDTO treatDTO = new TreatDTO();
|
|
TreatDTO treatDTO = new TreatDTO();
|
|
treatDTO.setName(x.getName());
|
|
treatDTO.setName(x.getName());
|
|
treatDTO.setUniqueName(x.getUniqueName());
|
|
treatDTO.setUniqueName(x.getUniqueName());
|