1、部分类迁移编译错误修改

bigdata-web/src/test/java/org/diagbot/EyeHospitalData.java

@@ -1,9 +1,5 @@
 package org.diagbot;
 
-import oracle.jdbc.OracleResultSet;
-import oracle.sql.BLOB;
-import oracle.sql.OPAQUE;
-import oracle.xdb.XMLType;
 import org.diagbot.pub.jdbc.MysqlJdbc;
 
 import java.io.BufferedReader;

push-web/src/main/java/org/diagbot/push/controller/AlgorithmController.java

@@ -3,12 +3,13 @@ package org.diagbot.push.controller;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.commons.lang3.StringUtils;
 import org.diagbot.bigdata.work.AlgorithmCore;
-import org.diagbot.common.javabean.*;
+import org.diagbot.common.push.bean.CrisisDetail;
 import org.diagbot.common.push.bean.FeatureRate;
 import org.diagbot.common.push.bean.ResponseData;
 import org.diagbot.common.push.bean.SearchData;
+import org.diagbot.common.push.bean.neo4j.*;
+import org.diagbot.common.push.cache.CacheUtil;
 import org.diagbot.common.push.filter.ClassifyDiag;
-import org.diagbot.graph.util.CacheUtil;
 import org.diagbot.graphWeb.work.GraphCalculate;
 import org.diagbot.graphWeb.work.LisPacsCalculate;
 import org.diagbot.nlp.util.Constants;
@@ -117,10 +118,6 @@ public class AlgorithmController extends BaseController {
 
     public Response<ResponseData> combine(HttpServletRequest request, SearchData searchData) throws Exception {
         ResponseData responseData = new ResponseData();
-        //数据预处理
-        PretreatmentFilter pretreatmentFilter = new PretreatmentFilter();
-        pretreatmentFilter.crisisFilter(searchData, responseData);
-
         logger.info("开始推送服务......");
         Response<ResponseData> response = new Response();
         AlgorithmCore core = new AlgorithmCore();
@@ -154,6 +151,7 @@ public class AlgorithmController extends BaseController {
         pushDiags.addAll(bigDataResponseData.getDis());
         searchData.setPushDiags(pushDiags);
         bigDataResponseData.setTreat(graphResponseData.getTreat());
+
         //量表和指标推送
         List<CrisisDetail> crisisDetails = responseData.getCrisisDetails();
         List<MedicalIndication> crisisDetailsList = this.getCrisisDetails(crisisDetails);

push-web/src/main/java/org/diagbot/push/controller/CacheFileManagerController.java

@@ -1,9 +1,9 @@
 package org.diagbot.push.controller;
 
-import org.diagbot.bigdata.common.ApplicationCacheUtil;
+import org.diagbot.common.push.bean.ResponseData;
+import org.diagbot.common.push.cache.ApplicationCacheUtil;
 import org.diagbot.common.push.cache.CacheFileManager;
-import org.diagbot.common.work.ResponseData;
-import org.diagbot.graph.util.CacheUtil;
+import org.diagbot.common.push.cache.CacheUtil;
 import org.diagbot.nlp.util.NlpCache;
 import org.diagbot.pub.api.Response;
 import org.diagbot.pub.web.BaseController;
@@ -42,8 +42,8 @@ public class CacheFileManagerController extends BaseController {
         //更新大数据缓存
         ApplicationCacheUtil.createDoc_result_mapping_diag_map();
         ApplicationCacheUtil.createDoc_result_mapping_filter_map();
-        ApplicationCacheUtil.createKl_result_mapping_standword_map();
         ApplicationCacheUtil.create_kl_rule_filter_map();
+        ApplicationCacheUtil.create_kl_rule_app_filter_map();
         return response;
     }
 }

push-web/src/main/java/org/diagbot/push/convert/PreProcess.java

@@ -1,13 +1,8 @@
 package org.diagbot.push.convert;
 
 import com.alibaba.fastjson.JSONObject;
-import org.diagbot.bigdata.common.ApplicationCacheUtil;
-import org.diagbot.common.javabean.MedicalIndication;
-import org.diagbot.common.javabean.MedicalIndicationDetail;
-import org.diagbot.common.javabean.Rule;
-import org.diagbot.common.work.LisDetail;
-import org.diagbot.common.work.ResponseData;
-import org.diagbot.common.work.SearchData;
+import org.diagbot.common.push.bean.ResponseData;
+import org.diagbot.common.push.bean.SearchData;
 import org.diagbot.nlp.participle.ParticipleUtil;
 import org.diagbot.nlp.participle.word.Lexeme;
 import org.diagbot.nlp.participle.word.LexemePath;