部位信息维护修改

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

@@ -0,0 +1,63 @@
+package com.diagbot.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description
+ * @author rgb
+ * @time 2018年12月5日下午5:00:34
+ */
+@Getter
+@Setter
+public class GetAllBodypartDTO {
+	
+    /**
+     * 部位名称
+     */
+    @ApiModelProperty(value="部位名称")
+    private String name;
+    
+    /**
+     * 部位排序号
+     */
+    @ApiModelProperty(value="部位排序号")
+    private Integer orderNo;
+    
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((name == null) ? 0 : name.hashCode());
+		result = prime * result + ((orderNo == null) ? 0 : orderNo.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		GetAllBodypartDTO other = (GetAllBodypartDTO) obj;
+		if (name == null) {
+			if (other.name != null)
+				return false;
+		} else if (!name.equals(other.name))
+			return false;
+		if (orderNo == null) {
+			if (other.orderNo != null)
+				return false;
+		} else if (!orderNo.equals(other.orderNo))
+			return false;
+		return true;
+	}
+    
+
+    
+
+}

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

@@ -0,0 +1,23 @@
+package com.diagbot.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description
+ * @author rgb
+ * @time 2018年12月5日下午5:00:34
+ */
+@Getter
+@Setter
+public class GetAllLexiconDTO {
+	
+    /**
+     * 术语类型名称
+     */
+    @ApiModelProperty(value="术语类型名称")
+    private String name;
+
+
+}

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

@@ -1,27 +0,0 @@
-package com.diagbot.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.List;
-
-/**
- * @Description:
- * @author: Weixuan Huang
- * @time: 2019/2/15 15:43
- */
-@Getter
-@Setter
-public class TypeDTO {
-
-    /**
-     * 名称
-     */
-    private String name;
-
-    /**
-     * 序列号
-     */
-    private int id;
-
-}

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

@@ -0,0 +1,58 @@
+package com.diagbot.facade;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.springframework.stereotype.Component;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.dto.GetAllBodypartDTO;
+import com.diagbot.entity.Bodypart;
+import com.diagbot.service.impl.BodypartServiceImpl;
+import com.diagbot.util.StringUtil;
+import com.diagbot.vo.GetAllBodypartVO;
+
+/**
+ * @Description: 部位业务层
+ * @author: Weixuan Huang
+ * @time: 2019/1/16 14:17
+ */
+@Component
+public class BodypartFacade extends BodypartServiceImpl {
+
+	/**
+     * 获取所有部位
+     * @param getAllBodypartVO
+     * @return
+     */
+    public List<GetAllBodypartDTO> getAllBodypart(GetAllBodypartVO getAllBodypartVO){
+    	QueryWrapper<Bodypart> bodypartQe = new QueryWrapper<>();
+    	bodypartQe.eq("is_deleted", "N");
+    	if(StringUtil.isNotBlank(getAllBodypartVO.getBodypart())){
+    		bodypartQe.like("bodypart", getAllBodypartVO.getBodypart());
+    	}
+    	if(StringUtil.isNotBlank(getAllBodypartVO.getSubBodypart())){
+    		bodypartQe.like("sub_bodypart", getAllBodypartVO.getSubBodypart());
+    	}
+    	
+    	List<GetAllBodypartDTO> getAllBodypartDTOList = new ArrayList<>();
+    	list(bodypartQe).forEach(i->{
+    		GetAllBodypartDTO getAllBodypartDTO = new GetAllBodypartDTO();
+    		if(getAllBodypartVO.getLevel()==1){
+    			getAllBodypartDTO.setName(i.getBodypart());
+    			getAllBodypartDTO.setOrderNo(i.getOrder());
+    		}else{
+    			getAllBodypartDTO.setName(i.getSubBodypart());
+    			getAllBodypartDTO.setOrderNo(i.getSubOrder());
+    		}
+    		getAllBodypartDTOList.add(getAllBodypartDTO);
+    	});
+    	
+    	return getAllBodypartDTOList.stream().distinct().sorted((a,b)->{
+    		return a.getOrderNo()-b.getOrderNo();
+    	}).collect(Collectors.toList());
+    }
+    
+
+}

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

