关联模块枚举类型添加

knowledgeman-service/src/main/java/com/diagbot/enums/RelationModelTypeEnum.java

@@ -0,0 +1,51 @@
+package com.diagbot.enums;
+
+import com.diagbot.core.KeyedNamed;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2019/5/7 14:06
+ */
+public enum RelationModelTypeEnum implements KeyedNamed {
+    KSCY(471011,"科室常用"),
+    HYCY(4710112,"化验常用"),
+    FJCY(4710115,"辅检常用"),
+    ZDGLLB(1810148,"诊断关联量表");
+
+    @Setter
+    private Integer key;
+
+    @Setter
+    private String name;
+
+    RelationModelTypeEnum(Integer key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static RelationModelTypeEnum getEnum(Integer key) {
+        for (RelationModelTypeEnum item : RelationModelTypeEnum.values()) {
+            if (item.key == key) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(Integer key) {
+        RelationModelTypeEnum item = getEnum(key);
+        return item != null ? item.name : null;
+    }
+
+    @Override
+    public int getKey() {
+        return key;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+}

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

@@ -21,6 +21,7 @@ import com.diagbot.entity.Relation;
 import com.diagbot.entity.RelationOrder;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.LexiconTypeEnum;
+import com.diagbot.enums.RelationModelTypeEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.RelationService;
@@ -62,6 +63,10 @@ public class RelationContactFacade extends RelationServiceImpl {
      * @return
      */
     public IPage<SingleRelationListDTO> relationContactList(SingleRelationListVO singleRelationListVO) {
+    	String[] relationModelTypeArry = singleRelationListVO.getRelationModelTypeCode().split("101");
+    	singleRelationListVO.setStartTypeId(Long.parseLong(relationModelTypeArry[0]));
+    	singleRelationListVO.setEndTypeId(Long.parseLong(relationModelTypeArry[1]));
+    	
     	IPage<SingleRelationListDTO> ipage = this.baseMapper.singleRelationList(singleRelationListVO);
         if (ipage.getRecords().size() > 0) {
             List<String> ids = ipage.getRecords().stream().map(i -> i.getOperName()).distinct().collect(Collectors.toList());
@@ -69,6 +74,9 @@ public class RelationContactFacade extends RelationServiceImpl {
             RespDTOUtil.respNGDealCover(respDTO, "获取用户信息失败");
             ipage.getRecords().forEach(i -> {
                 i.setOperName(respDTO.data.get(i.getOperName()));
+                i.setLibType(LexiconTypeEnum.getName(i.getLibTypeId().intValue()));
+                i.setLibNameType(i.getLibName()+"("+i.getLibType()+")");
+                i.setRelationModelTypeName(RelationModelTypeEnum.getName(Integer.parseInt(i.getRelationModelTypeCode())));
             });
         }
         return ipage;

knowledgeman-service/src/main/java/com/diagbot/vo/SingleRelationListVO.java

@@ -26,11 +26,11 @@ public class SingleRelationListVO extends Page {
     private String name;
     
     /**
-     * 关系模块类型：科室常用、化验常用、辅检常用、诊断关联量表
+     * 关系模块类型编码：科室常用、化验常用、辅检常用、诊断关联量表
      */
-    @NotBlank(message="关系模块类型必传")
-    @ApiModelProperty(value="关系模块类型：科室常用、化验常用、辅检常用、诊断关联量表")
-    private String relationModelType;
+    @NotBlank(message="关系模块类型编码必传")
+    @ApiModelProperty(value="关系模块类型编码：科室常用、化验常用、辅检常用、诊断关联量表")
+    private String relationModelTypeCode;
 
     /**
      * 起始术语类型id

knowledgeman-service/src/main/resources/mapper/RelationMapper.xml

@@ -178,7 +178,7 @@
 		d.id AS conceptId,
 		d.lib_name AS libName,
 		d.lib_type AS libTypeId,
-		CONCAT(d.lib_type,"-",e.lib_type) AS relationModelTypeCode,
+		CONCAT(d.lib_type,"101",e.lib_type) AS relationModelTypeCode,
 		GROUP_CONCAT(e.lib_name ORDER BY f.order_no ASC) AS otherNames,
 		a.modifier AS operName,
 		a.gmt_modified AS operTime,