|
@@ -144,16 +144,7 @@ public class AlgorithmController extends BaseController {
|
|
}
|
|
}
|
|
List<FeatureRate> graphFeatureRates = graphResponseData.getDis();
|
|
List<FeatureRate> graphFeatureRates = graphResponseData.getDis();
|
|
graphFeatureRates.addAll(disFeatureRates);
|
|
graphFeatureRates.addAll(disFeatureRates);
|
|
- //把所有的诊断拿出来经过过滤层过滤
|
|
|
|
- ClassifyDiag classifyDiag = new ClassifyDiag();
|
|
|
|
- List<FeatureRate> upfes = classifyDiag.filterDiag(graphResponseData, graphFeatureRates);
|
|
|
|
- List<FeatureRate> classify = classifyDiag.diagClassify(upfes);
|
|
|
|
- List<FeatureRate> featureRates = classifyDiag.sortDiag(classify);
|
|
|
|
-// List<FeatureRate> classifyFeature = classifyDiag.diagClassify(upfes);
|
|
|
|
-// FilterSortDiag filterSortDiag = new FilterSortDiag();
|
|
|
|
-// List<FeatureRate> filterDiagList = filterSortDiag.filterDiag(graphResponseData, graphFeatureRates);
|
|
|
|
-// List<FeatureRate> filterSortDiagList = filterSortDiag.sortDiag(filterDiagList);
|
|
|
|
- bigDataResponseData.setDis(featureRates);
|
|
|
|
|
|
+ bigDataResponseData.setDis(graphFeatureRates);
|
|
}
|
|
}
|
|
//推送出的诊断信息作为参数传入知识图谱
|
|
//推送出的诊断信息作为参数传入知识图谱
|
|
List<FeatureRate> pushDiags = new ArrayList<>();
|
|
List<FeatureRate> pushDiags = new ArrayList<>();
|
|
@@ -186,6 +177,13 @@ public class AlgorithmController extends BaseController {
|
|
if(featureList.contains(Constants.feature_type_vital)){
|
|
if(featureList.contains(Constants.feature_type_vital)){
|
|
bigDataResponseData.setVitals(vitals);
|
|
bigDataResponseData.setVitals(vitals);
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ //把所有的诊断拿出来经过过滤层过滤
|
|
|
|
+ ClassifyDiag classifyDiag = new ClassifyDiag();
|
|
|
|
+ List<FeatureRate> upfes = classifyDiag.filterDiag(graphResponseData, pushDiags);
|
|
|
|
+ List<FeatureRate> classify = classifyDiag.diagClassify(upfes);
|
|
|
|
+ List<FeatureRate> featureRates = classifyDiag.sortDiag(classify);
|
|
|
|
+ bigDataResponseData.setDis(featureRates);
|
|
response.setData(bigDataResponseData);
|
|
response.setData(bigDataResponseData);
|
|
return response;
|
|
return response;
|
|
}
|
|
}
|