@@ -0,0 +1,39 @@
+package com.diagbot.facade;
+
+import java.util.List;
+
+import org.springframework.stereotype.Component;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.dto.GetAllLexiconDTO;
+import com.diagbot.entity.Lexicon;
+import com.diagbot.service.impl.LexiconServiceImpl;
+import com.diagbot.util.BeanUtil;
+import com.diagbot.util.StringUtil;
+import com.diagbot.vo.GetAllLexiconVO;
+
+/**
+ * @Description: 术语类型业务层
+ * @author: Weixuan Huang
+ * @time: 2019/1/16 14:17
+ */
+@Component
+public class LexiconFacade extends LexiconServiceImpl {
+	
+	 /**
+     * 获取所有术语类型
+     * @param getAllLexiconVO
+     * @return
+     */
+    public List<GetAllLexiconDTO> getAllLexicon(GetAllLexiconVO getAllLexiconVO){
+    	QueryWrapper<Lexicon> lexiconQe = new QueryWrapper<>();
+    	lexiconQe.eq("is_deleted", "N");
+    	if(StringUtil.isNotBlank(getAllLexiconVO.getName())){
+    		lexiconQe.like("name", getAllLexiconVO.getName());
+    	}
+    	
+    	return BeanUtil.listCopyTo(list(lexiconQe), GetAllLexiconDTO.class);
+    }
+
+
+}

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

