LISpacs BUG 修改

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

@@ -105,10 +105,13 @@ public class GraphCalculate {
         if(webDiagList.size()>0){
             lis = weblisPacs.get("LIS");
             lis = new HashSet<>(processResult(lis));
-            lis.addAll(biglisPacs.get("LIS"));
             pacs = weblisPacs.get("PACS");
             pacs = new HashSet<>(processResult(pacs));
-            pacs.addAll(biglisPacs.get("PACS"));
+
+            if (biglisPacs != null && biglisPacs.size()>0) {
+                lis.addAll(biglisPacs.get("LIS"));
+                pacs.addAll(biglisPacs.get("PACS"));
+            }
 
         }else {
             lis=biglisPacs.get("LIS");

graph/src/main/resources/query.properties

@@ -0,0 +1,5 @@
+# \u5904\u7406233\u7684\u6CBB\u7597\u6570\u636E,\u5B58\u5165232
+# \u7B2C\u4E00\u6B65,\u75BE\u75C5\u5230\u7C7B,\u7C7B\u5305\u542B\u836F
+diseaseDrugsMedication=\
+  match(d:Disease{name:'diseaseName'})-[r:\u63A8\u8350]->(h)-[r1:\u5305\u542B]->(l:Medicine) \
+  return d.name,h.name as drug,labels(h)[0] as label,r.p as p,collect(l.name) as collectName