浏览代码

化验辅检推送更新

kongwz 6 年之前
父节点
当前提交
d8e0e075b4

+ 2 - 1
graphdb/src/main/java/org/diagbot/repository/BaseNodeRepository.java

@@ -23,7 +23,8 @@ public interface BaseNodeRepository extends Neo4jRepository<BaseNode, Long> {
     List<Map<String, Object>> getHighRisk(List diagList);
 
     //get LIS PACS
-    @Query("match (d:Disease)-[r1:推荐]->(m) where d.name in {0} return  labels(m)[0] as label,m.name as name")
+    @Query("unwind {0} as row \n" +
+            " match (d:Disease)-[r1:推荐]->(m) where d.name=row return  labels(m)[0] as label,m.name as name")
     List<Map<String,Object>> getLisPacsList(List diagList);
 
     // get disease

+ 11 - 9
graphdb/src/main/java/org/diagbot/service/impl/KnowledgeServiceImpl.java

@@ -414,9 +414,9 @@ public class KnowledgeServiceImpl implements KnowledgeService {
             }
         }
         logger.info("界面诊断为: " + webDiagList);
-        Map<String, Set<String>> weblisPacs = null;
-        Map<String, Set<String>> neo4jlisPacs = null;
-        Map<String, Set<String>> biglisPacs = null;
+        Map<String, LinkedHashSet<String>> weblisPacs = null;
+        Map<String, LinkedHashSet<String>> neo4jlisPacs = null;
+        Map<String, LinkedHashSet<String>> biglisPacs = null;
         if (webDiagList != null && webDiagList.size() > 0) {
             weblisPacs = processLisPacs(webDiagList);
         }
@@ -843,10 +843,10 @@ public class KnowledgeServiceImpl implements KnowledgeService {
     }
 
 
-    public Map<String, Set<String>> processLisPacs(List<String> webDiagList) {
-        Map<String, Set<String>> lisPacsMap = new HashMap<>();
-        List<String> lisArray = new ArrayList<>();
-        List<String> pacsArray = new ArrayList<>();
+    public Map<String, LinkedHashSet<String>> processLisPacs(List<String> webDiagList) {
+        Map<String, LinkedHashSet<String>> lisPacsMap = new HashMap<>();
+        LinkedHashSet<String> lisArray = new LinkedHashSet<>();
+        LinkedHashSet<String> pacsArray = new LinkedHashSet<>();
         List<Map<String, Object>> lisPacsList = baseNodeRepository.getLisPacsList(webDiagList);
         if (lisPacsList != null && lisPacsList.size() > 0) {
             for (Map<String, Object> f : lisPacsList) {
@@ -859,8 +859,10 @@ public class KnowledgeServiceImpl implements KnowledgeService {
                 }
             }
         }
-        lisPacsMap.put("LIS", processList(lisArray));
-        lisPacsMap.put("PACS", processList(pacsArray));
+//        lisPacsMap.put("LIS", processList(lisArray));
+//        lisPacsMap.put("PACS", processList(pacsArray));
+        lisPacsMap.put("LIS", lisArray);
+        lisPacsMap.put("PACS", pacsArray);
         return lisPacsMap;
     }