@@ -22,7 +22,7 @@ public class LexiconRelationshipFacade extends LexiconRelationshipServiceImpl {
 	
 	 /**
      * 获取所有关系类型
-     * @param getAllConceptVO
+     * @param getAllLexiconRelationshipVO
      * @return
      */
     public List<GetAllLexiconRelationshipDTO> getAllLexiconRelationship(GetAllLexiconRelationshipVO getAllLexiconRelationshipVO){

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

@@ -1,50 +0,0 @@
-package com.diagbot.facade;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.diagbot.dto.RelationDTO;
-import com.diagbot.entity.LexiconRelationship;
-import com.diagbot.service.impl.LexiconRelationshipServiceImpl;
-import com.diagbot.vo.AllRelationVo;
-import org.springframework.stereotype.Component;
-
-/**
- * @Description: 实体间关系信息查询业务层
- * @author: Weixuan Huang
- * @time: 2019/2/1 16:07
- */
-@Component
-public class RelationshipFacade extends LexiconRelationshipServiceImpl {
-
-    /**
-     * 获取术语间关系名称
-     *
-     * @param relationDTO
-     * @result LexiconRelationship
-     */
-    public LexiconRelationship getLexiconRelationship(RelationDTO relationDTO) {
-
-        QueryWrapper<LexiconRelationship> wrapper = new QueryWrapper<>();
-        LexiconRelationship lexiconRelationship = null;
-
-        if (relationDTO.getRelationId() != 0) {
-            wrapper.eq("id", relationDTO.getRelationId());
-        }
-
-        lexiconRelationship = this.getOne(wrapper);
-
-        return lexiconRelationship;
-    }
-    /**
-     *
-     * 获取所有关系名称
-     *
-     * @param allrelationVo
-     * @result IPage<LexiconRelationship>
-     */
-    public IPage<LexiconRelationship> getRelationName(AllRelationVo allrelationVo) {
-
-        return getAllRelationName(allrelationVo);
-    }
-
-}

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

@@ -1,32 +0,0 @@
-package com.diagbot.facade;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.diagbot.dto.TypeDTO;
-import com.diagbot.service.impl.LexiconServiceImpl;
-import com.diagbot.vo.TypeVo;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestBody;
-
-
-
-/**
- * @Description: 术语查询业务层
- * @author: Weixuan Huang
- * @time: 2019/3/18 17:30
- */
-@Component
-public class TypeFacade extends LexiconServiceImpl {
-
-    /**
-     * 获取术语类型信息
-     *
-     * @param typeVo
-     * @return IPage<TypeDTO>
-     */
-    public IPage<TypeDTO> getTypes(@RequestBody TypeVo typeVo) {
-
-        return getAllTypes(typeVo);
-    }
-
-}

knowledgeman-service/src/main/java/com/diagbot/mapper/LexiconMapper.java

@@ -1,11 +1,7 @@
 package com.diagbot.mapper;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.diagbot.dto.TypeDTO;
-import com.diagbot.entity.Lexicon;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.diagbot.vo.TypeVo;
+import com.diagbot.entity.Lexicon;
 
 /**
  * <p>
@@ -16,11 +12,7 @@ import com.diagbot.vo.TypeVo;
  * @since 2019-03-18
  */
 public interface LexiconMapper extends BaseMapper<Lexicon> {
-    /**
-     * 获取所有术语信息
-     *
-     * @param typeVo
-     * @return IPage<TypeDTO>
-     */
-    public IPage<TypeDTO> getAllTypes(TypeVo typeVo);
+
+	
+	
 }

knowledgeman-service/src/main/java/com/diagbot/mapper/LexiconRelationshipMapper.java

@@ -1,11 +1,7 @@
 package com.diagbot.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.diagbot.dto.RelationDTO;
 import com.diagbot.entity.LexiconRelationship;
-import com.diagbot.facade.LibraryInfoFacade;
-import com.diagbot.vo.AllRelationVo;
 
 /**
  * <p>
@@ -16,7 +12,6 @@ import com.diagbot.vo.AllRelationVo;
  * @since 2019-02-01
  */
 public interface LexiconRelationshipMapper extends BaseMapper<LexiconRelationship> {
-    public LexiconRelationship getLexiconRelationship(RelationDTO relationDTO, LibraryInfoFacade libraryInfoFacade);
 
-    public IPage<LexiconRelationship> getAllRelationName(AllRelationVo allrelationVo);
+
 }

knowledgeman-service/src/main/java/com/diagbot/mapper/MedicalMapper.java

@@ -8,10 +8,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.dto.GetMedicalInfoListDTO;
 //import com.diagbot.dto.LibraryDTO;
 import com.diagbot.dto.MedicalDTO;
-import com.diagbot.dto.TypeDTO;
 import com.diagbot.entity.Medical;
 import com.diagbot.vo.GetMedicalInfoListVO;
-import com.diagbot.vo.TypeVo;
 
 /**
  * <p>
@@ -38,22 +36,6 @@ public interface MedicalMapper extends BaseMapper<Medical> {
     public IPage<MedicalDTO> getAllMedicalInfo(Page page, MedicalDTO medicalDTO);
 
 
-    /**
-     * 获取术语临床医学信息
-     *
-     * @param libraryDTO
-     * @result MedicalDTO
-     */
-//    public List<Medical> getMedicalInfo(LibraryDTO libraryDTO);
-
-    /**
-     * 获取实体类型Id
-     *
-     * @param typeVo
-     * @result TypeDTO
-     */
-    public List<TypeDTO> getTypeId(TypeVo typeVo);
-
     /**
      * 获取所有没有实体关联的医学信息
      *

knowledgeman-service/src/main/java/com/diagbot/service/LexiconRelationshipService.java

@@ -1,11 +1,7 @@
 package com.diagbot.service;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.diagbot.dto.RelationDTO;
 import com.diagbot.entity.LexiconRelationship;
-import com.diagbot.facade.LibraryInfoFacade;
-import com.diagbot.vo.AllRelationVo;
 
 /**
  * <p>
@@ -16,7 +12,6 @@ import com.diagbot.vo.AllRelationVo;
  * @since 2019-02-01
  */
 public interface LexiconRelationshipService extends IService<LexiconRelationship> {
-    public LexiconRelationship getLexiconRelationship(RelationDTO relationDTO, LibraryInfoFacade libraryInfoFacade);
 
-    public IPage<LexiconRelationship> getAllRelationName(AllRelationVo allrelationVo);
+
 }

knowledgeman-service/src/main/java/com/diagbot/service/LexiconService.java

@@ -1,11 +1,7 @@
 package com.diagbot.service;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.diagbot.dto.TypeDTO;
-import com.diagbot.entity.Lexicon;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.diagbot.vo.TypeVo;
+import com.diagbot.entity.Lexicon;
 
 /**
  * <p>
@@ -16,5 +12,6 @@ import com.diagbot.vo.TypeVo;
  * @since 2019-01-14
  */
 public interface LexiconService extends IService<Lexicon> {
-    public IPage<TypeDTO> getAllTypes(TypeVo typeVo);
+  
+	
 }

knowledgeman-service/src/main/java/com/diagbot/service/MedicalService.java

@@ -1,15 +1,13 @@
 package com.diagbot.service;
 
+import java.util.List;
+
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
 //import com.diagbot.dto.LibraryDTO;
 import com.diagbot.dto.MedicalDTO;
-import com.diagbot.dto.TypeDTO;
 import com.diagbot.entity.Medical;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.diagbot.vo.TypeVo;
-
-import java.util.List;
 
 /**
  * <p>
@@ -24,7 +22,6 @@ public interface MedicalService extends IService<Medical> {
 
 //    public List<Medical> getMedicalInfo(LibraryDTO libraryDTO);
 
-    public List<TypeDTO> getTypeId(TypeVo typeVo);
 
     public List<Medical> getLimboItems();
 

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

@@ -1,14 +1,11 @@
 package com.diagbot.service.impl;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springframework.stereotype.Service;
+
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.diagbot.dto.RelationDTO;
 import com.diagbot.entity.LexiconRelationship;
-import com.diagbot.facade.LibraryInfoFacade;
 import com.diagbot.mapper.LexiconRelationshipMapper;
 import com.diagbot.service.LexiconRelationshipService;
-import com.diagbot.vo.AllRelationVo;
-import org.springframework.stereotype.Service;
 
 /**
  * <p>
@@ -20,13 +17,6 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class LexiconRelationshipServiceImpl extends ServiceImpl<LexiconRelationshipMapper, LexiconRelationship> implements LexiconRelationshipService {
-    @Override
-    public LexiconRelationship getLexiconRelationship(RelationDTO relationDTO, LibraryInfoFacade libraryInfoFacade) {
-        return baseMapper.getLexiconRelationship(relationDTO, libraryInfoFacade);
-    }
 
-    @Override
-    public IPage<LexiconRelationship> getAllRelationName(AllRelationVo allrelationVo) {
-        return baseMapper.getAllRelationName(allrelationVo);
-    }
+
 }

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

@@ -1,14 +1,11 @@
 package com.diagbot.service.impl;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.diagbot.dto.TypeDTO;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.diagbot.entity.Lexicon;
 import com.diagbot.mapper.LexiconMapper;
 import com.diagbot.service.LexiconService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.diagbot.vo.TypeVo;
-import org.springframework.stereotype.Service;
 
 /**
  * <p>
@@ -20,8 +17,7 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class LexiconServiceImpl extends ServiceImpl<LexiconMapper, Lexicon> implements LexiconService {
-    @Override
-    public IPage<TypeDTO> getAllTypes(TypeVo typeVo) {
-        return baseMapper.getAllTypes(typeVo);
-    }
+
+	
+	
 }

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

@@ -1,18 +1,17 @@
 package com.diagbot.service.impl;
 
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 //import com.diagbot.dto.LibraryDTO;
 import com.diagbot.dto.MedicalDTO;
-import com.diagbot.dto.TypeDTO;
 import com.diagbot.entity.Medical;
 import com.diagbot.mapper.MedicalMapper;
 import com.diagbot.service.MedicalService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.diagbot.vo.TypeVo;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
 
 /**
  * <p>
@@ -36,8 +35,6 @@ public class MedicalServiceImpl extends ServiceImpl<MedicalMapper, Medical> impl
     }
     */
 
-    @Override
-    public List<TypeDTO> getTypeId(TypeVo typeVo) { return baseMapper.getTypeId(typeVo); }
 
     @Override
     public List<Medical> getLimboItems() { return baseMapper.getLimboItems(); }

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

@@ -0,0 +1,40 @@
+package com.diagbot.vo;
+
+import javax.validation.constraints.NotNull;
+
+import org.hibernate.validator.constraints.Range;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: Weixuan Huang
+ * @time: 2019/3/14 16:03
+ */
+@Getter
+@Setter
+public class GetAllBodypartVO {
+    
+    /**
+     * 一级部位名称
+     */
+	@ApiModelProperty(value="一级部位名称")
+    private String bodypart;
+	
+    /**
+     * 二级部位名称
+     */
+	@ApiModelProperty(value="二级部位名称")
+    private String subBodypart;
+  
+    /**
+     * 部位级别,1-一级、2-二级
+     */
+    @NotNull(message="部位级别必传")
+    @ApiModelProperty(value="部位级别,1-一级、2-二级",required=true)
+    @Range(min=1,max=2,message="部位级别必须是1或2")
+    private Integer level;
+    
+}

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

@@ -0,0 +1,22 @@
+package com.diagbot.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: Weixuan Huang
+ * @time: 2019/3/14 16:03
+ */
+@Getter
+@Setter
+public class GetAllLexiconVO {
+    
+    /**
+     * 术语类型名称
+     */
+    @ApiModelProperty(value="术语类型名称")
+    private String name;
+    
+}

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

@@ -0,0 +1,45 @@
+package com.diagbot.web;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.GetAllBodypartDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.BodypartFacade;
+import com.diagbot.vo.GetAllBodypartVO;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author Weixuan Huang
+ * @since 2019-01-30
+ */
+@RestController
+@RequestMapping("bodypart")
+@SuppressWarnings("unchecked")
+@Api(value = "部位维护相关API", tags = { "部位维护相关API" })
+public class BodypartController {
+	
+    @Autowired
+    private BodypartFacade bodypartFacade;
+    
+    @ApiOperation(value = "获取所有部位[by:rengb]")
+    @PostMapping("/getAllBodypart")
+    @SysLogger("getAllBodypart")
+    public RespDTO<List<GetAllBodypartDTO>> getAllBodypart(@RequestBody GetAllBodypartVO getAllBodypartVO) {
+        return RespDTO.onSuc(bodypartFacade.getAllBodypart(getAllBodypartVO));
+    }
+    
+    
+}

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

@@ -0,0 +1,45 @@
+package com.diagbot.web;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.GetAllLexiconDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.LexiconFacade;
+import com.diagbot.vo.GetAllLexiconVO;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author Weixuan Huang
+ * @since 2019-01-30
+ */
+@RestController
+@RequestMapping("/lexicon")
+@SuppressWarnings("unchecked")
+@Api(value = "术语类型维护相关API", tags = { "术语类型维护相关API" })
+public class LexiconController {
+	
+    @Autowired
+    private LexiconFacade lexiconFacade;
+    
+    @ApiOperation(value = "获取所有术语类型[by:rengb]")
+    @PostMapping("/getAllLexicon")
+    @SysLogger("getAllLexicon")
+    public RespDTO<List<GetAllLexiconDTO>> getAllLexicon(@RequestBody GetAllLexiconVO getAllLexiconVO) {
+        return RespDTO.onSuc(lexiconFacade.getAllLexicon(getAllLexiconVO));
+    }
+    
+    
+}

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

@@ -1,46 +0,0 @@
-package com.diagbot.web;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.diagbot.annotation.SysLogger;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.dto.TypeDTO;
-import com.diagbot.facade.TypeFacade;
-import com.diagbot.vo.TypeVo;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Weixuan Huang
- * @since 2019-03-18
- */
-@RestController
-@RequestMapping("/type")
-@SuppressWarnings("unchecked")
-@Api(value = "医学术语类型维护相关API", tags = { "医学术语类型维护相关API" })
-public class TypeController {
-	
-    @Autowired
-    private TypeFacade typeFacade;
-
-
-    @ApiOperation(value = "获取医学术语类型列表[by:rengb]")
-    @PostMapping("/getAllType")
-    @SysLogger("getAllType")
-    public RespDTO<IPage<TypeDTO>> getAllType(@RequestBody TypeVo typeVo) {
-        IPage<TypeDTO> data = typeFacade.getTypes(typeVo);
-
-        return RespDTO.onSuc(data);
-    }
-
-}

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

@@ -15,7 +15,5 @@
         <result column="class_cont" property="classCont" />
     </resultMap>
 
-    <select id="getAllTypes" resultType="com.diagbot.dto.TypeDTO">
-        SELECT * FROM lexicon
-    </select>
+
 </mapper>

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

@@ -14,7 +14,4 @@
         <result column="code" property="code" />
     </resultMap>
 
-    <select id="getAllRelationName" resultType="com.diagbot.entity.LexiconRelationship">
-        SELECT * FROM lexicon_relationship
-    </select>
 </mapper>