|
@@ -7,11 +7,16 @@ import org.diagbot.common.push.bean.CrisisDetail;
|
|
import org.diagbot.common.push.bean.FeatureRate;
|
|
import org.diagbot.common.push.bean.FeatureRate;
|
|
import org.diagbot.common.push.bean.ResponseData;
|
|
import org.diagbot.common.push.bean.ResponseData;
|
|
import org.diagbot.common.push.bean.SearchData;
|
|
import org.diagbot.common.push.bean.SearchData;
|
|
-import org.diagbot.common.push.bean.neo4j.*;
|
|
|
|
|
|
+import org.diagbot.common.push.bean.neo4j.Drugs;
|
|
|
|
+import org.diagbot.common.push.bean.neo4j.Filnlly;
|
|
|
|
+import org.diagbot.common.push.bean.neo4j.MedicalIndication;
|
|
|
|
+import org.diagbot.common.push.bean.neo4j.MedicalIndicationDetail;
|
|
|
|
+import org.diagbot.common.push.bean.neo4j.Medicition;
|
|
import org.diagbot.common.push.cache.CacheUtil;
|
|
import org.diagbot.common.push.cache.CacheUtil;
|
|
import org.diagbot.common.push.filter.ClassifyDiag;
|
|
import org.diagbot.common.push.filter.ClassifyDiag;
|
|
import org.diagbot.common.push.filter.rule.PretreatmentRule;
|
|
import org.diagbot.common.push.filter.rule.PretreatmentRule;
|
|
import org.diagbot.common.push.work.ParamsDataProxy;
|
|
import org.diagbot.common.push.work.ParamsDataProxy;
|
|
|
|
+import org.diagbot.common.push.work.ResultDataProxys;
|
|
import org.diagbot.graphWeb.work.GraphCalculate;
|
|
import org.diagbot.graphWeb.work.GraphCalculate;
|
|
import org.diagbot.graphWeb.work.LisPacsCalculate;
|
|
import org.diagbot.graphWeb.work.LisPacsCalculate;
|
|
import org.diagbot.nlp.util.Constants;
|
|
import org.diagbot.nlp.util.Constants;
|
|
@@ -31,7 +36,15 @@ import org.springframework.web.bind.annotation.RequestMethod;
|
|
import org.springframework.web.bind.annotation.ResponseBody;
|
|
import org.springframework.web.bind.annotation.ResponseBody;
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
import javax.servlet.http.HttpServletRequest;
|
|
-import java.util.*;
|
|
|
|
|
|
+import java.util.ArrayList;
|
|
|
|
+import java.util.Arrays;
|
|
|
|
+import java.util.HashMap;
|
|
|
|
+import java.util.LinkedHashMap;
|
|
|
|
+import java.util.LinkedHashSet;
|
|
|
|
+import java.util.LinkedList;
|
|
|
|
+import java.util.List;
|
|
|
|
+import java.util.Map;
|
|
|
|
+import java.util.Set;
|
|
|
|
|
|
/**
|
|
/**
|
|
* @ClassName org.diagbot.push.controller.AlgorithmController
|
|
* @ClassName org.diagbot.push.controller.AlgorithmController
|
|
@@ -121,6 +134,7 @@ public class AlgorithmController extends BaseController {
|
|
|
|
|
|
public Response<ResponseData> combine(HttpServletRequest request, SearchData searchData) throws Exception {
|
|
public Response<ResponseData> combine(HttpServletRequest request, SearchData searchData) throws Exception {
|
|
ResponseData responseData = new ResponseData();
|
|
ResponseData responseData = new ResponseData();
|
|
|
|
+ ResultDataProxys resultDataProxys = new ResultDataProxys();
|
|
logger.info("开始推送服务......");
|
|
logger.info("开始推送服务......");
|
|
Response<ResponseData> response = new Response();
|
|
Response<ResponseData> response = new Response();
|
|
//一些基本信息预处理 如年龄 性别
|
|
//一些基本信息预处理 如年龄 性别
|
|
@@ -205,6 +219,8 @@ public class AlgorithmController extends BaseController {
|
|
List<FeatureRate> classify = classifyDiag.diagClassify(upfes);
|
|
List<FeatureRate> classify = classifyDiag.diagClassify(upfes);
|
|
List<FeatureRate> featureRates = classifyDiag.sortDiag(classify);
|
|
List<FeatureRate> featureRates = classifyDiag.sortDiag(classify);
|
|
bigDataResponseData.setDis(featureRates);
|
|
bigDataResponseData.setDis(featureRates);
|
|
|
|
+ //返回结果化验、辅检、体征、进行性别年龄过滤
|
|
|
|
+ resultDataProxys.proxy(request ,bigDataResponseData,searchData);
|
|
response.setData(bigDataResponseData);
|
|
response.setData(bigDataResponseData);
|
|
return response;
|
|
return response;
|
|
}
|
|
}
|