diag=null bug修复

graph-web/src/main/java/org/diagbot/graphWeb/work/GraphCalculate.java

@@ -81,7 +81,7 @@ public class GraphCalculate {
         logger.info("页面导入的所有化验项为 :" +lisSet);
 
         //走治疗
-        if (webDiag.trim() != null && webDiag.trim() != "" && featureTypeList.contains("8")) {
+        if (webDiag !=null && webDiag.trim() != null && webDiag.trim() != "" && featureTypeList.contains("8")) {
             // 查找页面诊断里是否有不良反应
             String[] webDiagList = webDiag.split(",|，|、|;|:|；");
             Map<String, List<String>> disUE = neo4jAPI.getDisUE(webDiagList, diseaseType);

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

@@ -363,7 +363,7 @@ public class KnowledgeServiceImpl implements KnowledgeService {
                     lis.addAll(bl);
                     pacs.addAll(bp);
                 }
-            }else {
+            }else if(biglisPacs !=null ) {
                 lis = biglisPacs.get("LIS");
                 pacs = biglisPacs.get("PACS");
                 logger.info("界面无诊断的情况下,推出诊断的lis为: "+lis);
@@ -373,16 +373,20 @@ public class KnowledgeServiceImpl implements KnowledgeService {
             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(lis !=null && lis.size()>0){
+                for (String l:lis) {
+                    FeatureRate featureRate = new FeatureRate();
+                    featureRate.setFeatureName(l);
+                    lisFeature.add(featureRate);
+                }
             }
+           if(pacs !=null && pacs.size()>0){
+               for (String p:pacs) {
+                   FeatureRate featureRate = new FeatureRate();
+                   featureRate.setFeatureName(p);
+                   pacsFeature.add(featureRate);
+               }
+           }
             lisPacsFeature.put("lisList",lisFeature);
             lisPacsFeature.put("pacsList",pacsFeature);
 

push-web/src/main/java/org/diagbot/push/controller/AlgorithmController.java

@@ -108,11 +108,11 @@ public class AlgorithmController extends BaseController {
         //推送管理评估
         bigDataResponseData.setManagementEvaluation(graphResponseData.getManagementEvaluation());
         //知识图谱直接替换大数据中的检验检查数据
-        graphResponseData = lisPacsCalculate.getLisPacs(request, searchData);
-//        if (!StringUtils.isEmpty(searchData.getDiag())) {
-        bigDataResponseData.setLabs(graphResponseData.getLabs());
-        bigDataResponseData.setPacs(graphResponseData.getPacs());
-//        }
+        if(searchData.getDiag() !=null || searchData.getPushDiags() != null){
+            graphResponseData = lisPacsCalculate.getLisPacs(request, searchData);
+            bigDataResponseData.setLabs(graphResponseData.getLabs());
+            bigDataResponseData.setPacs(graphResponseData.getPacs());
+        }
         response.setData(bigDataResponseData);
         return response;
     }