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

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

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

@@ -299,7 +299,7 @@ public class ParamsDataProxy {
             NegativeEnum lexemeNegativeEnum = NegativeEnum.parseOfValue(lexeme.getProperty());
             if (lexemeNegativeEnum == NegativeEnum.VITAL_INDEX || lexemeNegativeEnum == NegativeEnum.SYMPTOM || lexemeNegativeEnum == NegativeEnum.DIGITS
                     || lexemeNegativeEnum == NegativeEnum.EVENT_TIME || lexemeNegativeEnum == NegativeEnum.UNIT
-                    ) {
+                    || lexemeNegativeEnum == NegativeEnum.DIAG_STAND) {
                 feature.add(lexeme);
             }
         }
@@ -321,6 +321,10 @@ public class ParamsDataProxy {
                                 && NegativeEnum.parseOfValue(feature.get(i + 2).getProperty()) == NegativeEnum.UNIT)
                         ||
                         (NegativeEnum.parseOfValue(feature.get(i).getProperty()) == NegativeEnum.SYMPTOM
+                                && NegativeEnum.parseOfValue(feature.get(i + 1).getProperty()) == NegativeEnum.DIGITS
+                                && NegativeEnum.parseOfValue(feature.get(i + 2).getProperty()) == NegativeEnum.EVENT_TIME)
+                        ||
+                        (NegativeEnum.parseOfValue(feature.get(i).getProperty()) == NegativeEnum.DIAG_STAND
                                 && NegativeEnum.parseOfValue(feature.get(i + 1).getProperty()) == NegativeEnum.DIGITS
                                 && NegativeEnum.parseOfValue(feature.get(i + 2).getProperty()) == NegativeEnum.EVENT_TIME)) {
                     featureType.add(feature.get(i).getText() + "\t" + feature.get(i + 1).getText() + "\t"
@@ -379,7 +383,6 @@ public class ParamsDataProxy {
             addStandWords += smallerStandWord;
         }
         sData.setSymptom(sData.getSymptom() + "," + addStandWords);
-        System.out.println(sData.getSymptom());
         return sData;
     }
 

graph/src/main/java/org/diagbot/graph/jdbc/Neo4jAPI.java

@@ -2687,7 +2687,7 @@ public class Neo4jAPI {
 
         } catch (Exception ex) {
             ex.printStackTrace();
-            System.out.println("返回带得分需要计算的量表时出了问题！---->getScaleCalc");
+            logger.error("返回带得分需要计算的量表出了问题！---->getScaleCalc2");
         } finally {
             CloseSession(session);
             return scaleStructure;
@@ -2783,7 +2783,7 @@ public class Neo4jAPI {
             }
         } catch (Exception ex) {
             ex.printStackTrace();
-            System.out.println("返回不带得分不需要计算的量表出了问题！---->getScaleNoCalc");
+            logger.error("返回不带得分不需要计算的量表出了问题！---->getScaleNoCalc");
         } finally {
             CloseSession(session);
             return scaleStructure;