|
@@ -306,7 +306,7 @@ public class NeoFacade {
|
|
|
.filter(z->z!=null && NeoUtil.matchBasic(z,sex,age)).map(z->z.getName())
|
|
|
.collect(Collectors.toList());*/
|
|
|
List<String> lis_dis = lises.parallelStream()
|
|
|
- .map(x -> nodeRepository.getDisByLis(x.getUniqueName(), x.getDetailName()))
|
|
|
+ .map(x -> nodeRepository.getDisByLis(x.getName(), x.getUniqueName()+x.getResult()))
|
|
|
.flatMap(List::stream).collect(Collectors.toList());
|
|
|
allDis.addAll(lis_dis);
|
|
|
}
|
|
@@ -372,10 +372,11 @@ public class NeoFacade {
|
|
|
|
|
|
public List<String> getDisByPacsResult(List<String> pacsResult,Double age,Integer sex){
|
|
|
|
|
|
- List<PacsResult> byNameIn = pacsResultRepository.findByNameIn(pacsResult);
|
|
|
+ /*List<PacsResult> byNameIn = pacsResultRepository.findByNameIn(pacsResult);
|
|
|
List<String> allDis = byNameIn.stream()
|
|
|
.map(z -> z.getDisease().stream().filter(o -> NeoUtil.matchBasic(o,sex,age)).map(y -> y.getName()).collect(Collectors.toList())).flatMap(List::stream)
|
|
|
- .collect(Collectors.toList());
|
|
|
+ .collect(Collectors.toList());*/
|
|
|
+ List<String> allDis = pacsResultRepository.getDisByPacsResults(pacsResult);
|
|
|
return allDis;
|
|
|
}
|
|
|
|