Browse Source

无页面诊断情况下,推化验

kongwz 6 years ago
parent
commit
49697c5339

+ 5 - 3
graphdb/src/main/java/org/diagbot/service/impl/KnowledgeServiceImpl.java

@@ -450,15 +450,16 @@ public class KnowledgeServiceImpl implements KnowledgeService {
                 lis.addAll(bl);
                 pacs.addAll(bp);
             }
-        } else if (neo4jlisPacs != null || biglisPacs != null) {
+        } else {
+            if (neo4jlisPacs != null || biglisPacs != null) {
             lis = new HashSet<>();
             pacs = new HashSet<>();
-            if(neo4jlisPacs != null){
+            if (neo4jlisPacs != null) {
                 Set<String> neo4jLis = neo4jlisPacs.get("LIS");
                 Set<String> neo4jpacs = neo4jlisPacs.get("PACS");
                 lis.addAll(neo4jLis);
                 pacs.addAll(neo4jpacs);
-            }else if(biglisPacs != null){
+            } else if (biglisPacs != null) {
                 Set<String> biglis = biglisPacs.get("LIS");
                 Set<String> bigpacs = biglisPacs.get("PACS");
                 lis.addAll(biglis);
@@ -467,6 +468,7 @@ public class KnowledgeServiceImpl implements KnowledgeService {
             logger.info("界面无诊断的情况下,推出诊断的lis为: " + lis);
             logger.info("界面无诊断的情况下,推出诊断的lis为: " + pacs);
         }
+    }
         logger.info("推出的合并lis为: " + lis);
         logger.info("推出的合并pacs为: " + pacs);
         ArrayList<FeatureRate> lisFeature = new ArrayList<>();