|
@@ -251,7 +251,7 @@ public class ConceptFacade extends ConceptServiceImpl {
|
|
|
|
|
|
List<Long> conceptIds = iPage.getRecords().stream().map(i->i.getId()).collect(Collectors.toList());
|
|
|
QueryWrapper<LibraryInfo> libraryInfoQe = new QueryWrapper<>();
|
|
|
- libraryInfoQe.eq("is_deleted", "N");
|
|
|
+ libraryInfoQe.eq("is_deleted", IsDeleteEnum.N.getKey());
|
|
|
libraryInfoQe.in("concept_id", conceptIds);
|
|
|
Map<Long,List<LibraryInfo>> libraryInfoListMap = libraryinfoFacade.list(libraryInfoQe).stream().collect(Collectors.groupingBy(LibraryInfo::getConceptId));
|
|
|
|
|
@@ -267,7 +267,7 @@ public class ConceptFacade extends ConceptServiceImpl {
|
|
|
getAllInformationDTO.setOperName(respDTO.data.get(i.getModifier()));
|
|
|
getAllInformationDTO.setOperTime(i.getGmtModified());
|
|
|
if(libraryInfoListMap.get(i.getId())!=null){
|
|
|
- getAllInformationDTO.setOtherNames(libraryInfoListMap.get(i.getId()).stream().map(k->k.getName()).collect(Collectors.joining(" ")));
|
|
|
+ getAllInformationDTO.setOtherNames(libraryInfoListMap.get(i.getId()).stream().sorted((a,b)->b.getIsConcept()-a.getIsConcept()).map(k->k.getName()).collect(Collectors.joining("、")));
|
|
|
}
|
|
|
getAllInformationDTOList.add(getAllInformationDTO);
|
|
|
});
|
|
@@ -277,6 +277,25 @@ public class ConceptFacade extends ConceptServiceImpl {
|
|
|
|
|
|
return getAllInformationDTOPage;
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
+ public static void main(String[] args){
|
|
|
+ LibraryInfo libraryInfo1 = new LibraryInfo();
|
|
|
+ libraryInfo1.setIsConcept(1);
|
|
|
+ libraryInfo1.setName("rgb");
|
|
|
+
|
|
|
+ LibraryInfo libraryInfo2 = new LibraryInfo();
|
|
|
+ libraryInfo2.setIsConcept(0);
|
|
|
+ libraryInfo2.setName("zsj");
|
|
|
+
|
|
|
+ List<LibraryInfo> list = Lists.newArrayList();
|
|
|
+ list.add(libraryInfo1);
|
|
|
+ list.add(libraryInfo2);
|
|
|
+
|
|
|
+ String ss = list.stream().sorted((a,b)->b.getIsConcept()-a.getIsConcept()).map(k->k.getName()).collect(Collectors.joining("、"));
|
|
|
+
|
|
|
+ System.out.println(ss);
|
|
|
+ }
|
|
|
|
|
|
/**
|
|
|
* 医学术语命名删除或者恢复
|