术语关系查询枚举添加

knowledgeman-service/src/main/java/com/diagbot/dto/GetAllConceptDTO.java

@@ -21,6 +21,12 @@ public class GetAllConceptDTO {
 	@ApiModelProperty(value="名称")
 	private String name;
 	
+	/**
+	 * 类型id
+	 */
+	@ApiModelProperty(value="类型id")
+	private Long typeId;
+	
 	/**
 	 * 类型
 	 */

knowledgeman-service/src/main/java/com/diagbot/facade/ConceptFacade.java

@@ -165,6 +165,7 @@ public class ConceptFacade extends ConceptServiceImpl {
 
         List<GetAllConceptDTO> getAllConceptDTOList = BeanUtil.listCopyTo(libraryInfoList, GetAllConceptDTO.class);
         getAllConceptDTOList.forEach(i -> {
+        	i.setType(LexiconTypeEnum.getName(i.getTypeId().intValue()));
             i.setNameAndType(i.getName() + "(" + i.getType() + ")");
         });
 
@@ -517,8 +518,9 @@ public class ConceptFacade extends ConceptServiceImpl {
             if (conceptCommon == null) {
                 conceptCommon = new ConceptCommon();
             }
-
+            
             BeanUtil.copyProperties(addConceptInfoVO, conceptCommon);
+            conceptCommon.setConceptId(conceptId);
 
             conceptCommonFacade.saveOrUpdate(conceptCommon);
         }

knowledgeman-service/src/main/java/com/diagbot/service/impl/EnumsDataServiceImpl.java

@@ -1,13 +1,15 @@
 package com.diagbot.service.impl;
 
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.stereotype.Service;
+
 import com.diagbot.enums.DisclaimerCodeEnum;
+import com.diagbot.enums.LexiconRSTypeEnum;
 import com.diagbot.enums.PositionTypeEnum;
 import com.diagbot.service.EnumsDataService;
 import com.diagbot.util.EnumEntriesBuilder;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Map;
 
 /**
  * @Description: 枚举数据接口是实现类
@@ -27,6 +29,7 @@ public class EnumsDataServiceImpl implements EnumsDataService {
         Map<String, List<EnumEntriesBuilder.Entry>> enumMap = new EnumEntriesBuilder()
                 .addEnums("disclaimerCodeEnum", DisclaimerCodeEnum.values())
                 .addEnums("positionTypeEnum", PositionTypeEnum.values())
+                .addEnums("lexiconRSTypeEnum", LexiconRSTypeEnum.values())
                 .build();
         return enumMap;
     }