|
@@ -32,6 +32,7 @@ import com.diagbot.entity.Concept;
|
|
|
import com.diagbot.entity.LexiconRelationship;
|
|
|
import com.diagbot.entity.LibraryInfo;
|
|
|
import com.diagbot.entity.Relation;
|
|
|
+import com.diagbot.enums.LexiconTypeEnum;
|
|
|
import com.diagbot.exception.CommonErrorCode;
|
|
|
import com.diagbot.exception.CommonException;
|
|
|
import com.diagbot.service.RelationService;
|
|
@@ -134,7 +135,7 @@ public class RelationFacade extends RelationServiceImpl {
|
|
|
}
|
|
|
getRelationInfoDetailDTO.setStartId(startLibraryInfo.getConceptId());
|
|
|
getRelationInfoDetailDTO.setStartName(startLibraryInfo.getName());
|
|
|
- getRelationInfoDetailDTO.setStartType(startLibraryInfo.getType());
|
|
|
+ getRelationInfoDetailDTO.setStartType(LexiconTypeEnum.getName(startLibraryInfo.getTypeId().intValue()));
|
|
|
|
|
|
|
|
|
Concept endConcept = conceptFacade.getById(relation.getEndId());
|
|
@@ -147,7 +148,7 @@ public class RelationFacade extends RelationServiceImpl {
|
|
|
}
|
|
|
getRelationInfoDetailDTO.setEndId(endLibraryInfo.getConceptId());
|
|
|
getRelationInfoDetailDTO.setEndName(endLibraryInfo.getName());
|
|
|
- getRelationInfoDetailDTO.setEndType(endLibraryInfo.getType());
|
|
|
+ getRelationInfoDetailDTO.setEndType(LexiconTypeEnum.getName(endLibraryInfo.getTypeId().intValue()));
|
|
|
|
|
|
LexiconRelationship lexiconRelationship = lexiconRelationshipFacade.getById(relation.getRelationId());
|
|
|
if(lexiconRelationship==null||lexiconRelationship.getIsDeleted().equals("Y")){
|