Merge remote-tracking branch 'origin/dev/ruleClass20210805' into dev/ruleClass20210805

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

@@ -2,7 +2,6 @@ package com.diagbot.util;
 
 import com.diagbot.biz.push.entity.Item;
 import com.diagbot.biz.push.entity.Lis;
-import com.diagbot.dto.PushBaseDTO;
 import com.diagbot.dto.RuleBaseDTO;
 import com.diagbot.enums.CommonEnum;
 import com.diagbot.enums.LexiconEnum;
@@ -411,9 +410,11 @@ public class CoreUtil {
                 List<Usual> usualList = vital.getUsualList();
                 if (ruleBaseDTO.getBaseLibName().equals(vital.getStandName()) && vital.getPd() != null
                         && StringUtil.isNotBlank(vital.getPd().getValue())) {
-                    flag = compareNum(ruleBaseDTO, Double.parseDouble(vital.getPd().getValue()));
-                    if (flag) {
-                        msgList.add(vital.getName() + subZeroAndDot(String.valueOf(vital.getPd().getValue())));
+                    if (CoreUtil.isNumbers(vital.getPd().getValue())) {
+                        flag = compareNum(ruleBaseDTO, Double.parseDouble(vital.getPd().getValue()));
+                        if (flag) {
+                            msgList.add(vital.getName() + subZeroAndDot(String.valueOf(vital.getPd().getValue())));
+                        }
                     }
                 } else if (ListUtil.isNotEmpty(usualList)) { // 血压比较
                     for (Usual usual : usualList) {
@@ -1269,17 +1270,22 @@ public class CoreUtil {
     }
 
     public static void main(String[] args) {
-        List<PushBaseDTO> pushBaseDTOList = ListUtil.newArrayList();
-        PushBaseDTO pushBaseDTO = new PushBaseDTO();
-        pushBaseDTO.setName("a1");
-        pushBaseDTOList.add(pushBaseDTO);
-
-        PushBaseDTO pushBaseDTO1 = new PushBaseDTO();
-        pushBaseDTO1.setName("a1");
-        pushBaseDTOList.add(pushBaseDTO1);
-
-        removeRepeat(pushBaseDTOList, "name");
-        System.out.println(pushBaseDTOList);
+        System.out.println(isNumbers("1.1"));
+        System.out.println(isNumbers("1.."));
+        System.out.println(isNumbers("a1."));
+        System.out.println(isNumbers("1.b"));
+        System.out.println(isNumbers(".9"));
+        // List<PushBaseDTO> pushBaseDTOList = ListUtil.newArrayList();
+        // PushBaseDTO pushBaseDTO = new PushBaseDTO();
+        // pushBaseDTO.setName("a1");
+        // pushBaseDTOList.add(pushBaseDTO);
+        //
+        // PushBaseDTO pushBaseDTO1 = new PushBaseDTO();
+        // pushBaseDTO1.setName("a1");
+        // pushBaseDTOList.add(pushBaseDTO1);
+        //
+        // removeRepeat(pushBaseDTOList, "name");
+        // System.out.println(pushBaseDTOList);
 
         // List<String> list = Lists.newArrayList("a","b","a");
         // list = removeRepeat(list);