Merge branch 'dev/20210326_2.0.2'

src/main/java/com/diagbot/enums/QualityContent.java

@@ -148,7 +148,7 @@ public class QualityContent {
      *   临床用血
      */
     public static List<String> BLOODLIST = Arrays.asList(
-            "交叉配血","血交叉","血常规");
+            "交叉配血","血交叉");
 
     /**
      * 用于代码判断指标1、2、3执行路径

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

@@ -635,22 +635,42 @@ public class ConsoleFacade {
                 String pathologyFee = stringStringMap.get("pathologyFee");
                 String antibiosisFee = stringStringMap.get("antibiosisFee");
                 if(StringUtil.isNotEmpty(operationFee)) {
-                    if (Double.parseDouble(operationFee) > 0) {
+                    double of = 0.0;
+                    try {
+                        of = Double.parseDouble(operationFee);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    if (of > 0) {
                         //手术code
                         operationCode.add(behospitalCode);
                     }
                 }
-                if(StringUtil.isNotEmpty(operationFee)) {
-                    if (Double.parseDouble(operationFee) > 0 && Double.parseDouble(pathologyFee) > QualityContent.pathologyFee) {
+                if(StringUtil.isNotEmpty(operationFee)&&StringUtil.isNotEmpty(pathologyFee)) {
+                    double of = 0.0;
+                    double pf = 0.0;
+                    try {
+                        of = Double.parseDouble(operationFee);
+                        pf = Double.parseDouble(pathologyFee);
+                    } catch (NumberFormatException e) {
+                        e.printStackTrace();
+                    }
+                    if (of > 0 && pf > QualityContent.pathologyFee) {
                         //病理code
                         operationPathologyCode.add(behospitalCode);
                     }
                 }
-                    if(StringUtil.isNotEmpty(operationFee)) {
-                if (Double.parseDouble(antibiosisFee) > 0) {
-                    //抗菌code
-                    antibiosisCode.add(behospitalCode);
-                }
+                    if(StringUtil.isNotEmpty(antibiosisFee)) {
+                        double af = 0.0;
+                        try {
+                            af = Double.parseDouble(antibiosisFee);
+                        } catch (NumberFormatException e) {
+                            e.printStackTrace();
+                        }
+                        if (af > 0) {
+                        //抗菌code
+                        antibiosisCode.add(behospitalCode);
+                    }
             }
             }
         }