|
@@ -1555,7 +1555,7 @@ public class ConceptFacade extends ConceptServiceImpl {
|
|
|
* @return
|
|
|
*/
|
|
|
public Boolean cacheClearByConceptIds(List<Long> conceptIds) {
|
|
|
- List<Concept> concepts = this.getListByIds(conceptIds);
|
|
|
+ List<Concept> concepts = new ArrayList<>(this.listByIds(conceptIds));
|
|
|
List<String> mealNames = Lists.newArrayList();
|
|
|
List<Concept> mealConcepts = concepts.stream()
|
|
|
.filter(i -> i.getLibType().equals(Long.valueOf(LexiconTypeEnum.LIS_PACKAGE.getKey())))
|
|
@@ -1567,14 +1567,14 @@ public class ConceptFacade extends ConceptServiceImpl {
|
|
|
.collect(Collectors.toList());
|
|
|
List<String> itemNames = itemConcepts.stream().map(i -> i.getLibName()).filter(j -> j != null)
|
|
|
.distinct().collect(Collectors.toList());
|
|
|
- if(ListUtil.isNotEmpty(itemNames)) {
|
|
|
+ if (ListUtil.isNotEmpty(itemNames)) {
|
|
|
mealNames.addAll(lisMappingFacade.getMealNameByItemNames(itemNames));
|
|
|
}
|
|
|
List<Concept> uniqueConcepts = concepts.stream().filter(i -> i.getLibType()
|
|
|
.equals(Long.valueOf(LexiconTypeEnum.LIS_TABLES.getKey()))).collect(Collectors.toList());
|
|
|
List<String> uniqueNames = uniqueConcepts.stream().map(i -> i.getLibName())
|
|
|
.filter(j -> j != null).distinct().collect(Collectors.toList());
|
|
|
- if(ListUtil.isNotEmpty(uniqueNames)) {
|
|
|
+ if (ListUtil.isNotEmpty(uniqueNames)) {
|
|
|
mealNames.addAll(lisMappingFacade.getMealNameByUniqueNames(uniqueNames));
|
|
|
}
|
|
|
mealNames = mealNames.stream().filter(i -> StringUtil.isNotBlank(i)).distinct().collect(Collectors.toList());
|