代码优化

src/main/java/com/diagbot/facade/CriticalFacade.java

@@ -55,7 +55,6 @@ public class CriticalFacade {
         criticalNeoDTO1.setCritical(nodeNeoDTO1);
         criticalNeoDTOList.add(criticalNeoDTO1);
         // TODO 测试数据结束
-        // TODO
 
         // 规则处理
         criticalProcess.process(criticalNeoDTOList, wordCrfDTO, res);

src/main/java/com/diagbot/util/CoreUtil.java

@@ -308,21 +308,39 @@ public class CoreUtil {
         BigDecimal min = nodeNeoDTO.getMin();
         BigDecimal max = nodeNeoDTO.getMax();
 
-        if (min != null && max != null) {
-            int minAge = min.intValue();
-            int maxAge = max.intValue();
-            if (minAge <= value && value <= maxAge) {
-                flag = true;
+        // 取区间
+        if (nodeNeoDTO.getValType() == 0) {
+            if (min != null && max != null) {
+                int minNeo = min.intValue();
+                int maxNeo = max.intValue();
+                if (minNeo <= value && value <= maxNeo) {
+                    flag = true;
+                }
+            } else if (min != null && max == null) {
+                int minNeo = min.intValue();
+                if (minNeo <= value) {
+                    flag = true;
+                }
+            } else if (min == null && max != null) {
+                int maxNeo = max.intValue();
+                if (value <= maxNeo) {
+                    flag = true;
+                }
             }
-        } else if (min != null && max == null) {
-            int minAge = min.intValue();
-            if (minAge <= value) {
-                flag = true;
+        } else {
+            // 取两头
+            if (min != null) {
+                int minNeo = min.intValue();
+                if (value <= minNeo) {
+                    flag = true;
+                }
             }
-        } else if (min == null && max != null) {
-            int maxAge = max.intValue();
-            if (value <= maxAge) {
-                flag = true;
+            // 取两头
+            if (max != null) {
+                int maxNeo = max.intValue();
+                if (value >= maxNeo) {
+                    flag = true;
+                }
             }
         }
         return flag;
@@ -340,21 +358,39 @@ public class CoreUtil {
         BigDecimal min = nodeNeoDTO.getMin();
         BigDecimal max = nodeNeoDTO.getMax();
 
-        if (min != null && max != null) {
-            int minAge = min.intValue();
-            int maxAge = max.intValue();
-            if (minAge <= value && value <= maxAge) {
-                flag = true;
+        // 取区间
+        if (nodeNeoDTO.getValType() == 0) {
+            if (min != null && max != null) {
+                double minNeo = min.doubleValue();
+                double maxNeo = max.doubleValue();
+                if (minNeo <= value && value <= maxNeo) {
+                    flag = true;
+                }
+            } else if (min != null && max == null) {
+                double minNeo = min.doubleValue();
+                if (minNeo <= value) {
+                    flag = true;
+                }
+            } else if (min == null && max != null) {
+                double maxNeo = max.doubleValue();
+                if (value <= maxNeo) {
+                    flag = true;
+                }
             }
-        } else if (min != null && max == null) {
-            int minAge = min.intValue();
-            if (minAge <= value) {
-                flag = true;
+        } else {
+            // 取两头
+            if (min != null) {
+                double minNeo = min.doubleValue();
+                if (value <= minNeo) {
+                    flag = true;
+                }
             }
-        } else if (min == null && max != null) {
-            int maxAge = max.intValue();
-            if (value <= maxAge) {
-                flag = true;
+            // 取两头
+            if (max != null) {
+                double maxNeo = max.doubleValue();
+                if (value >= maxNeo) {
+                    flag = true;
+                }
             }
         }
         return flag;