优化症状推诊断

src/main/java/com/diagbot/facade/NeoFacade.java

@@ -250,10 +250,13 @@ public class NeoFacade {
         if(lisPushVo != null){
             List<Lis> lises = lisPushVo.getLises();
             if(ListUtil.isNotEmpty(lises)){
-                List<String> lis_dis = lises.parallelStream()
+                /*List<String> lis_dis = lises.parallelStream()
                         .map(x -> nodeRepository.getDisByLis(x.getUniqueName(), x.getDetailName()))
                         .filter(z->z!=null && NeoUtil.matchBasic(z,sex,age)).map(z->z.getName())
-                        .collect(Collectors.toList());
+                        .collect(Collectors.toList());*/
+                List<String> lis_dis = lises.parallelStream()
+                        .map(x -> nodeRepository.getDisByLis(x.getUniqueName(), x.getDetailName()))
+                        .flatMap(List::stream).collect(Collectors.toList());
                 allDis.addAll(lis_dis);
             }
         }

src/main/java/com/diagbot/repository/BaseNodeRepository.java

@@ -42,8 +42,8 @@ public interface BaseNodeRepository extends Neo4jRepository<BaseNode, Long> {
     List<String> getSymptomClass();
 
     //化验查疾病
-    @Query("match(d:医保疾病名称)-[r1]->(l:化验套餐名称{name:{lisBig}})-[r:化验套餐名称相关化验细项及结果]->(lr:化验细项及结果{name:{subres}}),(d)-[r2]->(lr) return d")
-    YiBaoDiseaseName getDisByLis(@Param("lisBig") String lisBig,@Param("subres") String subres);
+    @Query("match(d:医保疾病名称)-[r1]->(l:化验套餐名称{name:{lisBig}})-[r:化验套餐名称相关化验细项及结果]->(lr:化验细项及结果{name:{subres}}),(d)-[r2]->(lr) return d.name")
+    List<String> getDisByLis(@Param("lisBig") String lisBig,@Param("subres") String subres);
 
     @Query("match(d:医保疾病名称)-[r:医保疾病名称相关性别]->(h) return DISTINCT d.name+'&'+h.name")
     List<String> getDisSexClass();