Merge remote-tracking branch 'origin/dev/20210326_2.0.2' into dev/20210326_2.0.2

# Conflicts:
#	src/main/java/com/diagbot/facade/ConsoleFacade.java

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

@@ -632,27 +632,27 @@ public class ConsoleFacade {
                 //出院code
                 outHospitalCode.add(behospitalCode);
                 String operationFee = stringStringMap.get("operationFee");
-                if (StringUtils.isNotEmpty(operationFee)) {
+                String pathologyFee = stringStringMap.get("pathologyFee");
+                String antibiosisFee = stringStringMap.get("antibiosisFee");
+                if(StringUtil.isNotEmpty(operationFee)) {
                     if (Double.parseDouble(operationFee) > 0) {
                         //手术code
                         operationCode.add(behospitalCode);
                     }
                 }
-                String pathologyFee = stringStringMap.get("pathologyFee");
-                if (StringUtils.isNotEmpty(operationFee) && StringUtils.isNotEmpty(pathologyFee)) {
+                if(StringUtil.isNotEmpty(operationFee)) {
                     if (Double.parseDouble(operationFee) > 0 && Double.parseDouble(pathologyFee) > QualityContent.pathologyFee) {
                         //病理code
                         operationPathologyCode.add(behospitalCode);
                     }
                 }
-                String antibiosisFee = stringStringMap.get("antibiosisFee");
-                if (StringUtils.isNotEmpty(antibiosisFee)) {
-                    if (Double.parseDouble(stringStringMap.get("antibiosisFee")) > 0) {
-                        //抗菌code
-                        antibiosisCode.add(behospitalCode);
-                    }
+                    if(StringUtil.isNotEmpty(operationFee)) {
+                if (Double.parseDouble(antibiosisFee) > 0) {
+                    //抗菌code
+                    antibiosisCode.add(behospitalCode);
                 }
             }
+            }
         }
                 if(ListUtil.isNotEmpty(adviceVerify)){
                     for (String code : adviceVerify) {
@@ -1134,8 +1134,8 @@ public class ConsoleFacade {
             }else {
                 mapCode.put("antibiosis",null);
             }
-            if(antibiosisBehospitalCode!=null && antibiosisBehospitalCode.size()>0){
-                mapCode.put("chemotherapyMalignantTumors",antibiosisBehospitalCode);
+            if(chemotherapyMalignantTumorsBehospitalCode!=null && chemotherapyMalignantTumorsBehospitalCode.size()>0){
+                mapCode.put("chemotherapyMalignantTumors",chemotherapyMalignantTumorsBehospitalCode);
             }else {
                 mapCode.put("chemotherapyMalignantTumors",null);
             }