调整

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

@@ -702,8 +702,8 @@ public class ConsoleFacade {
                 //恶性肿瘤化学治疗人数
                 Set<String> chemotherapyMalignantTumorsList = adviceNum.get("chemotherapyMalignantTumors");
                 Long chemotherapyMalignantTumorsNum =0L;
-                if(operationList!=null&&operationList.size()>0) {
-                    chemotherapyMalignantTumorsNum=   Long.valueOf(chemotherapyMalignantTumorsList.size());
+                if(chemotherapyMalignantTumorsList!=null&&chemotherapyMalignantTumorsList.size()>0) {
+                    chemotherapyMalignantTumorsNum=Long.valueOf(chemotherapyMalignantTumorsList.size());
                 }
                 //出院人数
                     if(startCount!=null){
@@ -1087,45 +1087,46 @@ public class ConsoleFacade {
         }finally {
             myPool.shutdown();
 
-            if(CTBehospitalCode!=null && CTBehospitalCode.size()>0){
-                mapCode.put("CT",null);
-            }else {
+            if(CTBehospitalCode !=null && CTBehospitalCode.size()>0){
                 mapCode.put("CT",CTBehospitalCode);
+            }else {
+                mapCode.put("CT",null);
             }
             if(MRBehospitalCode!=null && MRBehospitalCode.size()>0){
-                mapCode.put("MR",null);
-            }else {
                 mapCode.put("MR",MRBehospitalCode);
+            }else {
+                mapCode.put("MR",null);
             }
             if(operationBehospitalCode!=null && operationBehospitalCode.size()>0){
-                mapCode.put("operation",null);
-            }else {
                 mapCode.put("operation",operationBehospitalCode);
-            }
-            if((operationBehospitalCode==null)||(operationPathologyBehospitalCode!=null&&operationPathologyBehospitalCode.size()>0)){
-                mapCode.put("operationPathology",null);
             }else {
+                mapCode.put("operation",null);
+            }
+            if((operationBehospitalCode!=null)&&(operationPathologyBehospitalCode!=null&&operationPathologyBehospitalCode.size()>0)){
                 for (String operation : operationBehospitalCode) {
                     if(pathologyBehospitalCode.contains(operation)){
                         operationPathologyBehospitalCode.add(operation);
                     }
                 }
                 mapCode.put("operationPathology",operationBehospitalCode);
+            }else {
+                mapCode.put("operationPathology",null);
             }
             if(bacterialCultureCode!=null && bacterialCultureCode.size()>0){
-                mapCode.put("bacterialCulture",null);
-            }else {
                 mapCode.put("bacterialCulture",bacterialCultureCode);
+
+            }else {
+                mapCode.put("bacterialCulture",null);
             }
             if(antibiosisBehospitalCode!=null && antibiosisBehospitalCode.size()>0){
-                mapCode.put("antibiosis",null);
-            }else {
                 mapCode.put("antibiosis",antibiosisBehospitalCode);
+            }else {
+                mapCode.put("antibiosis",null);
             }
             if(antibiosisBehospitalCode!=null && antibiosisBehospitalCode.size()>0){
-                mapCode.put("chemotherapyMalignantTumors",null);
-            }else {
                 mapCode.put("chemotherapyMalignantTumors",antibiosisBehospitalCode);
+            }else {
+                mapCode.put("chemotherapyMalignantTumors",null);
             }
             return mapCode;
         }