修改规则判断代码

common-push/src/main/java/org/diagbot/common/push/filter/rule/PretreatmentRule.java

@@ -86,15 +86,15 @@ public class PretreatmentRule {
         //标准值最优先匹配
         if (compareEqual(result.getValue(), rule.getEq_value())) {
             content = content + rule.getRemind() == null ? "" : rule.getRemind();
-        } else if (compareMin(result.getValue(), rule.getMax_operator(), rule.getMax_operator())
-                && compareMax(result.getValue(), rule.getMin_operator(), rule.getMin_operator())
+        } else if (compareMin(result.getValue(), rule.getMax_operator(), rule.getMax_operator()) //比最大值小
+                && compareMax(result.getValue(), rule.getMin_operator(), rule.getMin_operator()) //比最小值大
                 && result.getUnits().equals(rule.getMin_operator())
                 && result.getUnits().equals(rule.getMax_operator())) {
             content = content + rule.getRemind() == null ? "" : rule.getRemind();
-        } else if (compareMin(result.getValue(), rule.getMax_value(), rule.getMax_operator())   //比最大值小
+        } else if (compareMin(result.getValue(), rule.getMin_value(), rule.getMin_operator())   //比最小值小
                 && result.getUnits().equals(rule.getMin_operator())) {
             content = content + rule.getRemind() == null ? "" : rule.getRemind();
-        } else if (compareMax(result.getValue(), rule.getMin_value(), rule.getMin_operator())   //比最小值大
+        } else if (compareMax(result.getValue(), rule.getMax_value(), rule.getMax_operator())   //比最大值大
                 && result.getUnits().equals(rule.getMin_operator())) {
             content = content + rule.getRemind() == null ? "" : rule.getRemind();
         }