术语接口维护修改

knowledgeman-service/src/main/java/com/diagbot/entity/Bodypart.java

@@ -12,7 +12,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
  * </p>
  *
  * @author gaodm
- * @since 2019-03-26
+ * @since 2019-04-01
  */
 public class Bodypart implements Serializable {
 
@@ -67,7 +67,7 @@ public class Bodypart implements Serializable {
     /**
      * 一级部位排序号
      */
-    private Integer order;
+    private Integer orderNo;
 
     public Long getId() {
         return id;
@@ -132,12 +132,12 @@ public class Bodypart implements Serializable {
     public void setBodypart(String bodypart) {
         this.bodypart = bodypart;
     }
-    public Integer getOrder() {
-        return order;
+    public Integer getOrderNo() {
+        return orderNo;
     }
 
-    public void setOrder(Integer order) {
-        this.order = order;
+    public void setOrderNo(Integer orderNo) {
+        this.orderNo = orderNo;
     }
 
     @Override
@@ -152,7 +152,7 @@ public class Bodypart implements Serializable {
         ", subBodypart=" + subBodypart +
         ", subOrder=" + subOrder +
         ", bodypart=" + bodypart +
-        ", order=" + order +
+        ", orderNo=" + orderNo +
         "}";
     }
 }

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

@@ -41,7 +41,7 @@ public class BodypartFacade extends BodypartServiceImpl {
     		GetAllBodypartDTO getAllBodypartDTO = new GetAllBodypartDTO();
     		if(getAllBodypartVO.getLevel()==1){
     			getAllBodypartDTO.setName(i.getBodypart());
-    			getAllBodypartDTO.setOrderNo(i.getOrder());
+    			getAllBodypartDTO.setOrderNo(i.getOrderNo());
     		}else{
     			getAllBodypartDTO.setName(i.getSubBodypart());
     			getAllBodypartDTO.setOrderNo(i.getSubOrder());

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

@@ -135,25 +135,31 @@ public class ConceptFacade extends ConceptServiceImpl {
      * @return
      */
     public Boolean removeConceptInfo(RemoveConceptInfoVO removeConceptInfoVO) {
-    	QueryWrapper<Relation> relationQe = new QueryWrapper<Relation>();
-    	relationQe.eq("is_deleted", "N");
-    	relationQe.and(i->i.eq("start_id", removeConceptInfoVO.getConceptId()).or().eq("end_id", removeConceptInfoVO.getConceptId()));
-    	if(relationFacade.list(relationQe).size()>0){
-    		throw new CommonException(CommonErrorCode.RPC_ERROR,"关系信息未删除");
-    	}
+    	StringBuffer sbf = new StringBuffer();
     	
     	QueryWrapper<Medical> medicalQe = new QueryWrapper<Medical>();
     	medicalQe.eq("is_deleted", "N");
     	medicalQe.eq("concept_id", removeConceptInfoVO.getConceptId());
     	if(medicalFacade.list(medicalQe).size()>0){
-    		throw new CommonException(CommonErrorCode.RPC_ERROR,"医学信息未删除");
+    		sbf.append("请先解除医学属性关联 ");
+    	}
+    	
+    	QueryWrapper<Relation> relationQe = new QueryWrapper<Relation>();
+    	relationQe.eq("is_deleted", "N");
+    	relationQe.and(i->i.eq("start_id", removeConceptInfoVO.getConceptId()).or().eq("end_id", removeConceptInfoVO.getConceptId()));
+    	if(relationFacade.list(relationQe).size()>0){
+    		sbf.append("请先解除术语关系关联 ");
     	}
     	
     	QueryWrapper<LibraryDetail> libraryDetailQe = new QueryWrapper<LibraryDetail>();
     	libraryDetailQe.eq("is_deleted", "N");
     	libraryDetailQe.eq("concept_id", removeConceptInfoVO.getConceptId());
     	if(libraryDetailFacade.list(libraryDetailQe).size()>0){
-    		throw new CommonException(CommonErrorCode.RPC_ERROR,"静态知识信息未删除");
+    		sbf.append("请先解除医学静态知识关联 ");
+    	}
+    	
+    	if(sbf.length()>0){
+    		throw new CommonException(CommonErrorCode.RPC_ERROR,sbf.toString());
     	}
     	
     	String currentUser = UserUtils.getCurrentPrincipleID();
@@ -180,16 +186,20 @@ public class ConceptFacade extends ConceptServiceImpl {
     /**
      * 获取医学术语命名详情
      * @param getConceptInfoDetailVO
-     * @return 第一个是标准术语，其他的都是同义词
+     * @return 1-标准术语，0-同义词
      */
-    public List<GetConceptInfoDetailDTO> getConceptInfoDetail(GetConceptInfoDetailVO getConceptInfoDetailVO){
+    public Map<String,List<GetConceptInfoDetailDTO>> getConceptInfoDetail(GetConceptInfoDetailVO getConceptInfoDetailVO){
     	QueryWrapper<LibraryInfo> libraryInfoQe = new QueryWrapper<LibraryInfo>();
     	libraryInfoQe.eq("concept_id", getConceptInfoDetailVO.getConceptId());
     	libraryInfoQe.eq("is_deleted", "N");
-    	libraryInfoQe.orderByDesc("is_concept").orderByAsc("order_no");
+    	libraryInfoQe.orderByAsc("order_no");
     	List<LibraryInfo> libraryInfoList = libraryinfoFacade.list(libraryInfoQe);
     	
-    	return BeanUtil.listCopyTo(libraryInfoList, GetConceptInfoDetailDTO.class);
+    	Map<String,List<GetConceptInfoDetailDTO>> retMap = new HashMap<>();
+    	retMap.put("otherNames", BeanUtil.listCopyTo(libraryInfoList.stream().filter(i->i.getIsConcept()==null||i.getIsConcept()==0).collect(Collectors.toList()), GetConceptInfoDetailDTO.class));
+    	retMap.put("libName", BeanUtil.listCopyTo(libraryInfoList.stream().filter(i->i.getIsConcept()!=null&&i.getIsConcept()==1).collect(Collectors.toList()), GetConceptInfoDetailDTO.class));
+    	
+    	return retMap;
     }
     
     /**

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

@@ -193,12 +193,12 @@ public class RelationFacade extends RelationServiceImpl {
 	private Map<String,Object> checkAddRelationInfoVO(AddRelationInfoVO addRelationInfoVO){
 		Map<String,Object> retMap = new HashMap<>();
 		
-		QueryWrapper<LibraryInfo> libraryInfoQe = new QueryWrapper<>();
-		libraryInfoQe.eq("is_deleted", "N");
-		libraryInfoQe.eq("is_concept", 1);
-		libraryInfoQe.eq("name", addRelationInfoVO.getStartName());
-		libraryInfoQe.eq("type", addRelationInfoVO.getStartType());
-		LibraryInfo startLibraryInfo = libraryInfoFacade.getOne(libraryInfoQe);
+		QueryWrapper<LibraryInfo> libraryInfoQe1 = new QueryWrapper<>();
+		libraryInfoQe1.eq("is_deleted", "N");
+		libraryInfoQe1.eq("is_concept", 1);
+		libraryInfoQe1.eq("name", addRelationInfoVO.getStartName());
+		libraryInfoQe1.eq("type", addRelationInfoVO.getStartType());
+		LibraryInfo startLibraryInfo = libraryInfoFacade.getOne(libraryInfoQe1);
 		if(startLibraryInfo==null){
 			retMap.put("message", "关系起点术语不存在");
 			return retMap;
@@ -208,10 +208,13 @@ public class RelationFacade extends RelationServiceImpl {
 			retMap.put("message", "关系起点术语不存在");
 			return retMap;
 		}
-		
-		libraryInfoQe.eq("name", addRelationInfoVO.getEndName());
-		libraryInfoQe.eq("type", addRelationInfoVO.getEndType());
-		LibraryInfo endLibraryInfo = libraryInfoFacade.getOne(libraryInfoQe);
+
+		QueryWrapper<LibraryInfo> libraryInfoQe2 = new QueryWrapper<>();
+		libraryInfoQe2.eq("is_deleted", "N");
+		libraryInfoQe2.eq("is_concept", 1);
+		libraryInfoQe2.eq("name", addRelationInfoVO.getEndName());
+		libraryInfoQe2.eq("type", addRelationInfoVO.getEndType());
+		LibraryInfo endLibraryInfo = libraryInfoFacade.getOne(libraryInfoQe2);
 		if(endLibraryInfo==null){
 			retMap.put("message", "关系终点术语不存在");
 			return retMap;

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

@@ -49,7 +49,11 @@ public class AddRelationInfoVO {
 	@NotBlank(message = "关系名称必填")
 	@ApiModelProperty(value = "关系名称", required = true)
 	private String relationName;
-
+	
+	public AddRelationInfoVO() {
+		super();
+	}
+	
 	public AddRelationInfoVO(@NotBlank(message = "关系起点术语名称必填") String startName,
 			@NotBlank(message = "关系起点术语类型必填") String startType, @NotBlank(message = "关系终点术语名称必填") String endName,
 			@NotBlank(message = "关系终点术语类型必填") String endType, @NotBlank(message = "关系名称必填") String relationName) {

knowledgeman-service/src/main/java/com/diagbot/web/ConceptController.java

@@ -1,6 +1,7 @@
 package com.diagbot.web;
 
 import java.util.List;
+import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
@@ -72,7 +73,7 @@ public class ConceptController {
     @ApiOperation(value = "获取医学术语命名详情[by:rengb]")
     @PostMapping("/getConceptInfoDetail")
     @SysLogger("getConceptInfoDetail")
-    public RespDTO<List<GetConceptInfoDetailDTO>> getConceptInfoDetail(@Valid @RequestBody GetConceptInfoDetailVO getConceptInfoDetailVO) {
+    public RespDTO<Map<String,List<GetConceptInfoDetailDTO>>> getConceptInfoDetail(@Valid @RequestBody GetConceptInfoDetailVO getConceptInfoDetailVO) {
         return RespDTO.onSuc(conceptFacade.getConceptInfoDetail(getConceptInfoDetailVO));
     }
     

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

@@ -13,7 +13,7 @@
         <result column="sub_bodypart" property="subBodypart" />
         <result column="sub_order" property="subOrder" />
         <result column="bodypart" property="bodypart" />
-        <result column="order" property="order" />
+        <result column="order_no" property="orderNo" />
     </resultMap>
 
 </mapper>

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

@@ -33,11 +33,11 @@
 		WHERE a.is_deleted='N' AND b.is_deleted='N'
 		GROUP BY a.id) t
 		where 1=1
-		<if test="name!=null">
+		<if test="name!=null and name!=''">
 			 AND otherNames like concat('%',#{name},'%')	
 		</if>
-		<if test="type!=null">
-            AND a.type = #{type}
+		<if test="type!=null and type!=''">
+            AND libType = #{type}
         </if>
 		ORDER BY operTime DESC
     </select>

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

@@ -27,10 +27,11 @@
 		(SELECT name FROM lexicon_relationship where id=a.relation_id and is_deleted='N') as relationName,
 		a.gmt_modified as operTime,
 		a.modifier as operName
-		from relation a) t
-		where 1=1 and is_deleted='N'
+		from relation a
+		where a.is_deleted='N') t
+		where 1=1 
 		<if test="relationId!=null">
-			and relation_id=#{relationId}
+			and relationId=#{relationId}
 		</if>
 		<if test="startName!=null and startName!=''">
 			and startName like concat('%',#{startName},'%')

knowledgeman-service/src/test/java/com/diagbot/CodeGeneration.java

@@ -56,7 +56,7 @@ public class CodeGeneration {
         StrategyConfig strategy = new StrategyConfig();
 //        strategy.setTablePrefix(new String[] { "sys_" });// 此处可以修改为您的表前缀
         strategy.setNaming(NamingStrategy.underline_to_camel);// 表名生成策略
-        strategy.setInclude(new String[] { "concept","library_info","medical","relation"}); // 需要生成的表
+        strategy.setInclude(new String[] { "bodypart"}); // 需要生成的表
 
         strategy.setSuperServiceClass(null);
         strategy.setSuperServiceImplClass(null);