|
@@ -12,6 +12,7 @@ import org.diagbot.common.push.bean.neo4j.*;
|
|
|
import org.diagbot.common.push.cache.CacheUtil;
|
|
|
import org.diagbot.common.push.filter.ClassifyDiag;
|
|
|
import org.diagbot.common.push.filter.rule.PretreatmentRule;
|
|
|
+import org.diagbot.common.push.util.ListUtil;
|
|
|
import org.diagbot.common.push.util.PushConstants;
|
|
|
import org.diagbot.common.push.work.ParamsDataProxy;
|
|
|
import org.diagbot.graphWeb.work.GraphCalculate;
|
|
@@ -36,6 +37,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
import java.util.*;
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
* @ClassName org.diagbot.push.controller.AlgorithmController
|
|
@@ -140,7 +142,13 @@ public class AlgorithmController extends BaseController {
|
|
|
paramsDataProxy.createNormalInfo(searchData);
|
|
|
//数据预处理
|
|
|
PretreatmentRule pretreatmentRule = new PretreatmentRule();
|
|
|
-// pretreatmentRule.rule(searchData);
|
|
|
+ pretreatmentRule.rule(searchData);
|
|
|
+
|
|
|
+ if(ListUtil.isNotEmpty(searchData.getPacs())){
|
|
|
+ List<String> collect = searchData.getPacs().stream().map(x -> x.getResult()).collect(Collectors.toList());
|
|
|
+ String join = String.join(",", collect);
|
|
|
+ searchData.setPacsString(join);
|
|
|
+ }
|
|
|
|
|
|
|
|
|
//危机值
|