Browse Source

临界值判断

zhoutg 3 years ago
parent
commit
9bc97090c4

+ 2 - 2
src/main/java/com/diagbot/process/OtherTipProcess.java

@@ -124,11 +124,11 @@ public class OtherTipProcess {
                     Double ageNum = wordCrfDTO.getAgeNum();
                     Double min = null, max = null;
                     String suggest = "";
-                    if (ageNum < 0.0191) {
+                    if (ageNum < 0.019) {
                         min = 110D;
                         max = 170D;
                         suggest = "年龄0-6天心率正常值为110-170bpm";
-                    } else if (ageNum < 0.16438) {
+                    } else if (ageNum < 0.164) {
                         min = 90D;
                         max = 160D;
                         suggest = "年龄7-59天心率正常值为90-160bpm";

+ 19 - 19
src/main/java/com/diagbot/util/CoreUtil.java

@@ -696,8 +696,8 @@ public class CoreUtil {
             if (isNumbers(ageStr)) {
                 return Double.parseDouble(ageStr);
             }
-            // 20日
-            if (ageStr.endsWith("日")) {
+            // 20日 | 20天
+            if (ageStr.endsWith("日") || ageStr.endsWith("天")) {
                 return getHalfUp((Double.parseDouble(ageStr.substring(0, ageStr.length() - 1))) / 365);
             }
             // 3岁
@@ -719,22 +719,22 @@ public class CoreUtil {
             // 1.08月 | .11月 | 3月
             if (ageYue(ageStr)) {
                 String noUnit = ageStr.substring(0, ageStr.length() - 1);
-                String[] ageArr = new String[2];
-                String[] splitArr = noUnit.split("\\.");
-                if (splitArr.length == 1) {
-                    ageArr[0] = splitArr[0];
-                } else if (splitArr.length == 2) {
-                    ageArr[0] = splitArr[0];
-                    ageArr[1] = splitArr[1];
-                }
-                Double daySum = 0.0D;
-                if (StringUtil.isNotBlank(ageArr[0])) {
-                    daySum += Double.parseDouble(ageArr[0]) * 30;
-                }
-                if (StringUtil.isNotBlank(ageArr[1])) {
-                    daySum += Double.parseDouble(ageArr[1]);
-                }
-                return getHalfUp(daySum / 365);
+                // String[] ageArr = new String[2];
+                // String[] splitArr = noUnit.split("\\.");
+                // if (splitArr.length == 1) {
+                //     ageArr[0] = splitArr[0];
+                // } else if (splitArr.length == 2) {
+                //     ageArr[0] = splitArr[0];
+                //     ageArr[1] = splitArr[1];
+                // }
+                // Double daySum = 0.0D;
+                // if (StringUtil.isNotBlank(ageArr[0])) {
+                //     daySum += Double.parseDouble(ageArr[0]) * 30;
+                // }
+                // if (StringUtil.isNotBlank(ageArr[1])) {
+                //     daySum += Double.parseDouble(ageArr[1]);
+                // }
+                return getHalfUp(Double.parseDouble(noUnit) / 12);
             }
         } catch (Exception e) {
             e.printStackTrace();
@@ -767,7 +767,7 @@ public class CoreUtil {
 
 
     /**
-     * 判断年龄字符串:xx
+     * 判断年龄字符串:1.08
      *
      * @param str
      * @return