Browse Source

术语类型修改

rgb 6 years ago
parent
commit
a09edb8b1d

+ 2 - 1
knowledgeman-service/src/main/java/com/diagbot/facade/LibraryDetailFacade.java

@@ -16,6 +16,7 @@ import com.diagbot.dto.GetLibraryDetailListDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.LibraryDetail;
 import com.diagbot.entity.LibraryInfo;
+import com.diagbot.enums.LexiconTypeEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.LibraryDetailServiceImpl;
@@ -101,7 +102,7 @@ public class LibraryDetailFacade extends LibraryDetailServiceImpl {
 		GetLibraryDetailDTO getLibraryDetailDTO = new GetLibraryDetailDTO();
     	BeanUtil.copyProperties(libraryDetail, getLibraryDetailDTO);
     	getLibraryDetailDTO.setConceptName(libraryInfo.getName());
-    	getLibraryDetailDTO.setConceptType(libraryInfo.getType());
+    	getLibraryDetailDTO.setConceptType(LexiconTypeEnum.getName(libraryInfo.getTypeId().intValue()));
     	
     	return getLibraryDetailDTO;
     }

+ 2 - 1
knowledgeman-service/src/main/java/com/diagbot/facade/MedicalFacade.java

@@ -34,6 +34,7 @@ import com.diagbot.entity.Bodypart;
 import com.diagbot.entity.Concept;
 import com.diagbot.entity.LibraryInfo;
 import com.diagbot.entity.Medical;
+import com.diagbot.enums.LexiconTypeEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.MedicalService;
@@ -132,7 +133,7 @@ public class MedicalFacade extends MedicalServiceImpl {
     	GetMedicalInfoDetailDTO getMedicalInfoDetailDTO = new GetMedicalInfoDetailDTO();
     	BeanUtil.copyProperties(medical, getMedicalInfoDetailDTO);
     	getMedicalInfoDetailDTO.setConceptName(libraryInfo.getName());
-    	getMedicalInfoDetailDTO.setConceptType(libraryInfo.getType());
+    	getMedicalInfoDetailDTO.setConceptType(LexiconTypeEnum.getName(libraryInfo.getTypeId().intValue()));
     	
     	return getMedicalInfoDetailDTO;
     }

+ 3 - 2
knowledgeman-service/src/main/java/com/diagbot/facade/RelationFacade.java

@@ -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")){