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

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

@@ -104,7 +104,7 @@ public class ParamsDataProxy {
         }
         if (!StringUtils.isEmpty(searchData.getOther()) || !StringUtils.isEmpty(searchData.getIndications())) {
             //提取其他史等
-            featuresList = fa.start(searchData.getOther() == null ? "" : searchData.getOther() + searchData.getIndications() == null ? "" : searchData.getIndications(), FeatureType.FEATURE);
+            featuresList = fa.start((searchData.getOther() == null ? "" : searchData.getOther()) + (searchData.getIndications() == null ? "" : searchData.getIndications()), FeatureType.FEATURE);
             paramFeatureInit(searchData, featuresList);
         }
         if (!StringUtils.isEmpty(searchData.getPacs())) {

nlp/src/main/java/org/diagbot/nlp/feature/extract/CaseToken.java

@@ -100,16 +100,14 @@ public abstract class CaseToken {
             }
         }
         if (!hasFeature) {
-            if (sn < 5) {
-                Map<String, Object> fMap = new HashMap<>(10);
-                fMap.put("feature_name", lexeme.getText());
-                fMap.put("feature_type", featureType);
-                fMap.put("negative", key);
-                fMap.put("sn", String.valueOf(sn++));
-                fMap.put("property", lexeme.getProperty());
-                fMap.put("concept", lexeme.getConcept());
-                featuresList.add(fMap);
-            }
+            Map<String, Object> fMap = new HashMap<>(10);
+            fMap.put("feature_name", lexeme.getText());
+            fMap.put("feature_type", featureType);
+            fMap.put("negative", key);
+            fMap.put("sn", String.valueOf(sn++));
+            fMap.put("property", lexeme.getProperty());
+            fMap.put("concept", lexeme.getConcept());
+            featuresList.add(fMap);
         }
     }
 }