Merge branch 'push-dev-filter' into push-cache

Conflicts:
	bigdata-web/src/main/java/org/diagbot/bigdata/common/ApplicationCacheUtil.java

algorithm/src/main/resources/algorithm.properties

@@ -1,7 +1,7 @@
 ################################ model basic url ###################################
 
-basicPath=E:/project/push/algorithm/src/main/models/model_version_replacement/model
-#basicPath=/opt/models/dev/models/model_version_replacement/model
+#basicPath=E:/project/push/algorithm/src/main/models/model_version_replacement/model
+basicPath=/opt/models/dev/models/model_version_replacement/model
 #basicPath=E:/xxx/model_version_replacement/model
 
 ############################### current model version ################################

bigdata-web/src/main/java/org/diagbot/bigdata/common/ApplicationCacheUtil.java

@@ -181,7 +181,9 @@ public class ApplicationCacheUtil {
                     }
                     NegativeEnum lexemeNegativeEnum = NegativeEnum.parseOfValue(lexeme.getProperty());
                     if (lexemeNegativeEnum == NegativeEnum.SYMPTOM || lexemeNegativeEnum == NegativeEnum.CAUSE
-                            || lexemeNegativeEnum == NegativeEnum.VITAL_INDEX) {
+                            || lexemeNegativeEnum == NegativeEnum.VITAL_INDEX
+                            || lexemeNegativeEnum == NegativeEnum.OTHER
+                            || lexemeNegativeEnum == NegativeEnum.DIAG_STAND) {
                         if (!kl_result_mapping_standword_map.containsKey(lexeme.getText())) {
                             kl_result_mapping_standword_map.put(lexeme.getText(), standWordObjValList);
                         } else {