Merge remote-tracking branch 'origin/dev/mix20190806_version' into dev/mix20190806_version

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

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.client.UserServiceClient;
 import com.diagbot.dto.OnlyByRootListDTO;
 import com.diagbot.dto.RespDTO;
+import com.diagbot.enums.LexiconTypeEnum;
 import com.diagbot.service.impl.RelationServiceImpl;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.RespDTOUtil;
@@ -33,7 +34,6 @@ public class MultContactFacade extends RelationServiceImpl {
      * @return
      */
     public IPage<OnlyByRootListDTO> multContactList(OnlyByRootListVO onlyByRootListVO) {
-    	
     	IPage<OnlyByRootListDTO> ipage = this.baseMapper.onlyByRootList(onlyByRootListVO);
     	
     	if(ListUtil.isNotEmpty(ipage.getRecords())){
@@ -43,6 +43,9 @@ public class MultContactFacade extends RelationServiceImpl {
         	
         	ipage.getRecords().forEach(i->{
         		i.setOperName(respDTO.data.get(i.getOperName()));
+        		i.setLibType(LexiconTypeEnum.getName(i.getLibTypeId().intValue()));
+                i.setLibNameType(i.getLibName()+"("+i.getLibType()+")");
+        		
         	});
     	}
 

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

@@ -68,7 +68,7 @@ public class RelationContactFacade extends RelationServiceImpl {
     	singleRelationListVO.setEndTypeId(Long.parseLong(relationModelTypeArry[1]));
     	
     	IPage<SingleRelationListDTO> ipage = this.baseMapper.singleRelationList(singleRelationListVO);
-        if (ipage.getRecords().size() > 0) {
+        if (ListUtil.isNotEmpty(ipage.getRecords())) {
             List<String> ids = ipage.getRecords().stream().map(i -> i.getOperName()).distinct().collect(Collectors.toList());
             RespDTO<Map<String, String>> respDTO = userServiceClient.getUserInfoByIds(ids);
             RespDTOUtil.respNGDealCover(respDTO, "获取用户信息失败");

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

@@ -1,19 +1,17 @@
 package com.diagbot.service.impl;
 
-import java.util.List;
-import java.util.Map;
-
-import com.diagbot.enums.ProductTypeEnum;
-import com.diagbot.enums.RelationModelTypeEnum;
-
-import org.springframework.stereotype.Service;
-
 import com.diagbot.enums.DisclaimerCodeEnum;
 import com.diagbot.enums.LexiconRSTypeEnum;
 import com.diagbot.enums.LexiconTypeEnum;
 import com.diagbot.enums.PositionTypeEnum;
+import com.diagbot.enums.ProductTypeEnum;
+import com.diagbot.enums.RelationModelTypeEnum;
 import com.diagbot.service.EnumsDataService;
 import com.diagbot.util.EnumEntriesBuilder;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Description: 枚举数据接口是实现类
@@ -37,12 +35,17 @@ public class EnumsDataServiceImpl implements EnumsDataService {
                 .addEnums("lexiconTypeEnum", LexiconTypeEnum.values())
                 .addEnums("productTypeEnum", ProductTypeEnum.values())
                 .addEnums("concatLexiconTypeEnum",
-                		LexiconTypeEnum.SYMPTOM,LexiconTypeEnum.BODYPART,LexiconTypeEnum.LIS_PACKAGE,LexiconTypeEnum.PACS_PACKAGE,
-                		LexiconTypeEnum.PACS_ITEMS,LexiconTypeEnum.DIAGNOSIS,LexiconTypeEnum.PACS_CATEGORY_BIG,LexiconTypeEnum.PACS_CATEGORY_SMALL,
-                		LexiconTypeEnum.DEPARTMENT,LexiconTypeEnum.GAUGE,LexiconTypeEnum.SIDE_EFFECTS,LexiconTypeEnum.CORE_INDICATORS,
-                		LexiconTypeEnum.LIS_TABLES)
-                .addEnums("conceptDetailLexiconTypeEnum", LexiconTypeEnum.DIAGNOSIS,LexiconTypeEnum.LIS_TABLES,LexiconTypeEnum.PACS_ITEMS,
-                		LexiconTypeEnum.DRUGS,LexiconTypeEnum.SIDE_EFFECTS)
+                        LexiconTypeEnum.SYMPTOM, LexiconTypeEnum.BODYPART,
+                        LexiconTypeEnum.LIS_PACKAGE, LexiconTypeEnum.PACS_PACKAGE,
+                        LexiconTypeEnum.PACS_ITEMS, LexiconTypeEnum.DIAGNOSIS,
+                        LexiconTypeEnum.PACS_CATEGORY_BIG, LexiconTypeEnum.PACS_CATEGORY_SMALL,
+                        LexiconTypeEnum.DEPARTMENT, LexiconTypeEnum.GAUGE,
+                        LexiconTypeEnum.SIDE_EFFECTS, LexiconTypeEnum.CORE_INDICATORS,
+                        LexiconTypeEnum.LIS_TABLES)
+                .addEnums("conceptDetailLexiconTypeEnum",
+                        LexiconTypeEnum.DIAGNOSIS, LexiconTypeEnum.LIS_TABLES,
+                        LexiconTypeEnum.PACS_ITEMS, LexiconTypeEnum.DRUGS,
+                        LexiconTypeEnum.SIDE_EFFECTS)
                 .addEnums("relationModelTypeEnum", RelationModelTypeEnum.values())
                 .build();
         return enumMap;

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

@@ -21,6 +21,12 @@ public class GetConceptDetailListVO extends Page {
      */
 	@ApiModelProperty(value="术语名称")
     private String conceptName;
+	
+	/**
+     * 术语类型id
+     */
+	@ApiModelProperty(value="术语类型id")
+    private Long libType;
 
 
 	@ApiModelProperty(value = "状态值,已删除=Y，启用中=N")

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

@@ -29,6 +29,9 @@
 		<if test="status!=null and status!=''">
 			and a.is_deleted = #{status}
 		</if>
+		<if test="libType!=null">
+			and b.lib_type=#{libType}
+		</if>
         group by a.concept_id
         ORDER BY a.is_deleted ASC, a.gmt_modified DESC
    	</select>

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

@@ -124,10 +124,14 @@
 		(SELECT start_id FROM kl_relation WHERE relation_id=#{relationId} AND is_deleted='N') c
 		ON a.end_id=c.start_id
 		JOIN 
-		(SELECT id,lib_name,lib_type FROM kl_concept WHERE is_deleted='N' AND lib_type=#{startTypeId} AND lib_name LIKE CONCAT("%",#{name},"%")) d
+		(SELECT id,lib_name,lib_type FROM kl_concept WHERE is_deleted='N' AND lib_type=#{startTypeId} 
+		<if test="name!=null and name!=''">
+			AND lib_name LIKE CONCAT("%",#{name},"%")
+		</if>
+		) d
 		ON a.start_id=d.id
 		JOIN
-		(SELECT id,lib_name,lib_type FROM kl_concept WHERE is_deleted='N' AND lib_type=#{endTypeId}) e
+		(SELECT id,lib_name,lib_type FROM kl_concept WHERE lib_type=#{endTypeId}) e
 		ON a.end_id=e.id
 		LEFT JOIN kl_relation_order f ON a.id=f.t_relation_id
 		WHERE b.end_id IS NULL AND c.start_id IS NULL
@@ -155,7 +159,10 @@
 		<foreach collection="startTypeIds" open="(" close=")" separator="," item="startTypeId">
 			#{startTypeId}
 		</foreach>
-		AND lib_name LIKE CONCAT("%",#{name},"%")) c
+		<if test="name!=null and name!=''">
+			AND lib_name LIKE CONCAT("%",#{name},"%")
+		</if>
+		) c
 		ON a.start_id=c.id
 		JOIN kl_concept d ON a.end_id=d.id
 		LEFT JOIN kl_relation_order e ON a.id=e.t_relation_id