|
@@ -420,9 +420,10 @@ public class ConceptFacade extends ConceptServiceImpl {
|
|
getConceptInfoDTO.setLibName(getConceptInfoDetailDTOList.stream().filter(i -> i.getIsConcept() != null && i.getIsConcept() == 1).collect(Collectors.toList()));
|
|
getConceptInfoDTO.setLibName(getConceptInfoDetailDTOList.stream().filter(i -> i.getIsConcept() != null && i.getIsConcept() == 1).collect(Collectors.toList()));
|
|
getConceptInfoDTO.setOtherNames(getConceptInfoDetailDTOList.stream().filter(i -> i.getIsConcept() == null || i.getIsConcept() == 0).collect(Collectors.toList()));
|
|
getConceptInfoDTO.setOtherNames(getConceptInfoDetailDTOList.stream().filter(i -> i.getIsConcept() == null || i.getIsConcept() == 0).collect(Collectors.toList()));
|
|
|
|
|
|
- Integer isHasCommon = lexiconFacade.getById(concept.getLibType()).getIsHasCommon();
|
|
|
|
- getConceptInfoDTO.setIsHasCommon(isHasCommon);
|
|
|
|
- if (isHasCommon == 1) {
|
|
|
|
|
|
+ Lexicon lexicon = lexiconFacade.getById(concept.getLibType());
|
|
|
|
+ getConceptInfoDTO.setIsHasCommon(lexicon.getIsHasCommon());
|
|
|
|
+ getConceptInfoDTO.setType(lexicon.getName());
|
|
|
|
+ if (lexicon.getIsHasCommon() == 1) {
|
|
QueryWrapper<ConceptCommon> conceptCommonQe = new QueryWrapper<>();
|
|
QueryWrapper<ConceptCommon> conceptCommonQe = new QueryWrapper<>();
|
|
conceptCommonQe.eq("concept_id", getConceptInfoDetailVO.getConceptId());
|
|
conceptCommonQe.eq("concept_id", getConceptInfoDetailVO.getConceptId());
|
|
ConceptCommon conceptCommon = conceptCommonFacade.getOne(conceptCommonQe);
|
|
ConceptCommon conceptCommon = conceptCommonFacade.getOne(conceptCommonQe);
|