Merge remote-tracking branch 'origin/push-dev' into push-dev-preprocess

bigdata-web/src/main/java/org/diagbot/bigdata/work/ResultDataProxy.java

@@ -12,10 +12,7 @@ import org.diagbot.nlp.util.NlpCache;
 
 import javax.servlet.http.HttpServletRequest;
 import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @ClassName org.diagbot.bigdata.work.ResultDataProxy
@@ -25,6 +22,8 @@ import java.util.Map;
  * @Version 1.0
  **/
 public class ResultDataProxy {
+    protected static String[] vital_filter_data = Constants.vital_filter_data;
+
     public List<FeatureRate> proxy(HttpServletRequest request, BigDataSearchData searchData, List<Map.Entry<String, Float>> featuresOrderList, String featureType) {
         int cursor = 1;
         DecimalFormat df = new DecimalFormat("0.####");
@@ -96,10 +95,10 @@ public class ResultDataProxy {
                 return false;
             }
         }
-        //
-//        if (searchData.getFilters().get(result) != null) {
-//            return false;
-//        }
+        int searched_position = Arrays.binarySearch(vital_filter_data, result);
+        if (searched_position > -1) {
+            return false;
+        }
         return true;
     }
 

common-push/src/main/java/org/diagbot/common/push/cache/CacheFileManager.java

@@ -149,7 +149,7 @@ public class CacheFileManager {
             sql = "select k1.lib_name k1_lib_name, k2.lib_name k2_lib_name from kl_relation r " +
                     "left join kl_concept k1 on k1.id = r.start_id " +
                     "left join kl_concept k2 on k2.id = r.end_id " +
-                    "where r.relation_id = 19 and k1.is_deleted = 'N' and k2.is_deleted = 'N'";
+                    "where r.relation_id = 19 and k1.is_deleted = 'N' and k2.is_deleted = 'N' and k1.lib_type = 1 and k2.lib_type = 1";
             st = conn.createStatement();
             rs = st.executeQuery(sql);
             libraryList = rsToMap(rs, true);

common-push/src/main/java/org/diagbot/common/push/filter/ClassifyDiag.java

@@ -264,10 +264,10 @@ public class ClassifyDiag {
      * @return
      */
     public Set<String> diagProcess(List<String> disList,int sign){
-        Set<String> first = new HashSet<>();
-        Set<String> second= new HashSet<>();
-        Set<String> third= new HashSet<>();
-        Set<String> other= new HashSet<>();
+        Set<String> first = new LinkedHashSet<>();
+        Set<String> second= new LinkedHashSet<>();
+        Set<String> third= new LinkedHashSet<>();
+        Set<String> other= new LinkedHashSet<>();
 
         /**
          * 分级