lis,pacs判断!=null

graphdb/src/main/java/org/diagbot/service/impl/KnowledgeServiceImpl.java

@@ -310,74 +310,76 @@ public class KnowledgeServiceImpl implements KnowledgeService {
     public Map<String, List<FeatureRate>> getLisPacs(SearchData searchData) {
         Map<String, List<FeatureRate>> lisPacsFeature = new HashMap<>();
         String webDiag = searchData.getDiag();
-        List<String> webDiagList = Arrays.asList(webDiag.split(",|，|、"));
-        List<FeatureRate> bigdataDiagFeature = searchData.getPushDiags();
-        List<String> bigdataDiagList =new LinkedList<>();
-        if(bigdataDiagFeature.size()>0){
-            for (FeatureRate fe:bigdataDiagFeature) {
-                if("neo4j".equals(fe.getRate())){
-                    bigdataDiagList.add(fe.getFeatureName());
-                    logger.info("图谱推出的诊断为: "+fe.getFeatureName());
-                }else {
-                    bigdataDiagList.add(fe.getFeatureName());
-                    logger.info("大数据推出的诊断为: "+fe.getFeatureName());
+        if(webDiag != null && webDiag !=""){
+            List<String> webDiagList = Arrays.asList(webDiag.split(",|，|、"));
+            List<FeatureRate> bigdataDiagFeature = searchData.getPushDiags();
+            List<String> bigdataDiagList =new LinkedList<>();
+            if(bigdataDiagFeature.size()>0){
+                for (FeatureRate fe:bigdataDiagFeature) {
+                    if("neo4j".equals(fe.getRate())){
+                        bigdataDiagList.add(fe.getFeatureName());
+                        logger.info("图谱推出的诊断为: "+fe.getFeatureName());
+                    }else {
+                        bigdataDiagList.add(fe.getFeatureName());
+                        logger.info("大数据推出的诊断为: "+fe.getFeatureName());
+                    }
                 }
             }
-        }
-        for (String web: webDiagList ) {
-            for (int i=0;i<bigdataDiagList.size();i++ ) {
-                if(bigdataDiagList.get(i).equals(web)){
-                    bigdataDiagList.remove(bigdataDiagList.get(i));
+            for (String web: webDiagList ) {
+                for (int i=0;i<bigdataDiagList.size();i++ ) {
+                    if(bigdataDiagList.get(i).equals(web)){
+                        bigdataDiagList.remove(bigdataDiagList.get(i));
+                    }
                 }
             }
-        }
-        logger.info("界面诊断为: " + webDiagList);
-        Map<String, Set<String>> weblisPacs =null;
-        Map<String, Set<String>> biglisPacs =null;
-        if(webDiagList !=null && webDiagList.size()>0){
-            weblisPacs = processLisPacs(webDiagList);
-        }
-        if(bigdataDiagList !=null && bigdataDiagList.size()>0){
-            biglisPacs = processLisPacs(bigdataDiagList);
-        }
-        Set<String> lis =null;
-        Set<String> pacs =null;
-        //如果界面有诊断
-        if(weblisPacs !=null && weblisPacs.values().size()>0){
-            lis = weblisPacs.get("LIS");
-            pacs = weblisPacs.get("PACS");
-            logger.info("界面有诊断的情况下,界面诊断推出的lis为: "+lis);
-            logger.info("界面有诊断的情况下,界面诊断推出的pacs为: "+pacs);
-            if(biglisPacs !=null && biglisPacs.values().size()>0){
-                Set<String> bl = biglisPacs.get("LIS");
-                Set<String>  bp= biglisPacs.get("PACS");
-                logger.info("界面有诊断的情况下,推出诊断的lis为: "+bl);
-                logger.info("界面有诊断的情况下,推出诊断的pacs为: "+bp);
-                lis.addAll(bl);
-                pacs.addAll(bp);
+            logger.info("界面诊断为: " + webDiagList);
+            Map<String, Set<String>> weblisPacs =null;
+            Map<String, Set<String>> biglisPacs =null;
+            if(webDiagList !=null && webDiagList.size()>0){
+                weblisPacs = processLisPacs(webDiagList);
             }
-        }else {
-            lis = biglisPacs.get("LIS");
-            pacs = biglisPacs.get("PACS");
-            logger.info("界面无诊断的情况下,推出诊断的lis为: "+lis);
-            logger.info("界面无诊断的情况下,推出诊断的lis为: "+pacs);
-        }
-        logger.info("推出的合并lis为: " + lis);
-        logger.info("推出的合并pacs为: " + pacs);
-        ArrayList<FeatureRate> lisFeature = new ArrayList<>();
-        ArrayList<FeatureRate> pacsFeature = new ArrayList<>();
-        for (String l:lis) {
-            FeatureRate featureRate = new FeatureRate();
-            featureRate.setFeatureName(l);
-            lisFeature.add(featureRate);
-        }
-        for (String p:pacs) {
-            FeatureRate featureRate = new FeatureRate();
-            featureRate.setFeatureName(p);
-            pacsFeature.add(featureRate);
+            if(bigdataDiagList !=null && bigdataDiagList.size()>0){
+                biglisPacs = processLisPacs(bigdataDiagList);
+            }
+            Set<String> lis =null;
+            Set<String> pacs =null;
+            //如果界面有诊断
+            if(weblisPacs !=null && weblisPacs.values().size()>0){
+                lis = weblisPacs.get("LIS");
+                pacs = weblisPacs.get("PACS");
+                logger.info("界面有诊断的情况下,界面诊断推出的lis为: "+lis);
+                logger.info("界面有诊断的情况下,界面诊断推出的pacs为: "+pacs);
+                if(biglisPacs !=null && biglisPacs.values().size()>0){
+                    Set<String> bl = biglisPacs.get("LIS");
+                    Set<String>  bp= biglisPacs.get("PACS");
+                    logger.info("界面有诊断的情况下,推出诊断的lis为: "+bl);
+                    logger.info("界面有诊断的情况下,推出诊断的pacs为: "+bp);
+                    lis.addAll(bl);
+                    pacs.addAll(bp);
+                }
+            }else {
+                lis = biglisPacs.get("LIS");
+                pacs = biglisPacs.get("PACS");
+                logger.info("界面无诊断的情况下,推出诊断的lis为: "+lis);
+                logger.info("界面无诊断的情况下,推出诊断的lis为: "+pacs);
+            }
+            logger.info("推出的合并lis为: " + lis);
+            logger.info("推出的合并pacs为: " + pacs);
+            ArrayList<FeatureRate> lisFeature = new ArrayList<>();
+            ArrayList<FeatureRate> pacsFeature = new ArrayList<>();
+            for (String l:lis) {
+                FeatureRate featureRate = new FeatureRate();
+                featureRate.setFeatureName(l);
+                lisFeature.add(featureRate);
+            }
+            for (String p:pacs) {
+                FeatureRate featureRate = new FeatureRate();
+                featureRate.setFeatureName(p);
+                pacsFeature.add(featureRate);
+            }
+            lisPacsFeature.put("lisList",lisFeature);
+            lisPacsFeature.put("pacsList",pacsFeature);
         }
-        lisPacsFeature.put("lisList",lisFeature);
-        lisPacsFeature.put("pacsList",pacsFeature);
         return lisPacsFeature;
     }