根据需求按条件查询所有术语的接口, 并提供术语的所有同义词

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

@@ -51,6 +51,11 @@ public class LibraryInfoDTO {
      */
     private String name;
 
+    /**
+     * 同义词
+     */
+    private String synonymous;
+
     /**
      * 类型
      */

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

@@ -9,6 +9,7 @@ import com.diagbot.dto.LibraryInfoDTO;
 import com.diagbot.entity.*;
 import com.diagbot.service.impl.ConceptServiceImpl;
 import com.diagbot.vo.AmendTermVo;
+import com.diagbot.vo.ConceptVo;
 import com.diagbot.vo.TermVo;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -76,24 +77,34 @@ public class ConceptFacade extends ConceptServiceImpl {
 
 
     /**
-     * 获取标准术语列表
+     * 获取标准术语名称列表
      *
-     * @param page
+     * @param conceptVo
      * @return IPage<LibraryDTO>
      */
-    public IPage<LibraryInfoDTO> getAllConcepts(Page page) {
-        LibraryInfoDTO libraryInfoDTO = new LibraryInfoDTO();
+    public IPage<LibraryInfoDTO> getAllConcepts(ConceptVo conceptVo) {
 
-        return libraryinfoFacade.getAllConcept(page, libraryInfoDTO);
+        return libraryinfoFacade.getAllConcept(conceptVo);
     }
 
+    /**
+     * 获取标准术语信息列表
+     *
+     * @param conceptVo
+     * @return IPage<LibraryDTO>
+     */
+    public IPage<LibraryInfoDTO> getAllInformation(ConceptVo conceptVo) {
+
+        return libraryinfoFacade.getAllInfor(conceptVo);
+    }
 
-        /**
-         * 更新医学术语信息
-         *
-         * @param amendTermVo
-         * @return ConceptDTO
-         */
+
+    /**
+     * 更新医学术语信息
+     *
+     * @param amendTermVo
+     * @return ConceptDTO
+     */
     public ConceptDTO upsertConceptInfo(@RequestBody AmendTermVo amendTermVo) {
         ConceptDTO conceptDTO = new ConceptDTO();
 

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

@@ -5,10 +5,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.dto.ConceptDTO;
 import com.diagbot.dto.LibraryDetailDTO;
+import com.diagbot.entity.Concept;
 import com.diagbot.entity.LibraryDetail;
 import com.diagbot.entity.LibraryInfo;
 import com.diagbot.service.impl.LibraryDetailServiceImpl;
 import com.diagbot.vo.AmendTermVo;
+import com.diagbot.vo.ConceptVo;
 import com.diagbot.vo.TermVo;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,13 +41,12 @@ public class LibraryDetailFacade extends LibraryDetailServiceImpl {
     /**
      * 获取所有术语静态知识列表
      *
-     * @param page
+     * @param conceptVo
      * @return IPage<LibraryDetailDTO>
      */
-    public IPage<LibraryDetailDTO> getAllLibraryDetail(Page page) {
-        LibraryDetailDTO medicalDTO = new LibraryDetailDTO();
+    public IPage<LibraryDetailDTO> getAllLibraryDetail(ConceptVo conceptVo) {
 
-        return getAllKnowledge(page, medicalDTO);
+        return getAllKnowledge(conceptVo);
     }
 
 

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

@@ -6,10 +6,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.dto.ConceptDTO;
 import com.diagbot.dto.MedicalDTO;
 import com.diagbot.dto.TypeDTO;
+import com.diagbot.entity.Concept;
 import com.diagbot.entity.LibraryInfo;
 import com.diagbot.entity.Medical;
 import com.diagbot.service.impl.MedicalServiceImpl;
 import com.diagbot.vo.AmendTermVo;
+import com.diagbot.vo.ConceptVo;
 import com.diagbot.vo.TermVo;
 import com.diagbot.vo.TypeVo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,20 +37,6 @@ public class MedicalFacade extends MedicalServiceImpl {
     LibraryInfoFacade libraryInfoFacade;
 
 
-    /**
-     * 获取所有医学术语列表
-     *
-     * @param page
-     * @return IPage<MedicalDTO>
-     */
-    public IPage<MedicalDTO> getAllMedical(Page page) {
-        MedicalDTO medicalDTO = new MedicalDTO();
-
-        return getAllMedicalInfo(page, medicalDTO);
-    }
-
-
-
     /**
      * 获取术语医学知识
      *
@@ -88,6 +76,7 @@ public class MedicalFacade extends MedicalServiceImpl {
         return conceptDTO;
     }
 
+
     /**
      * 更新或添加术语医学信息
      *

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

@@ -11,6 +11,7 @@ import com.diagbot.entity.LexiconRelationship;
 import com.diagbot.entity.LibraryInfo;
 import com.diagbot.entity.Relation;
 import com.diagbot.service.impl.RelationServiceImpl;
+import com.diagbot.vo.AllRelationVo;
 import com.diagbot.vo.AmendTermVo;
 import com.diagbot.vo.RelationVo;
 import com.diagbot.vo.TermVo;
@@ -43,13 +44,12 @@ public class RelationFacade extends RelationServiceImpl {
      *
      * 获取所有医学术语的关系
      *
-     * @param page
+     * @param allrelationVo
      * @result IPage<RelationDTO>
      */
-    public IPage<RelationDTO> getAllRelations(Page page) {
-        RelationDTO relationDTO = new RelationDTO();
+    public IPage<RelationDTO> getAllRelations(AllRelationVo allrelationVo) {
 
-        return getAllRelation(page, relationDTO);
+        return getAllRelation(allrelationVo);
     }
 
 

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

@@ -0,0 +1,32 @@
+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,7 +1,11 @@
 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;
 
 /**
  * <p>
@@ -9,8 +13,14 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * </p>
  *
  * @author Weixuan Huang
- * @since 2019-01-14
+ * @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/LibraryDetailMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.dto.LibraryDetailDTO;
 import com.diagbot.entity.LibraryDetail;
+import com.diagbot.vo.ConceptVo;
 import com.diagbot.vo.TermVo;
 
 import java.util.List;
@@ -21,11 +22,10 @@ public interface LibraryDetailMapper extends BaseMapper<LibraryDetail> {
     /**
      * 获取所有术语静态知识
      *
-     * @param page
-     * @param libraryDetailDTO
+     * @param conceptVo
      * @return IPage<LibraryDetailDTO>
      */
-    public IPage<LibraryDetailDTO> getAllKnowledge(Page page, LibraryDetailDTO libraryDetailDTO);
+    public IPage<LibraryDetailDTO> getAllKnowledge(ConceptVo conceptVo);
 
     /**
      * 获取术语知识

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

@@ -5,7 +5,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.dto.LibraryInfoDTO;
+import com.diagbot.entity.Concept;
 import com.diagbot.entity.LibraryInfo;
+import com.diagbot.vo.ConceptVo;
 import com.diagbot.vo.TermVo;
 
 import java.util.List;
@@ -20,21 +22,20 @@ import java.util.List;
  */
 public interface LibraryInfoMapper extends BaseMapper<LibraryInfo> {
     /**
-     * 获取术语基本信息
+     * 获取所有术语基本信息
      *
-     * @param wrapper
-     * @return List<LibraryInfo>
+     * @param conceptVo
+     * @return IPage<LibraryInfoDTO>
      */
-    public List<LibraryInfo> getLibraryInfo(QueryWrapper<LibraryInfo> wrapper);
+    public IPage<LibraryInfoDTO> getAllInfor(ConceptVo conceptVo);
 
     /**
      * 获取所有术语信息
      *
-     * @param page
-     * @param libraryInfoDTO
+     * @param conceptVo
      * @return IPage<LibraryInfoDTO>
      */
-    public IPage<LibraryInfoDTO> getAllConcept(Page page, LibraryInfoDTO libraryInfoDTO);
+    public IPage<LibraryInfoDTO> getAllConcept(ConceptVo conceptVo);
 
     /**
      * 获取所有没有实体关联的静态信息

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

@@ -2,8 +2,7 @@ package com.diagbot.mapper;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.diagbot.dto.ConceptDTO;
-import com.diagbot.dto.LibraryDTO;
+//import com.diagbot.dto.LibraryDTO;
 import com.diagbot.dto.MedicalDTO;
 import com.diagbot.dto.TypeDTO;
 import com.diagbot.entity.Medical;
@@ -37,7 +36,7 @@ public interface MedicalMapper extends BaseMapper<Medical> {
      * @param libraryDTO
      * @result MedicalDTO
      */
-    public List<Medical> getMedicalInfo(LibraryDTO libraryDTO);
+//    public List<Medical> getMedicalInfo(LibraryDTO libraryDTO);
 
     /**
      * 获取实体类型Id

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.dto.RelationDTO;
 import com.diagbot.entity.Relation;
+import com.diagbot.vo.AllRelationVo;
 import com.diagbot.vo.RelationVo;
 
 import java.util.List;
@@ -21,10 +22,10 @@ public interface RelationMapper extends BaseMapper<Relation> {
     /**
      * 获取所有术语关系
      *
-     * @param relationDTO
+     * @param allrelationVo
      * @return IPage<RelationDTO>
      */
-    public IPage<RelationDTO> getAllRelation(Page page, RelationDTO relationDTO);
+    public IPage<RelationDTO> getAllRelation(AllRelationVo allrelationVo);
 
 
     /**

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

@@ -1,7 +1,11 @@
 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;
 
 /**
  * <p>
@@ -12,5 +16,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2019-01-14
  */
 public interface LexiconService extends IService<Lexicon> {
-
+    public IPage<TypeDTO> getAllTypes(TypeVo typeVo);
 }

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.diagbot.dto.LibraryDetailDTO;
 import com.diagbot.entity.LibraryDetail;
+import com.diagbot.vo.ConceptVo;
 import com.diagbot.vo.TermVo;
 
 import java.util.List;
@@ -18,7 +19,7 @@ import java.util.List;
  * @since 2019-01-30
  */
 public interface LibraryDetailService extends IService<LibraryDetail> {
-    public IPage<LibraryDetailDTO> getAllKnowledge(Page page, LibraryDetailDTO libraryDetailDTO);
+    public IPage<LibraryDetailDTO> getAllKnowledge(ConceptVo conceptVo);
 
     public List<LibraryDetail> getLibraryDetail(TermVo termVo);
 

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

@@ -5,8 +5,11 @@ 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.LibraryInfoDTO;
+import com.diagbot.entity.Concept;
 import com.diagbot.entity.LibraryInfo;
+import com.diagbot.vo.ConceptVo;
 import com.diagbot.vo.TermVo;
+import org.springframework.security.core.parameters.P;
 
 import java.util.List;
 
@@ -19,8 +22,8 @@ import java.util.List;
  * @since 2019-01-30
  */
 public interface LibraryInfoService extends IService<LibraryInfo> {
-//    public List<LibraryInfo> getLibraryInfor(QueryWrapper<LibraryInfo> wrapper);
+    public IPage<LibraryInfoDTO> getAllInfor(ConceptVo conceptVo);
 
-    public IPage<LibraryInfoDTO> getAllConcept(Page page, LibraryInfoDTO libraryInfoDTO);
+    public IPage<LibraryInfoDTO> getAllConcept(ConceptVo conceptVo);
     public List<LibraryInfo> getLimboItems();
 }

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

@@ -2,7 +2,7 @@ package com.diagbot.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.diagbot.dto.LibraryDTO;
+//import com.diagbot.dto.LibraryDTO;
 import com.diagbot.dto.MedicalDTO;
 import com.diagbot.dto.TypeDTO;
 import com.diagbot.entity.Medical;
@@ -22,7 +22,7 @@ import java.util.List;
 public interface MedicalService extends IService<Medical> {
     public IPage<MedicalDTO> getAllMedicalInfo(Page page, MedicalDTO medicalDTO);
 
-    public List<Medical> getMedicalInfo(LibraryDTO libraryDTO);
+//    public List<Medical> getMedicalInfo(LibraryDTO libraryDTO);
 
     public List<TypeDTO> getTypeId(TypeVo typeVo);
 

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.diagbot.dto.RelationDTO;
 import com.diagbot.entity.Relation;
+import com.diagbot.vo.AllRelationVo;
 import com.diagbot.vo.RelationVo;
 
 import java.util.List;
@@ -18,7 +19,7 @@ import java.util.List;
  * @since 2019-01-31
  */
 public interface RelationService extends IService<Relation> {
-    public IPage<RelationDTO> getAllRelation(Page page, RelationDTO relationDTO);
+    public IPage<RelationDTO> getAllRelation(AllRelationVo allrelationVo);
 
     public List<RelationDTO> getRelation(RelationDTO relationDTO);
 

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

@@ -1,9 +1,13 @@
 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 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;
 
 /**
@@ -16,5 +20,8 @@ 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/LibraryDetailServiceImpl.java

@@ -7,6 +7,7 @@ import com.diagbot.dto.LibraryDetailDTO;
 import com.diagbot.entity.LibraryDetail;
 import com.diagbot.mapper.LibraryDetailMapper;
 import com.diagbot.service.LibraryDetailService;
+import com.diagbot.vo.ConceptVo;
 import com.diagbot.vo.TermVo;
 import org.springframework.stereotype.Service;
 
@@ -23,8 +24,8 @@ import java.util.List;
 @Service
 public class LibraryDetailServiceImpl extends ServiceImpl<LibraryDetailMapper, LibraryDetail> implements LibraryDetailService {
     @Override
-    public IPage<LibraryDetailDTO> getAllKnowledge(Page page, LibraryDetailDTO libraryDetailDTO) {
-        return baseMapper.getAllKnowledge(page, libraryDetailDTO);
+    public IPage<LibraryDetailDTO> getAllKnowledge(ConceptVo conceptVo) {
+        return baseMapper.getAllKnowledge(conceptVo);
     }
 
     @Override

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

@@ -5,10 +5,14 @@ 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.LibraryInfoDTO;
+import com.diagbot.entity.Concept;
 import com.diagbot.entity.LibraryInfo;
 import com.diagbot.mapper.LibraryInfoMapper;
 import com.diagbot.service.LibraryInfoService;
+import com.diagbot.vo.ConceptVo;
 import com.diagbot.vo.TermVo;
+import org.omg.PortableServer.LIFESPAN_POLICY_ID;
+import org.springframework.security.core.parameters.P;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -23,14 +27,14 @@ import java.util.List;
  */
 @Service
 public class LibraryInfoServiceImpl extends ServiceImpl<LibraryInfoMapper, LibraryInfo> implements LibraryInfoService {
-//    @Override
-//    public List<LibraryInfo> getLibraryInfor(QueryWrapper<LibraryInfo> wrapper) {
-//        return baseMapper.getLibraryInfo(wrapper);
-//    }
+    @Override
+    public IPage<LibraryInfoDTO> getAllInfor(ConceptVo conceptVo) {
+        return baseMapper.getAllInfor(conceptVo);
+    }
 
     @Override
-    public IPage<LibraryInfoDTO> getAllConcept(Page page, LibraryInfoDTO libraryInfoDTO) {
-        return baseMapper.getAllConcept(page, libraryInfoDTO);
+    public IPage<LibraryInfoDTO> getAllConcept(ConceptVo conceptVo) {
+        return baseMapper.getAllConcept(conceptVo);
     }
 
     @Override

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

@@ -2,7 +2,7 @@ package com.diagbot.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.diagbot.dto.LibraryDTO;
+//import com.diagbot.dto.LibraryDTO;
 import com.diagbot.dto.MedicalDTO;
 import com.diagbot.dto.TypeDTO;
 import com.diagbot.entity.Medical;
@@ -29,10 +29,12 @@ public class MedicalServiceImpl extends ServiceImpl<MedicalMapper, Medical> impl
         return baseMapper.getAllMedicalInfo(page, medicalDTO);
     }
 
+    /*
     @Override
     public List<Medical> getMedicalInfo(LibraryDTO libraryDTO) {
         return baseMapper.getMedicalInfo(libraryDTO);
     }
+    */
 
     @Override
     public List<TypeDTO> getTypeId(TypeVo typeVo) { return baseMapper.getTypeId(typeVo); }

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

@@ -7,6 +7,7 @@ import com.diagbot.dto.RelationDTO;
 import com.diagbot.entity.Relation;
 import com.diagbot.mapper.RelationMapper;
 import com.diagbot.service.RelationService;
+import com.diagbot.vo.AllRelationVo;
 import com.diagbot.vo.RelationVo;
 import com.diagbot.vo.TermVo;
 import org.springframework.stereotype.Service;
@@ -24,8 +25,8 @@ import java.util.List;
 @Service
 public class RelationServiceImpl extends ServiceImpl<RelationMapper, Relation> implements RelationService {
     @Override
-    public IPage<RelationDTO> getAllRelation(Page page, RelationDTO relationDTO) {
-        return baseMapper.getAllRelation(page, relationDTO);
+    public IPage<RelationDTO> getAllRelation(AllRelationVo allrelationVo) {
+        return baseMapper.getAllRelation(allrelationVo);
     }
 
     @Override

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

@@ -1,5 +1,6 @@
 package com.diagbot.vo;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -12,7 +13,7 @@ import javax.validation.constraints.NotNull;
  */
 @Getter
 @Setter
-public class TypeVo {
+public class TypeVo extends Page {
     private String type;
 
     private int type_id;

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

@@ -37,7 +37,7 @@ public class ConceptController {
     private ConceptFacade conceptFacade;
 
 
-    @ApiOperation(value = "查询所有术语")
+    @ApiOperation(value = "查询所有术语名称")
     @PostMapping("getAllConcept")
     @SysLogger("getAllConcept")
     public RespDTO<IPage<LibraryInfoDTO>> getAllConcept(@RequestBody ConceptVo conceptVo) {
@@ -46,6 +46,16 @@ public class ConceptController {
         return RespDTO.onSuc(data);
     }
 
+    @ApiOperation(value = "查询所有术语信息",
+            notes = "Term：术语名称, 必填<br>Type：术语类型, 必填<br>")
+    @PostMapping("getAllInformation")
+    @SysLogger("getAllInformation")
+    public RespDTO<IPage<LibraryInfoDTO>> getAllInformation(@RequestBody ConceptVo conceptVo) {
+        IPage<LibraryInfoDTO> data = conceptFacade.getAllInformation(conceptVo);
+
+        return RespDTO.onSuc(data);
+    }
+
     @ApiOperation(value = "术语基本信息查询",
             notes = "Term：术语名称, 必填<br>Type：术语类型, 必填<br>")
     @PostMapping("/getConceptInfo")

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

@@ -46,7 +46,7 @@ public class LibraryDetailController {
             notes = "Term：术语名称, 必填<br>Type：术语类型, 必填<br>")
     @PostMapping("/getConceptKnowledge")
     @SysLogger("getConceptKnowledge")
-    public RespDTO<TermDTO> getConceptKnowledge(@Valid @RequestBody TermVo termvo) {
+    public RespDTO<ConceptDTO> getConceptKnowledge(@Valid @RequestBody TermVo termvo) {
         ConceptDTO data = libraryDetailFacade.getConceptKnowledge(termvo);
 
         return RespDTO.onSuc(data);

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

@@ -38,15 +38,6 @@ public class MedicalController {
     @Autowired
     MedicalFacade medicalFacade;
 
-    @ApiOperation(value = "查询所有医学知识")
-    @PostMapping("getAllMedicalInfo")
-    @SysLogger("getAllMedicalInfo")
-    public RespDTO<IPage<MedicalDTO>> getAllMedicalInfo(@RequestBody ConceptVo conceptVo) {
-        IPage<MedicalDTO> data = medicalFacade.getAllMedical(conceptVo);
-
-        return RespDTO.onSuc(data);
-    }
-
 
     @ApiOperation(value = "术语医学知识查询",
             notes = "Term：术语名称, 必填<br>Type：术语类型, 必填<br>")
@@ -58,6 +49,14 @@ public class MedicalController {
         return RespDTO.onSuc(data);
     }
 
+    /*
+    public RespDTO<ConceptDTO> getMedicalInfo(@Valid @RequestBody ConceptVo conceptVo) {
+        ConceptDTO data = medicalFacade.getMedicalInfo(conceptVo);
+
+        return RespDTO.onSuc(data);
+    }
+    */
+
     @ApiOperation(value = "术语医学知识修改",
             notes = "NewTerm: 新的术语名称, 必填<br/>NewType: 新的术语类型, 必填<br/>")
     @PostMapping("/upsertMedicalInfo")

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

@@ -8,7 +8,6 @@ import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.RelationFacade;
 import com.diagbot.vo.AllRelationVo;
 import com.diagbot.vo.RelationVo;
-import com.diagbot.vo.TermVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -0,0 +1,51 @@
+package com.diagbot.web;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.ConceptDTO;
+import com.diagbot.dto.LibraryInfoDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.dto.TypeDTO;
+import com.diagbot.facade.ConceptFacade;
+import com.diagbot.facade.TypeFacade;
+import com.diagbot.vo.AmendTermVo;
+import com.diagbot.vo.ConceptVo;
+import com.diagbot.vo.TermVo;
+import com.diagbot.vo.TypeVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author Weixuan Huang
+ * @since 2019-03-18
+ */
+@RestController
+@RequestMapping("/type")
+@Api(value = "医学术语类型API", tags = { "医学术语类型API" })
+
+public class TypeController {
+    @Autowired
+    private TypeFacade typeFacade;
+
+
+    @ApiOperation(value = "查询所有类型")
+    @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

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

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

@@ -21,6 +21,33 @@
         SELECT * FROM library_info WHERE is_concept = 1
     </select>
 
+    <select id="getAllInfor" resultType="com.diagbot.dto.LibraryInfoDTO">
+        SELECT
+        id,
+        is_deleted,
+        gmt_created,
+        gmt_modified,
+        creator,
+        modifier,
+        name,
+        b.synonymous,
+        type,
+        remark,
+        a.concept_id,
+        a.is_concept
+        FROM library_info a,
+        (SELECT concept_id, GROUP_CONCAT(name separator ', ') as synonymous FROM library_info
+        WHERE is_concept is NULL AND concept_id IS NOT NULL AND is_deleted = "N"
+        GROUP BY concept_id ORDER BY concept_id) b
+        WHERE a.concept_id = b.concept_id AND a.is_deleted = "N" AND a.is_concept = 1
+        <if test = "term != ''">
+            AND a.name like concat('%',#{term},'%')
+        </if>
+        <if test = "type != ''">
+            AND a.type = #{type}
+        </if>
+    </select>
+
     <select id="getLimboItems" resultType="com.diagbot.entity.LibraryInfo">
         SELECT * FROM library_info WHERE concept_id in
         (

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

@@ -23,26 +23,6 @@
         <result column="is_deleted" property="isDeleted" />
     </resultMap>
 
-    <select id="getAllMedicalInfo" resultType="com.diagbot.dto.MedicalDTO">
-        SELECT
-        id,
-        is_deleted,
-        gmt_created,
-        gmt_modified,
-        creator,
-        modifier,
-        name,
-        b.synonymous,
-        type,
-        remark,
-        a.concept_id,
-        a.is_concept
-        FROM library_info a,
-        (SELECT concept_id, GROUP_CONCAT(name separator ', ') as synonymous FROM library_info
-        WHERE is_concept is NULL AND concept_id IS NOT NULL AND is_deleted = "N"
-        GROUP BY concept_id ORDER BY concept_id) b
-        WHERE a.concept_id = b.concept_id AND a.is_deleted = "N" AND a.is_concept = 1
-    </select>
 
     <select id="getTypeId" parameterType="com.diagbot.vo.TypeVo" resultType="com.diagbot.dto.TypeDTO">
         SELECT id, name