Merge remote-tracking branch 'origin/debug' into debug

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

@@ -1,40 +0,0 @@
-package com.diagbot.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @author: Weixuan Huang
- * @time: 2019/3/21 13:23
- */
-@Getter
-@Setter
-public class BodyPartDTO {
-
-    /**
-     * 序列号
-     */
-    private int id;
-
-    /**
-     * 部位
-     */
-    private String bodypart;
-
-    /**
-     * 显示部位排列序号
-     */
-    private int order;
-
-    /**
-     * 子部位
-     */
-    private String sub_bodypart;
-
-    /**
-     * 显示子部位排列序号
-     */
-    private int sub_order;
-
-}

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

@@ -1,30 +0,0 @@
-package com.diagbot.facade;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.diagbot.dto.BodyPartDTO;
-import com.diagbot.service.impl.BodypartServiceImpl;
-import com.diagbot.vo.BodyPartVo;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestBody;
-
-
-/**
- * @Description: 术语查询业务层
- * @author: Weixuan Huang
- * @time: 2019/3/21 11:40
- */
-@Component
-public class BodyPartFacade extends BodypartServiceImpl {
-
-    /**
-     * 获取术语部位信息
-     *
-     * @param bodyPartVo
-     * @return IPage<BodyPartDTO>
-     */
-    public IPage<BodyPartDTO> getBodyParts(@RequestBody BodyPartVo bodyPartVo) {
-
-        return getAllBodyParts(bodyPartVo);
-    }
-
-}

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

@@ -49,7 +49,8 @@ public class ConceptFacade extends ConceptServiceImpl {
      */
     public ConceptDTO getConceptInfo(@RequestBody TermVo termvo) {
 
-        ConceptDTO conceptDTO = null;
+//        List<ConceptDTO> conceptDTOs = new ArrayList<>();
+        ConceptDTO conceptDTO = new ConceptDTO();
         List<LibraryInfo> libraryinfos;
 
         // 获取医学术语的基本信息

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

@@ -1,10 +1,7 @@
 package com.diagbot.mapper;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.diagbot.dto.BodyPartDTO;
 import com.diagbot.entity.Bodypart;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.diagbot.vo.BodyPartVo;
 
 /**
  * <p>
@@ -12,16 +9,8 @@ import com.diagbot.vo.BodyPartVo;
  * </p>
  *
  * @author Weixuan Huang
- * @since 2019-03-21
+ * @since 2019-01-14
  */
 public interface BodypartMapper extends BaseMapper<Bodypart> {
-    /**
-     * 获取所有术语部位信息
-     *
-     * @param bodyPartVo
-     * @return IPage<BodyPartDTO>
-     */
-    public IPage<BodyPartDTO> getAllBodyParts(BodyPartVo bodyPartVo);
-
 
 }

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

@@ -17,7 +17,7 @@ import com.diagbot.vo.TypeVo;
  */
 public interface LexiconMapper extends BaseMapper<Lexicon> {
     /**
-     * 获取所有术语类型信息
+     * 获取所有术语信息
      *
      * @param typeVo
      * @return IPage<TypeDTO>

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

@@ -1,10 +1,7 @@
 package com.diagbot.service;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.diagbot.dto.BodyPartDTO;
 import com.diagbot.entity.Bodypart;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.diagbot.vo.BodyPartVo;
 
 /**
  * <p>
@@ -12,8 +9,8 @@ import com.diagbot.vo.BodyPartVo;
  * </p>
  *
  * @author Weixuan Huang
- * @since 2019-03-21
+ * @since 2019-01-14
  */
 public interface BodypartService extends IService<Bodypart> {
-    public IPage<BodyPartDTO> getAllBodyParts(BodyPartVo bodyPartVo);
+
 }

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

@@ -1,12 +1,9 @@
 package com.diagbot.service.impl;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.diagbot.dto.BodyPartDTO;
 import com.diagbot.entity.Bodypart;
 import com.diagbot.mapper.BodypartMapper;
 import com.diagbot.service.BodypartService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.diagbot.vo.BodyPartVo;
 import org.springframework.stereotype.Service;
 
 /**
@@ -19,8 +16,5 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class BodypartServiceImpl extends ServiceImpl<BodypartMapper, Bodypart> implements BodypartService {
-    @Override
-    public IPage<BodyPartDTO> getAllBodyParts(BodyPartVo bodyPartVo) {
-        return baseMapper.getAllBodyParts(bodyPartVo);
-    }
+
 }

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

@@ -1,24 +0,0 @@
-package com.diagbot.vo;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @author: Weixuan Huang
- * @time: 2019/3/21 13:19
- */
-@Getter
-@Setter
-public class BodyPartVo extends Page {
-    private int id;
-
-    private String bodypart;
-
-    private int order;
-
-    private String sub_bodypart;
-
-    private int sub_order;
-}

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

@@ -1,44 +0,0 @@
-package com.diagbot.web;
-
-
-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;
-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;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Weixuan Huang
- * @since 2019-03-21
- */
-@RestController
-@RequestMapping("/bodypart")
-@Api(value = "医学术语部位API", tags = { "医学术语部位API" })
-
-public class BodyPartController {
-    @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/BodypartMapper.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.diagbot.mapper.BodypartMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.Bodypart">
-        <id column="id" property="id" />
-        <result column="sub_bodypart" property="subBodypart" />
-        <result column="sub_order" property="subOrder" />
-        <result column="bodypart" property="bodypart" />
-        <result column="order" property="order" />
-    </resultMap>
-
-    <select id="getAllBodyParts" resultType="com.diagbot.dto.BodyPartDTO">
-        SELECT * FROM bodypart
-    </select>
-</mapper>

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

@@ -41,7 +41,7 @@
         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( )
+            AND a.name like concat('%',#{term},'%')
         </if>
         <if test = "type != ''">
             AND a.type = #{type}