|
|
@@ -23,6 +23,7 @@ import com.diagbot.vo.neoPushEntity.Diag;
|
|
|
import com.diagbot.vo.neoPushEntity.DiagVo;
|
|
|
import com.google.common.collect.Lists;
|
|
|
import com.google.common.collect.Maps;
|
|
|
+import org.apache.commons.collections.MapUtils;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
@@ -62,6 +63,15 @@ public class PushProcess {
|
|
|
if(annotation != null){
|
|
|
ResponseData data = annotation.getData();
|
|
|
if(data != null){
|
|
|
+ Map<String, Map<String, String>> inputs = data.getInputs();
|
|
|
+ if(MapUtils.isNotEmpty(inputs)){
|
|
|
+ List<String> words = new ArrayList<>(inputs.keySet());
|
|
|
+ typeWords.put(StandConvertEnum.symptom.toString(),words);
|
|
|
+ typeWords.put(StandConvertEnum.disease.toString(),words);
|
|
|
+ typeWords.put(StandConvertEnum.pacs.toString(),words);
|
|
|
+ typeWords.put(StandConvertEnum.lis.toString(),words);
|
|
|
+ typeWords.put(StandConvertEnum.vital.toString(),words);
|
|
|
+ }
|
|
|
List<FeatureRate> dis = data.getDis();
|
|
|
if(ListUtil.isNotEmpty(dis)){
|
|
|
pushDiags = dis.stream().filter(x -> x.getDesc() == null || x.getDesc().contains("确诊") || x.getDesc().contains("拟诊"))
|
|
|
@@ -121,7 +131,7 @@ public class PushProcess {
|
|
|
icssVo.setVital(pushVo.getVital());
|
|
|
icssVo.setPasts(pushVo.getPasts());
|
|
|
icssVo.setPersonal(pushVo.getPersonal());
|
|
|
- icssVo.setFeatureType(pushVo.getFeatureType());
|
|
|
+ icssVo.setFeatureType(pushVo.getFeatureType()+",7");
|
|
|
|
|
|
List<Lis> lis = pushVo.getLis();
|
|
|
lis = tranLisConfigIcssFacade.addLisUniqueName(lis, "A001");
|
gaodm