实现医学知识库术语服务管理接口的所有查询功能

knowledge-service/src/main/java/com/diagbot/entity/LibraryDetail.java

@@ -0,0 +1,196 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 提示信息明细
+ * </p>
+ *
+ * @author Weixuan Huang
+ * @since 2019-01-30
+ */
+public class LibraryDetail implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private LocalDateTime gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private LocalDateTime gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 提示概念id
+     */
+    private Long conceptId;
+
+    /**
+     * 提示明细标题
+     */
+    private String title;
+
+    /**
+     * 提示明细内容
+     */
+    private String content;
+
+    /**
+     * 纯文本
+     */
+    private String text;
+
+    /**
+     * 提示明细序号
+     */
+    private Integer orderNo;
+
+    /**
+     * 显示位置（多选）：1-推送展示，2-更多展示，3-一般治疗展示，4-手术治疗展示，5-药品说明书
+     */
+    private String position;
+
+    /**
+     * 是否诊断依据（1-是，0-否）
+     */
+    private Integer isReason;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public LocalDateTime getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(LocalDateTime gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public LocalDateTime getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(LocalDateTime gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+    public Long getConceptId() {
+        return conceptId;
+    }
+
+    public void setConceptId(Long conceptId) {
+        this.conceptId = conceptId;
+    }
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+    public Integer getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(Integer orderNo) {
+        this.orderNo = orderNo;
+    }
+    public String getPosition() {
+        return position;
+    }
+
+    public void setPosition(String position) {
+        this.position = position;
+    }
+    public Integer getIsReason() {
+        return isReason;
+    }
+
+    public void setIsReason(Integer isReason) {
+        this.isReason = isReason;
+    }
+
+    @Override
+    public String toString() {
+        return "LibraryDetail{" +
+        "id=" + id +
+        ", isDeleted=" + isDeleted +
+        ", gmtCreate=" + gmtCreate +
+        ", gmtModified=" + gmtModified +
+        ", creator=" + creator +
+        ", modifier=" + modifier +
+        ", conceptId=" + conceptId +
+        ", title=" + title +
+        ", content=" + content +
+        ", text=" + text +
+        ", orderNo=" + orderNo +
+        ", position=" + position +
+        ", isReason=" + isReason +
+        "}";
+    }
+}

knowledge-service/src/main/java/com/diagbot/entity/LibraryInfo.java

@@ -0,0 +1,157 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 提示信息
+ * </p>
+ *
+ * @author Weixuan Huang
+ * @since 2019-01-30
+ */
+public class LibraryInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private LocalDateTime gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private LocalDateTime gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 概念id
+     */
+    private Integer conceptId;
+
+    /**
+     * 是否标准词,1:是,0:否
+     */
+    private Integer isConcept;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public LocalDateTime getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(LocalDateTime gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public LocalDateTime getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(LocalDateTime gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+    public Integer getConceptId() {
+        return conceptId;
+    }
+
+    public void setConceptId(Integer conceptId) {
+        this.conceptId = conceptId;
+    }
+    public Integer getIsConcept() {
+        return isConcept;
+    }
+
+    public void setIsConcept(Integer isConcept) {
+        this.isConcept = isConcept;
+    }
+
+    @Override
+    public String toString() {
+        return "LibraryInfo{" +
+        "id=" + id +
+        ", isDeleted=" + isDeleted +
+        ", gmtCreate=" + gmtCreate +
+        ", gmtModified=" + gmtModified +
+        ", creator=" + creator +
+        ", modifier=" + modifier +
+        ", name=" + name +
+        ", remark=" + remark +
+        ", conceptId=" + conceptId +
+        ", isConcept=" + isConcept +
+        "}";
+    }
+}

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

@@ -96,8 +96,7 @@ public class RelationFacade extends RelationServiceImpl {
                 if (!isExist(relations, item))
                     relations.add(item);
                 else {
-                    System.out.println("Conflicted items ...");
-                    System.out.println("New item:\t" + JSON.toJSONString(item));
+                    System.out.println("Conflicted items:\t" + JSON.toJSONString(item));
                     return relations;
                 }
             }

knowledge-service/src/main/java/com/diagbot/mapper/LibraryDetailMapper.java

@@ -0,0 +1,25 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.LibraryDetail;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.vo.TermVo;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 提示信息明细 Mapper 接口
+ * </p>
+ *
+ * @author Weixuan Huang
+ * @since 2019-01-30
+ */
+public interface LibraryDetailMapper extends BaseMapper<LibraryDetail> {
+    /**
+     * 获取术语知识
+     *
+     * @param termVo
+     * @return LibraryInfo
+     */
+    public List<LibraryDetail> getLibraryDetail(TermVo termVo);
+}

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

@@ -0,0 +1,25 @@
+package com.diagbot.mapper;
+
+import com.diagbot.vo.TermVo;
+import com.diagbot.dto.LibraryInfoDTO;
+import com.diagbot.entity.LibraryInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.entity.LibraryInfo;
+
+/**
+ * <p>
+ * 提示信息 Mapper 接口
+ * </p>
+ *
+ * @author Weixuan Huang
+ * @since 2019-01-30
+ */
+public interface LibraryInfoMapper extends BaseMapper<LibraryInfo> {
+    /**
+     * 获取术语基本信息
+     *
+     * @param termVo
+     * @return LibraryInfo
+     */
+    public LibraryInfo getLibraryInfo(TermVo termVo);
+}

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

@@ -0,0 +1,19 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.LibraryDetail;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.vo.TermVo;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 提示信息明细 服务类
+ * </p>
+ *
+ * @author Weixuan Huang
+ * @since 2019-01-30
+ */
+public interface LibraryDetailService extends IService<LibraryDetail> {
+    public List<LibraryDetail> getLibraryDetail(TermVo termVo);
+}

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

@@ -0,0 +1,19 @@
+package com.diagbot.service;
+
+import com.diagbot.dto.LibraryInfoDTO;
+import com.diagbot.vo.TermVo;
+import com.diagbot.entity.LibraryInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.vo.TermVo;
+
+/**
+ * <p>
+ * 提示信息 服务类
+ * </p>
+ *
+ * @author Weixuan Huang
+ * @since 2019-01-30
+ */
+public interface LibraryInfoService extends IService<LibraryInfo> {
+    public LibraryInfo getLibraryInfo(TermVo termVo);
+}

knowledge-service/src/main/java/com/diagbot/service/impl/LibraryDetailServiceImpl.java

@@ -0,0 +1,26 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.entity.LibraryDetail;
+import com.diagbot.mapper.LibraryDetailMapper;
+import com.diagbot.service.LibraryDetailService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.vo.TermVo;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 提示信息明细 服务实现类
+ * </p>
+ *
+ * @author Weixuan Huang
+ * @since 2019-01-30
+ */
+@Service
+public class LibraryDetailServiceImpl extends ServiceImpl<LibraryDetailMapper, LibraryDetail> implements LibraryDetailService {
+    @Override
+    public List<LibraryDetail> getLibraryDetail(TermVo termVo) {
+        return baseMapper.getLibraryDetail(termVo);
+    }
+}

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

@@ -0,0 +1,25 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.dto.LibraryInfoDTO;
+import com.diagbot.vo.TermVo;
+import com.diagbot.entity.LibraryInfo;
+import com.diagbot.mapper.LibraryInfoMapper;
+import com.diagbot.service.LibraryInfoService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 提示信息 服务实现类
+ * </p>
+ *
+ * @author Weixuan Huang
+ * @since 2019-01-30
+ */
+@Service
+public class LibraryInfoServiceImpl extends ServiceImpl<LibraryInfoMapper, LibraryInfo> implements LibraryInfoService {
+    @Override
+    public LibraryInfo getLibraryInfo(TermVo termVo) {
+        return baseMapper.getLibraryInfo(termVo);
+    }
+}

knowledge-service/src/main/resources/mapper/LibraryDetailMapper.xml

@@ -0,0 +1,22 @@
+<?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.LibraryDetailMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.LibraryDetail">
+        <id column="id" property="id" />
+        <result column="is_deleted" property="isDeleted" />
+        <result column="gmt_create" property="gmtCreate" />
+        <result column="gmt_modified" property="gmtModified" />
+        <result column="creator" property="creator" />
+        <result column="modifier" property="modifier" />
+        <result column="concept_id" property="conceptId" />
+        <result column="title" property="title" />
+        <result column="content" property="content" />
+        <result column="text" property="text" />
+        <result column="order_no" property="orderNo" />
+        <result column="position" property="position" />
+        <result column="is_reason" property="isReason" />
+    </resultMap>
+
+</mapper>

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

@@ -0,0 +1,19 @@
+<?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.LibraryInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.LibraryInfo">
+        <id column="id" property="id" />
+        <result column="is_deleted" property="isDeleted" />
+        <result column="gmt_create" property="gmtCreate" />
+        <result column="gmt_modified" property="gmtModified" />
+        <result column="creator" property="creator" />
+        <result column="modifier" property="modifier" />
+        <result column="name" property="name" />
+        <result column="remark" property="remark" />
+        <result column="concept_id" property="conceptId" />
+        <result column="is_concept" property="isConcept" />
+    </resultMap>
+
+</mapper>

knowledgeman-service/src/main/java/com/diagbot/aop/SysLoggerAspect.java

@@ -1,76 +1,76 @@
-package com.diagbot.aop;
-
-import com.diagbot.annotation.SysLogger;
-import com.diagbot.entity.SysLog;
-import com.diagbot.enums.SysTypeEnum;
-import com.diagbot.rabbit.MySender;
-import com.diagbot.util.GsonUtil;
-import com.diagbot.util.HttpUtils;
-import com.diagbot.util.StringUtil;
-import com.diagbot.util.UserUtils;
-import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Before;
-import org.aspectj.lang.annotation.Pointcut;
-import org.aspectj.lang.reflect.MethodSignature;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.lang.reflect.Method;
-import java.util.Date;
-
-/**
- * @Description: 日志拦截切面
- * @author: gaodm
- * @time: 2018/8/2 13:36
- */
-@Aspect
-@Component
-public class SysLoggerAspect {
-    @Autowired
-    private MySender mySender;
-
-    @Pointcut("@annotation(com.diagbot.annotation.SysLogger)")
-    public void loggerPointCut() {
-
-    }
-
-    @Before("loggerPointCut()")
-    public void saveSysLog(JoinPoint joinPoint) {
-        MethodSignature signature = (MethodSignature) joinPoint.getSignature();
-        Method method = signature.getMethod();
-
-        SysLog sysLog = new SysLog();
-        SysLogger sysLogger = method.getAnnotation(SysLogger.class);
-        if (sysLogger != null) {
-            //注解上的描述
-            sysLog.setOperation(sysLogger.value());
-        }
-        //请求的方法名
-        String className = joinPoint.getTarget().getClass().getName();
-        String methodName = signature.getName();
-        sysLog.setMethod(className + "." + methodName + "()");
-        //请求的参数
-        Object[] args = joinPoint.getArgs();
-        String params = "";
-        for (Object o : args) {
-            params += GsonUtil.toJson(o);
-        }
-        if (!StringUtil.isEmpty(params)) {
-            sysLog.setParams(params);
-        }
-        //设置IP地址
-        sysLog.setIp(HttpUtils.getIpAddress());
-        //用户名
-        String username = UserUtils.getCurrentPrinciple();
-        if (!StringUtil.isEmpty(username)) {
-            sysLog.setUsername(username);
-        }
-        sysLog.setGmtCreate(new Date());
-        sysLog.setSysType(SysTypeEnum.KNOWLEDGEMAN_SERVICE.getKey());
-        //保存系统日志
-        mySender.outputLogSend(sysLog);
-    }
-
-}
-
+//package com.diagbot.aop;
+//
+//import com.diagbot.annotation.SysLogger;
+//import com.diagbot.entity.SysLog;
+//import com.diagbot.enums.SysTypeEnum;
+//import com.diagbot.rabbit.MySender;
+//import com.diagbot.util.GsonUtil;
+//import com.diagbot.util.HttpUtils;
+//import com.diagbot.util.StringUtil;
+//import com.diagbot.util.UserUtils;
+//import org.aspectj.lang.JoinPoint;
+//import org.aspectj.lang.annotation.Aspect;
+//import org.aspectj.lang.annotation.Before;
+//import org.aspectj.lang.annotation.Pointcut;
+//import org.aspectj.lang.reflect.MethodSignature;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.stereotype.Component;
+//
+//import java.lang.reflect.Method;
+//import java.util.Date;
+//
+///**
+// * @Description: 日志拦截切面
+// * @author: gaodm
+// * @time: 2018/8/2 13:36
+// */
+//@Aspect
+//@Component
+//public class SysLoggerAspect {
+//    @Autowired
+//    private MySender mySender;
+//
+//    @Pointcut("@annotation(com.diagbot.annotation.SysLogger)")
+//    public void loggerPointCut() {
+//
+//    }
+//
+//    @Before("loggerPointCut()")
+//    public void saveSysLog(JoinPoint joinPoint) {
+//        MethodSignature signature = (MethodSignature) joinPoint.getSignature();
+//        Method method = signature.getMethod();
+//
+//        SysLog sysLog = new SysLog();
+//        SysLogger sysLogger = method.getAnnotation(SysLogger.class);
+//        if (sysLogger != null) {
+//            //注解上的描述
+//            sysLog.setOperation(sysLogger.value());
+//        }
+//        //请求的方法名
+//        String className = joinPoint.getTarget().getClass().getName();
+//        String methodName = signature.getName();
+//        sysLog.setMethod(className + "." + methodName + "()");
+//        //请求的参数
+//        Object[] args = joinPoint.getArgs();
+//        String params = "";
+//        for (Object o : args) {
+//            params += GsonUtil.toJson(o);
+//        }
+//        if (!StringUtil.isEmpty(params)) {
+//            sysLog.setParams(params);
+//        }
+//        //设置IP地址
+//        sysLog.setIp(HttpUtils.getIpAddress());
+//        //用户名
+//        String username = UserUtils.getCurrentPrinciple();
+//        if (!StringUtil.isEmpty(username)) {
+//            sysLog.setUsername(username);
+//        }
+//        sysLog.setGmtCreate(new Date());
+//        sysLog.setSysType(SysTypeEnum.KNOWLEDGEMAN_SERVICE.getKey());
+//        //保存系统日志
+//        mySender.outputLogSend(sysLog);
+//    }
+//
+//}
+//

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

@@ -0,0 +1,67 @@
+package com.diagbot.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.diagbot.entity.LibraryDetail;
+import com.diagbot.entity.LibraryInfo;
+import com.diagbot.entity.Medical;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * @Description:
+ * @author: Weixuan Huang
+ * @time: 2019/1/14 17:03
+ */
+@Getter
+@Setter
+public class ConceptDTO {
+     /**
+     * 概念id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 术语id
+     */
+    private Integer libId;
+
+    /**
+     * 术语名称
+     */
+    private String name;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime gmtCreated;
+
+    /**
+     * 修改时间
+     */
+    private LocalDateTime gmtModified;
+
+    /**
+     * 术语基本信息
+     */
+    private List<LibraryInfo> libraryInfo;
+
+    /**
+     * 术语相关医学知识
+     */
+    private List<LibraryDetail> information;
+
+    /**
+     * 医学临床信息
+     */
+    private Medical medicalInfo;
+
+    /**
+     * 术语所有上级信息
+     */
+    private List<RelationDTO> relations;
+}

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

@@ -0,0 +1,70 @@
+package com.diagbot.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.time.LocalDateTime;
+
+/**
+ * @author Weixuan Huang
+ * @since 2019-01-30
+ */
+@Getter
+@Setter
+public class LibraryInfoDTO {
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private LocalDateTime gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private LocalDateTime gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 概念id
+     */
+    private Integer conceptId;
+
+    /**
+     * 是否标准词,1:是,0:否
+     */
+    private Integer isConcept;
+
+
+}

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

@@ -14,20 +14,20 @@ public class MedicalDTO {
     /**
      * 主键
      */
-//    private long id;
+    private Integer id;
 
     /**
-     * 术语名称
+     * 术语概念id
      */
-    private String name;
+    private Integer concept_id;
 
     /**
-     * 标准类型名称
+     * 术语类型编号，对应类型库
      */
-    private String typename;
+    private Integer typeId;
 
     /**
-     * 类型名称
+     * 术语类型
      */
     private String type;
 
@@ -36,16 +36,6 @@ public class MedicalDTO {
      */
     private String stdName;
 
-    /**
-     * 术语小类名称
-     */
-    private String cateName;
-
-    /**
-     * 术语类组
-     */
-    private String group;
-
     /**
      * 性别：1:男, 2:女, 3:通用
      */

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

@@ -0,0 +1,49 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: Weixuan Huang
+ * @time: 2019/1/31 16:53
+ */
+@Getter
+@Setter
+public class RelationDTO {
+    /**
+     * 主键
+     */
+    private Integer id;
+
+    /**
+     * 关系起点术语id
+     */
+    private Integer startId;
+
+    /**
+     * 关系起点术语名称
+     */
+    private String startName;
+
+    /**
+     * 关系id
+     */
+    private Integer relationId;
+
+    /**
+     * 关系名称
+     */
+    private String relationName;
+
+    /**
+     * 关系终点术语id
+     */
+    private Integer endId;
+
+    /**
+     * 关系终点术语名称
+     */
+    private String endName;
+
+}

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

@@ -47,4 +47,9 @@ public class TermDTO {
      * 医学临床信息
      */
     private List<MedicalDTO> medicalInfo;
+
+    /**
+     * 术语层级关系
+     */
+//    private List<LevelDTO> levelInfo;
 }

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

@@ -0,0 +1,80 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author Weixuan Huang
+ * @since 2019-01-30
+ */
+public class Concept implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 概念id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 术语id
+     */
+    private Integer libId;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime gmtCreated;
+
+    /**
+     * 修改时间
+     */
+    private LocalDateTime gmtModified;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+    public Integer getLibId() {
+        return libId;
+    }
+
+    public void setLibId(Integer libId) {
+        this.libId = libId;
+    }
+    public LocalDateTime getGmtCreated() {
+        return gmtCreated;
+    }
+
+    public void setGmtCreated(LocalDateTime gmtCreated) {
+        this.gmtCreated = gmtCreated;
+    }
+    public LocalDateTime getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(LocalDateTime gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+
+    @Override
+    public String toString() {
+        return "Concept{" +
+        "id=" + id +
+        ", libId=" + libId +
+        ", gmtCreated=" + gmtCreated +
+        ", gmtModified=" + gmtModified +
+        "}";
+    }
+}

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

@@ -1,91 +0,0 @@
-package com.diagbot.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author Weixuan Huang
- * @since 2019-01-14
- */
-public class Information implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 内容id
-     */
-//    @TableId(value = "id", type = IdType.AUTO)
-//    private Integer id;
-
-    /**
-     * 术语名称
-     */
-    private String name;
-
-    /**
-     * 对应术语id
-     */
-    private Integer libId;
-
-    /**
-     * 标题
-     */
-    private String title;
-
-    /**
-     * 内容
-     */
-    private String content;
-
-//    public Integer getId() {
-//        return id;
-//    }
-
-//    public void setId(Integer id) {
-//        this.id = id;
-//    }
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-    public Integer getLibId() {
-        return libId;
-    }
-
-    public void setLibId(Integer libId) {
-        this.libId = libId;
-    }
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-    public String getContent() {
-        return content;
-    }
-
-    public void setContent(String content) {
-        this.content = content;
-    }
-
-    @Override
-    public String toString() {
-        return "Information{" +
-//        "id=" + id +
-        ", name=" + name +
-        ", libId=" + libId +
-        ", title=" + title +
-        ", content=" + content +
-        "}";
-    }
-}

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

@@ -0,0 +1,57 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author Weixuan Huang
+ * @since 2019-02-01
+ */
+public class LexiconRelationship implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private String name;
+
+    private String code;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    @Override
+    public String toString() {
+        return "LexiconRelationship{" +
+        "id=" + id +
+        ", name=" + name +
+        ", code=" + code +
+        "}";
+    }
+}

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

@@ -1,53 +0,0 @@
-package com.diagbot.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author Weixuan Huang
- * @since 2019-01-14
- */
-public class Library implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 术语id
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    /**
-     * 术语名称
-     */
-    private String name;
-
-    /**
-     * 同义词id
-     */
-    private Integer synony;
-
-    public Integer getId() { return id; }
-
-    public void setId(Integer id) { this.id = id; }
-    public String getName() { return name; }
-
-    public void setName(String name) { this.name = name; }
-    public Integer getSynony() { return synony; }
-
-    public void setSynony(Integer synony) { this.synony = synony; }
-
-    @Override
-    public String toString() {
-        return "Library{" +
-        "id=" + id +
-        ", name=" + name +
-        ", synony=" + synony +
-        "}";
-    }
-}

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

@@ -0,0 +1,197 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 提示信息明细
+ * </p>
+ *
+ * @author Weixuan Huang
+ * @since 2019-01-30
+ */
+public class LibraryDetail implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private LocalDateTime gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private LocalDateTime gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 提示概念id
+     */
+    private Long conceptId;
+
+    /**
+     * 提示明细标题
+     */
+    private String title;
+
+    /**
+     * 提示明细内容
+     */
+    private String content;
+
+    /**
+     * 纯文本
+     */
+    private String text;
+
+    /**
+     * 提示明细序号
+     */
+    private Integer orderNo;
+
+    /**
+     * 显示位置（多选）：1-推送展示，2-更多展示，3-一般治疗展示，4-手术治疗展示，5-药品说明书
+     */
+    private String position;
+
+    /**
+     * 是否诊断依据（1-是，0-否）
+     */
+    private Integer isReason;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public LocalDateTime getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(LocalDateTime gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public LocalDateTime getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(LocalDateTime gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+    public Long getConceptId() {
+        return conceptId;
+    }
+
+    public void setConceptId(Long conceptId) {
+        this.conceptId = conceptId;
+    }
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+    public Integer getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(Integer orderNo) {
+        this.orderNo = orderNo;
+    }
+    public String getPosition() {
+        return position;
+    }
+
+    public void setPosition(String position) {
+        this.position = position;
+    }
+    public Integer getIsReason() {
+        return isReason;
+    }
+
+    public void setIsReason(Integer isReason) {
+        this.isReason = isReason;
+    }
+
+    @Override
+    public String toString() {
+        return "LibraryDetail{" +
+        "id=" + id +
+        ", isDeleted=" + isDeleted +
+        ", gmtCreate=" + gmtCreate +
+        ", gmtModified=" + gmtModified +
+        ", creator=" + creator +
+        ", modifier=" + modifier +
+        ", conceptId=" + conceptId +
+        ", title=" + title +
+        ", content=" + content +
+        ", text=" + text +
+        ", orderNo=" + orderNo +
+        ", position=" + position +
+        ", isReason=" + isReason +
+        "}";
+    }
+}

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

@@ -0,0 +1,158 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 提示信息
+ * </p>
+ *
+ * @author Weixuan Huang
+ * @since 2019-01-30
+ */
+public class LibraryInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private LocalDateTime gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private LocalDateTime gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 概念id
+     */
+    private Integer conceptId;
+
+    /**
+     * 是否标准词,1:是,0:否
+     */
+    private Integer isConcept;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public LocalDateTime getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(LocalDateTime gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public LocalDateTime getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(LocalDateTime gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+    public Integer getConceptId() {
+        return conceptId;
+    }
+
+    public void setConceptId(Integer conceptId) {
+        this.conceptId = conceptId;
+    }
+    public Integer getIsConcept() {
+        return isConcept;
+    }
+
+    public void setIsConcept(Integer isConcept) {
+        this.isConcept = isConcept;
+    }
+
+    @Override
+    public String toString() {
+        return "LibraryInfo{" +
+        "id=" + id +
+        ", isDeleted=" + isDeleted +
+        ", gmtCreate=" + gmtCreate +
+        ", gmtModified=" + gmtModified +
+        ", creator=" + creator +
+        ", modifier=" + modifier +
+        ", name=" + name +
+        ", remark=" + remark +
+        ", conceptId=" + conceptId +
+        ", isConcept=" + isConcept +
+        "}";
+    }
+}

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

@@ -2,6 +2,7 @@ package com.diagbot.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+
 import java.io.Serializable;
 
 /**
@@ -10,24 +11,24 @@ import java.io.Serializable;
  * </p>
  *
  * @author Weixuan Huang
- * @since 2019-01-16
+ * @since 2019-01-31
  */
 public class Medical implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-//    @TableId(value = "id", type = IdType.AUTO)
-//    private Integer id;
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
 
     /**
-     * 术语名称
+     * 术语概念id
      */
-    private String name;
+    private Integer concept_id;
 
     /**
-     * 标准类型名称
+     * 术语类型编号，对应类型库
      */
-    private String typename;
+    private Integer typeId;
 
     /**
      * 术语类型
@@ -39,16 +40,6 @@ public class Medical implements Serializable {
      */
     private String stdName;
 
-    /**
-     * 术语小类名称
-     */
-    private String cateName;
-
-    /**
-     * 术语类组
-     */
-    private String group;
-
     /**
      * 性别：1:男, 2:女, 3:通用
      */
@@ -94,30 +85,31 @@ public class Medical implements Serializable {
      */
     private String note;
 
-//    public Integer getId() {
-//        return id;
-//    }
+    public Integer getId() {
+        return id;
+    }
 
-//    public void setId(Integer id) {
-//        this.id = id;
-//    }
-    public String getName() {
-        return name;
+    public void setId(Integer id) {
+        this.id = id;
     }
 
-    public void setName(String name) {
-        this.name = name;
+    public void setConcept_id(Integer concept_id) {
+        this.concept_id = concept_id;
     }
-    public String getTypename() {
-        return typename;
+    public Integer getTypeId() {
+        return typeId;
     }
 
-    public void setTypename(String typename) {
-        this.typename = typename;
+    public void setTypeId(Integer typeId) {
+        this.typeId = typeId;
+    }
+    public String getType() {
+        return type;
     }
-    public String getType() { return type; }
 
-    public void setType(String type) { this.type = type; }
+    public void setType(String type) {
+        this.type = type;
+    }
     public String getStdName() {
         return stdName;
     }
@@ -125,20 +117,6 @@ public class Medical implements Serializable {
     public void setStdName(String stdName) {
         this.stdName = stdName;
     }
-    public String getCateName() {
-        return cateName;
-    }
-
-    public void setCateName(String cateName) {
-        this.cateName = cateName;
-    }
-    public String getGroup() {
-        return group;
-    }
-
-    public void setGroup(String group) {
-        this.group = group;
-    }
     public String getGender() {
         return gender;
     }
@@ -205,14 +183,11 @@ public class Medical implements Serializable {
 
     @Override
     public String toString() {
-        return "Term{" +
-//        "id=" + id +
-        ", name=" + name +
-        ", typename=" + typename +
+        return "Medical{" +
+        "id=" + id +
+        ", typeId=" + typeId +
         ", type=" + type +
         ", stdName=" + stdName +
-        ", cateName=" + cateName +
-        ", group=" + group +
         ", gender=" + gender +
         ", minAge=" + minAge +
         ", maxAge=" + maxAge +

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

@@ -0,0 +1,79 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author Weixuan Huang
+ * @since 2019-01-31
+ */
+public class Relation implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 关系起点术语id
+     */
+    private Integer startId;
+
+    /**
+     * 关系id
+     */
+    private Integer relationId;
+
+    /**
+     * 关系终点术语id
+     */
+    private Integer endId;
+
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+    public Integer getStartId() {
+        return startId;
+    }
+
+    public void setStartId(Integer startId) {
+        this.startId = startId;
+    }
+    public Integer getRelationId() {
+        return relationId;
+    }
+
+    public void setRelationId(Integer relationId) {
+        this.relationId = relationId;
+    }
+    public Integer getEndId() {
+        return endId;
+    }
+
+    public void setEndId(Integer endId) {
+        this.endId = endId;
+    }
+
+
+    @Override
+    public String toString() {
+        return "Relation{" +
+        "id=" + id +
+        ", startId=" + startId +
+        ", relationId=" + relationId +
+        ", endId=" + endId +
+        "}";
+    }
+}

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

@@ -0,0 +1,61 @@
+package com.diagbot.facade;
+
+import com.diagbot.dto.ConceptDTO;
+import com.diagbot.entity.LibraryInfo;
+import com.diagbot.service.impl.ConceptServiceImpl;
+import com.diagbot.vo.TermVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+/**
+ * @Description: 术语查询业务层
+ * @author: Weixuan Huang
+ * @time: 2019/1/14 16:17
+ */
+@Component
+public class ConceptFacade extends ConceptServiceImpl {
+
+    @Autowired
+    private LibraryInfoFacade libraryinfoFacade;
+    @Autowired
+    private LibraryDetailFacade libraryDetailFacade;
+    @Autowired
+    private MedicalFacade medicalFacade;
+    @Autowired
+    private RelationFacade relationFacade;
+
+
+    /**
+     * 获取医学术语信息
+     *
+     * @param termvo
+     * @return ConceptDTO
+     */
+    public ConceptDTO getConceptInfo(@RequestBody TermVo termvo) {
+
+        ConceptDTO conceptDTO = getConcept(termvo);
+        // 获取与医学术语的基本信息
+        termvo.setId(conceptDTO.getLibId());
+        termvo.setConcept_id(conceptDTO.getId());
+        List<LibraryInfo> libraryInfo = libraryinfoFacade.getLibraryInfor(termvo);
+        for (LibraryInfo libinfo : libraryInfo) {
+            if (libinfo.getIsConcept() != null && libinfo.getIsConcept() == 1) {
+                conceptDTO.setName(libinfo.getName());
+            }
+        }
+        conceptDTO.setLibraryInfo(libraryInfo);
+
+        // 获取与术语相关的医学知识
+        conceptDTO.setInformation(libraryDetailFacade.getLibraryDetails(termvo));
+        // 获取与术语相关的临床医学信息
+        conceptDTO.setMedicalInfo(medicalFacade.getMedicalInfo(termvo));
+        // 获取术语的所有上级信息
+        conceptDTO.setRelations(relationFacade.getRelation(termvo));
+
+        return conceptDTO;
+    }
+
+}

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

@@ -1,28 +0,0 @@
-package com.diagbot.facade;
-
-import com.diagbot.dto.InforDTO;
-import com.diagbot.dto.LibraryDTO;
-import com.diagbot.service.impl.InformationServiceImpl;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-/**
- * @Description: 术语知识查询业务层
- * @author: Weixuan Huang
- * @time: 2019/1/16 14:17
- */
-@Component
-public class InformationFacade extends InformationServiceImpl {
-
-    /**
-     * 获取医学术语知识
-     *
-     * @param LibraryDTO
-     * @result InforDTO
-     */
-    public List<InforDTO> getInfor(LibraryDTO libraryDTO) {
-        List<InforDTO> inforDTO = this.getInfomation(libraryDTO);
-        return inforDTO;
-    }
-}

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

@@ -0,0 +1,31 @@
+package com.diagbot.facade;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.entity.LibraryDetail;
+import com.diagbot.service.impl.LibraryDetailServiceImpl;
+import com.diagbot.vo.TermVo;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @Description: 术语基本信息查询业务层
+ * @author: Weixuan Huang
+ * @time: 2019/1/16 14:17
+ */
+@Component
+public class LibraryDetailFacade extends LibraryDetailServiceImpl {
+
+    /**
+     * 获取医学术语知识
+     *
+     * @param termVo
+     * @result LibraryDetail
+     */
+    public List<LibraryDetail> getLibraryDetails(TermVo termVo) {
+        QueryWrapper<LibraryDetail> wrapper = new QueryWrapper();
+        wrapper.eq("concept_id", termVo.getConcept_id());
+        List<LibraryDetail> librarydetail = this.list(wrapper);
+        return librarydetail;
+    }
+}

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

@@ -1,82 +0,0 @@
-package com.diagbot.facade;
-
-import com.diagbot.dto.LibraryDTO;
-import com.diagbot.dto.TermDTO;
-import com.diagbot.entity.Library;
-import com.diagbot.service.impl.LibraryServiceImpl;
-import com.diagbot.util.BeanUtil;
-import com.diagbot.vo.AddLibraryVo;
-import com.diagbot.vo.AddTermVo;
-import com.diagbot.vo.TermVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * @Description: 术语查询业务层
- * @author: Weixuan Huang
- * @time: 2019/1/14 16:17
- */
-@Component
-public class LibraryFacade extends LibraryServiceImpl {
-
-    @Autowired
-    private InformationFacade informationFacade;
-    @Autowired
-    private MedicalFacade medicalFacade;
-
-
-    /**
-     * 获取医学术语信息
-     *
-     * @param TermVo
-     * @return TermDTO
-     */
-    public TermDTO getTermInfo(@RequestBody TermVo termvo) {
-
-        TermDTO termDTO = new TermDTO();
-        LibraryDTO libraryDTO = getLibrary(termvo);
-        // 获取与医学术语的基本信息
-        termDTO.setLibrary(libraryDTO);
-        // 获取与术语相关的医学知识
-        termDTO.setInformation(informationFacade.getInfor(libraryDTO));
-        // 获取与术语相关的临床医学信息
-        termDTO.setMedicalInfo(medicalFacade.getInfor(libraryDTO));
-
-        return termDTO;
-    }
-
-    /**
-     * 获取术语基本信息
-     *
-     * @param termVo
-     * @return
-     */
-    public LibraryDTO getTerm(@RequestBody TermVo termVo) {
-        LibraryDTO libraryDTO = getLibrary(termVo);
-
-        return  libraryDTO;
-    }
-
-    /**
-     * 添加术语信息
-     *
-     * @Param addLibraryVo
-     * @Return addLibraryVo
-     */
-    public Boolean addTerm(AddTermVo addTermVo) {
-
-        Boolean result = false;
-
-        AddLibraryVo addLibraryVo = addTermVo.getLibraryVo();
-
-        if (addLibraryVo != null) {
-            Library library = new Library();
-            BeanUtil.copyProperties(addLibraryVo, library);
-
-            result = this.save(library);
-        }
-
-        return result;
-    }
-}

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

@@ -0,0 +1,32 @@
+package com.diagbot.facade;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.entity.LibraryInfo;
+import com.diagbot.service.impl.LibraryInfoServiceImpl;
+import com.diagbot.vo.TermVo;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @Description: 术语基本信息查询业务层
+ * @author: Weixuan Huang
+ * @time: 2019/1/16 14:17
+ */
+@Component
+public class LibraryInfoFacade extends LibraryInfoServiceImpl {
+
+    /**
+     * 获取医学术语基本信息
+     *
+     * @param termVo
+     * @result LibraryInfo
+     */
+    public List<LibraryInfo> getLibraryInfor(TermVo termVo) {
+        QueryWrapper<LibraryInfo> wrapper = new QueryWrapper();
+        wrapper.eq("concept_id", termVo.getConcept_id());
+        List<LibraryInfo> libraryinfor = this.list(wrapper);
+        return libraryinfor;
+    }
+
+}

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

@@ -1,12 +1,11 @@
 package com.diagbot.facade;
 
-import com.diagbot.dto.LibraryDTO;
-import com.diagbot.dto.MedicalDTO;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.entity.Medical;
 import com.diagbot.service.impl.MedicalServiceImpl;
+import com.diagbot.vo.TermVo;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-
 /**
  * @Description: 术语临床信息查询业务层
  * @author: Weixuan Huang
@@ -18,11 +17,13 @@ public class MedicalFacade extends MedicalServiceImpl {
     /**
      * 获取医学术语知识
      *
-     * @param LibraryDTO
-     * @result MedicalDTO
+     * @param termVo
+     * @result Medical
      */
-    public List<MedicalDTO> getInfor(LibraryDTO libraryDTO) {
-        List<MedicalDTO> medicalDTO = getMedicalInfo(libraryDTO);
-        return medicalDTO;
+    public Medical getMedicalInfo(TermVo termVo) {
+        QueryWrapper<Medical> wrapper = new QueryWrapper<>();
+        wrapper.eq("concept_id", termVo.getConcept_id());
+        Medical medical = this.getOne(wrapper);
+        return medical;
     }
 }

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

@@ -0,0 +1,134 @@
+package com.diagbot.facade;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.dto.RelationDTO;
+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.TermVo;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Description: 术语知识查询业务层
+ * @author: Weixuan Huang
+ * @time: 2019/1/16 14:17
+ */
+@Component
+public class RelationFacade extends RelationServiceImpl {
+
+    @Autowired
+    private LibraryInfoFacade libraryInfoFacade;
+    @Autowired
+    private RelationshipFacade relationshipFacade;
+
+    /**
+     *
+     *
+     * 获取医学术语上级信息
+     *
+     * @param termVo
+     * @result List<Relation>
+     */
+    public List<RelationDTO> getRelation(TermVo termVo) {
+        List<RelationDTO> relationDTOs = new ArrayList<>();
+
+        List<Relation> relations = new ArrayList<>();
+        relations = getList(relations, termVo.getConcept_id(), -1);
+        relationDTOs.addAll(ConvertListtoDTO(relations));
+
+        return relationDTOs;
+    }
+
+    public List<RelationDTO> ConvertListtoDTO (List<Relation> src) {
+        List<RelationDTO> dest = new ArrayList<>();
+        RelationDTO relationDTO;
+        TermVo termVo = new TermVo();
+
+        for (Relation relation:src) {
+            relationDTO = new RelationDTO();
+            BeanUtils.copyProperties(relation, relationDTO);
+
+            termVo.setConcept_id(relationDTO.getStartId());
+
+            LibraryInfo libraryInfo = libraryInfoFacade.getLibraryInfor(termVo).get(0);
+            relationDTO.setStartName(libraryInfo.getName());
+            termVo.setConcept_id(relationDTO.getEndId());
+            libraryInfo = libraryInfoFacade.getLibraryInfor(termVo).get(0);
+            relationDTO.setEndName(libraryInfo.getName());
+
+            LexiconRelationship lexiconRelationship = relationshipFacade.getLexiconRelationship(relationDTO);
+            relationDTO.setRelationName(lexiconRelationship.getName());
+
+            dest.add(relationDTO);
+        }
+
+        return dest;
+    }
+
+    /**
+     * 获取关系列表
+     * @param relations 关系列表
+     * @param con_id 起始术语id
+     * @param direct -1:向上, 1:向下
+     * @result List<Relation>
+     */
+    public List<Relation> getList(List<Relation> relations, Object con_id, int direct) {
+        List<Relation> rel_list = new ArrayList<>();
+
+
+        if (con_id != null && con_id instanceof Integer) {
+            QueryWrapper<Relation> wrapper = new QueryWrapper<>();
+
+            if (direct == -1) {
+                wrapper.eq("start_id", con_id);
+                rel_list = this.list(wrapper);
+            } else if (direct == 1) {
+                wrapper.eq("end_id", con_id);
+                rel_list = this.list(wrapper);
+            }
+
+            for (Relation item:rel_list) {
+                if (!isExist(relations, item))
+                    relations.add(item);
+                else {
+                    System.out.println("Conflicted items:\t" + JSON.toJSONString(item));
+                    return relations;
+                }
+            }
+
+            if (rel_list.size() > 0) {
+                for (Relation rel : rel_list) {
+                    getList(relations, rel.getEndId(), direct);
+                }
+            }
+        }
+
+        return relations;
+    }
+
+
+    /**
+     * 查询关系是否有循环，即新加关系的起点和终点与原有关系的终点和起点相等
+     *
+     * @param
+     */
+    public Boolean isExist(List<Relation> relations, Relation relation) {
+        Boolean Exist = false;
+
+        for (Relation item:relations) {
+            if (item.getStartId().intValue() == relation.getEndId().intValue() && item.getEndId().intValue() == relation.getStartId().intValue()) {
+                Exist = true;
+            }
+        }
+
+        return Exist;
+    }
+
+}

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

@@ -0,0 +1,31 @@
+package com.diagbot.facade;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.dto.RelationDTO;
+import com.diagbot.entity.LexiconRelationship;
+import com.diagbot.service.impl.LexiconRelationshipServiceImpl;
+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<>();
+        wrapper.eq("id", relationDTO.getRelationId());
+        LexiconRelationship lexiconRelationship = this.getOne(wrapper);
+
+        return lexiconRelationship;
+    }
+}

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

@@ -0,0 +1,23 @@
+package com.diagbot.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.dto.ConceptDTO;
+import com.diagbot.entity.Concept;
+import com.diagbot.vo.TermVo;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author Weixuan Huang
+ * @since 2019-01-30
+ */
+public interface ConceptMapper extends BaseMapper<Concept> {
+    /**
+     * 获取术语概念信息
+     * @param termVo
+     * @return ConceptDTO
+     */
+    public ConceptDTO getConcept(TermVo termVo);
+}

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

@@ -1,25 +0,0 @@
-package com.diagbot.mapper;
-
-import com.diagbot.dto.InforDTO;
-import com.diagbot.dto.LibraryDTO;
-import com.diagbot.entity.Information;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author Weixuan Huang
- * @since 2019-01-14
- */
-public interface InformationMapper extends BaseMapper<Information> {
-    /**
-     * 获取术语医学知识信息
-     * @param LibraryDTO
-     * @return InforDTO
-     */
-    public List<InforDTO> getInformation(LibraryDTO libraryDTO);
-}

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

@@ -0,0 +1,18 @@
+package com.diagbot.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.dto.RelationDTO;
+import com.diagbot.entity.LexiconRelationship;
+import com.diagbot.facade.LibraryInfoFacade;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author Weixuan Huang
+ * @since 2019-02-01
+ */
+public interface LexiconRelationshipMapper extends BaseMapper<LexiconRelationship> {
+    public LexiconRelationship getLexiconRelationship(RelationDTO relationDTO, LibraryInfoFacade libraryInfoFacade);
+}

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

@@ -0,0 +1,25 @@
+package com.diagbot.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.entity.LibraryDetail;
+import com.diagbot.vo.TermVo;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 提示信息明细 Mapper 接口
+ * </p>
+ *
+ * @author Weixuan Huang
+ * @since 2019-01-30
+ */
+public interface LibraryDetailMapper extends BaseMapper<LibraryDetail> {
+    /**
+     * 获取术语知识
+     *
+     * @param termVo
+     * @return LibraryInfo
+     */
+    public List<LibraryDetail> getLibraryDetail(TermVo termVo);
+}

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

@@ -0,0 +1,23 @@
+package com.diagbot.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.entity.LibraryInfo;
+import com.diagbot.vo.TermVo;
+
+/**
+ * <p>
+ * 提示信息 Mapper 接口
+ * </p>
+ *
+ * @author Weixuan Huang
+ * @since 2019-01-30
+ */
+public interface LibraryInfoMapper extends BaseMapper<LibraryInfo> {
+    /**
+     * 获取术语基本信息
+     *
+     * @param termVo
+     * @return LibraryInfo
+     */
+    public LibraryInfo getLibraryInfo(TermVo termVo);
+}

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

@@ -1,28 +0,0 @@
-package com.diagbot.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.diagbot.dto.LibraryDTO;
-import com.diagbot.dto.TermDTO;
-import com.diagbot.entity.Library;
-import com.diagbot.vo.TermVo;
-
-/**
- * @Description 获取术语信息
- * @author Weixuan Huang
- * @since 2019-01-14
- */
-public interface LibraryMapper extends BaseMapper<Library> {
-    /**
-     * 获取术语信息
-     * @param termVo
-     * @return TermDTO
-     */
-    public TermDTO getTermInfo(TermVo termVo);
-
-    /**
-     * 获取术语词库信息
-     * @param termVo
-     * @return LibraryDTO
-     */
-    public LibraryDTO getLibrary(TermVo termVo);
-}

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

@@ -0,0 +1,26 @@
+package com.diagbot.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.dto.RelationDTO;
+import com.diagbot.entity.Relation;
+import com.diagbot.vo.TermVo;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author Weixuan Huang
+ * @since 2019-01-31
+ */
+public interface RelationMapper extends BaseMapper<Relation> {
+    /**
+     * 获取术语上级信息
+     *
+     * @param termVo
+     * @result List<RelationDTO>
+     */
+    public List<RelationDTO> getRelation(TermVo termVo);
+}

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

@@ -0,0 +1,18 @@
+package com.diagbot.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.dto.ConceptDTO;
+import com.diagbot.entity.Concept;
+import com.diagbot.vo.TermVo;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author Weixuan Huang
+ * @since 2019-01-30
+ */
+public interface ConceptService extends IService<Concept> {
+    public ConceptDTO getConcept(TermVo termVo);
+}

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

@@ -1,20 +0,0 @@
-package com.diagbot.service;
-
-import com.diagbot.dto.InforDTO;
-import com.diagbot.dto.LibraryDTO;
-import com.diagbot.entity.Information;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author Weixuan Huang
- * @since 2019-01-14
- */
-public interface InformationService extends IService<Information> {
-    public List<InforDTO> getInfomation(LibraryDTO libraryDTO);
-}

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

@@ -0,0 +1,18 @@
+package com.diagbot.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.dto.RelationDTO;
+import com.diagbot.entity.LexiconRelationship;
+import com.diagbot.facade.LibraryInfoFacade;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author Weixuan Huang
+ * @since 2019-02-01
+ */
+public interface LexiconRelationshipService extends IService<LexiconRelationship> {
+    public LexiconRelationship getLexiconRelationship(RelationDTO relationDTO, LibraryInfoFacade libraryInfoFacade);
+}

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

@@ -0,0 +1,19 @@
+package com.diagbot.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.entity.LibraryDetail;
+import com.diagbot.vo.TermVo;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 提示信息明细 服务类
+ * </p>
+ *
+ * @author Weixuan Huang
+ * @since 2019-01-30
+ */
+public interface LibraryDetailService extends IService<LibraryDetail> {
+    public List<LibraryDetail> getLibraryDetail(TermVo termVo);
+}

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

@@ -0,0 +1,17 @@
+package com.diagbot.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.entity.LibraryInfo;
+import com.diagbot.vo.TermVo;
+
+/**
+ * <p>
+ * 提示信息 服务类
+ * </p>
+ *
+ * @author Weixuan Huang
+ * @since 2019-01-30
+ */
+public interface LibraryInfoService extends IService<LibraryInfo> {
+    public LibraryInfo getLibraryInfo(TermVo termVo);
+}

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

@@ -1,21 +0,0 @@
-package com.diagbot.service;
-
-import com.diagbot.dto.LibraryDTO;
-import com.diagbot.entity.Library;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.diagbot.vo.AddLibraryVo;
-import com.diagbot.vo.TermVo;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author Weixuan Huang
- * @since 2019-01-14
- */
-public interface LibraryService extends IService<Library> {
-    public LibraryDTO getLibrary(TermVo termVo);
-
-    public AddLibraryVo addLibrary(AddLibraryVo libraryVo);
-}

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

@@ -0,0 +1,20 @@
+package com.diagbot.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.dto.RelationDTO;
+import com.diagbot.entity.Relation;
+import com.diagbot.vo.TermVo;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author Weixuan Huang
+ * @since 2019-01-31
+ */
+public interface RelationService extends IService<Relation> {
+    public List<RelationDTO> getRelation(TermVo termVo);
+}

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

@@ -0,0 +1,25 @@
+package com.diagbot.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.dto.ConceptDTO;
+import com.diagbot.entity.Concept;
+import com.diagbot.mapper.ConceptMapper;
+import com.diagbot.service.ConceptService;
+import com.diagbot.vo.TermVo;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author Weixuan Huang
+ * @since 2019-01-30
+ */
+@Service
+public class ConceptServiceImpl extends ServiceImpl<ConceptMapper, Concept> implements ConceptService {
+    @Override
+    public ConceptDTO getConcept(TermVo termVo) {
+        return baseMapper.getConcept(termVo);
+    }
+}

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

@@ -1,26 +0,0 @@
-package com.diagbot.service.impl;
-
-import com.diagbot.dto.InforDTO;
-import com.diagbot.dto.LibraryDTO;
-import com.diagbot.entity.Information;
-import com.diagbot.mapper.InformationMapper;
-import com.diagbot.service.InformationService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author Weixuan Huang
- * @since 2019-01-14
- */
-@Service
-public class InformationServiceImpl extends ServiceImpl<InformationMapper, Information> implements InformationService {
-    public List<InforDTO> getInfomation(LibraryDTO libraryDTO) {
-        return baseMapper.getInformation(libraryDTO);
-    }
-}

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

@@ -0,0 +1,25 @@
+package com.diagbot.service.impl;
+
+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 org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author Weixuan Huang
+ * @since 2019-02-01
+ */
+@Service
+public class LexiconRelationshipServiceImpl extends ServiceImpl<LexiconRelationshipMapper, LexiconRelationship> implements LexiconRelationshipService {
+    @Override
+    public LexiconRelationship getLexiconRelationship(RelationDTO relationDTO, LibraryInfoFacade libraryInfoFacade) {
+        return baseMapper.getLexiconRelationship(relationDTO, libraryInfoFacade);
+    }
+}

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

@@ -0,0 +1,26 @@
+package com.diagbot.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.entity.LibraryDetail;
+import com.diagbot.mapper.LibraryDetailMapper;
+import com.diagbot.service.LibraryDetailService;
+import com.diagbot.vo.TermVo;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 提示信息明细 服务实现类
+ * </p>
+ *
+ * @author Weixuan Huang
+ * @since 2019-01-30
+ */
+@Service
+public class LibraryDetailServiceImpl extends ServiceImpl<LibraryDetailMapper, LibraryDetail> implements LibraryDetailService {
+    @Override
+    public List<LibraryDetail> getLibraryDetail(TermVo termVo) {
+        return baseMapper.getLibraryDetail(termVo);
+    }
+}

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

@@ -0,0 +1,24 @@
+package com.diagbot.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.entity.LibraryInfo;
+import com.diagbot.mapper.LibraryInfoMapper;
+import com.diagbot.service.LibraryInfoService;
+import com.diagbot.vo.TermVo;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 提示信息 服务实现类
+ * </p>
+ *
+ * @author Weixuan Huang
+ * @since 2019-01-30
+ */
+@Service
+public class LibraryInfoServiceImpl extends ServiceImpl<LibraryInfoMapper, LibraryInfo> implements LibraryInfoService {
+    @Override
+    public LibraryInfo getLibraryInfo(TermVo termVo) {
+        return baseMapper.getLibraryInfo(termVo);
+    }
+}

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

@@ -1,30 +0,0 @@
-package com.diagbot.service.impl;
-
-import com.diagbot.dto.LibraryDTO;
-import com.diagbot.entity.Library;
-import com.diagbot.mapper.LibraryMapper;
-import com.diagbot.service.LibraryService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.diagbot.vo.AddLibraryVo;
-import com.diagbot.vo.TermVo;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author Weixuan Huang
- * @since 2019-01-14
- */
-@Service
-public class LibraryServiceImpl extends ServiceImpl<LibraryMapper, Library> implements LibraryService {
-    @Override
-    public LibraryDTO getLibrary(TermVo termVo) {
-        return baseMapper.getLibrary(termVo);
-    }
-
-    @Override
-    public AddLibraryVo addLibrary(AddLibraryVo addLibraryVo) { return addLibraryVo; }
-
-}

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

@@ -0,0 +1,26 @@
+package com.diagbot.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.dto.RelationDTO;
+import com.diagbot.entity.Relation;
+import com.diagbot.mapper.RelationMapper;
+import com.diagbot.service.RelationService;
+import com.diagbot.vo.TermVo;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author Weixuan Huang
+ * @since 2019-01-31
+ */
+@Service
+public class RelationServiceImpl extends ServiceImpl<RelationMapper, Relation> implements RelationService {
+    public List<RelationDTO> getRelation(TermVo termVo) {
+        return baseMapper.getRelation(termVo);
+    }
+}

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

@@ -1,22 +0,0 @@
-package com.diagbot.vo;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import javax.validation.constraints.NotNull;
-
-/**
- * @Description:
- * @author: Weixuan Huang
- * @time: 2019/1/17 16:13
- */
-@Getter
-@Setter
-public class AddInforVo {
-    @NotNull(message="请输入术语id号")
-    private int lib_id;
-
-    private String title;
-
-    private String content;
-}

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

@@ -1,20 +0,0 @@
-package com.diagbot.vo;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import javax.validation.constraints.NotNull;
-
-/**
- * @Description:
- * @author: Weixuan Huang
- * @time: 2019/1/17 16:13
- */
-@Getter
-@Setter
-public class AddLibraryVo {
-    @NotNull(message="请输入医学术语")
-    private String name;
-
-    private int synony;
-}

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

@@ -1,33 +0,0 @@
-package com.diagbot.vo;
-
-import com.diagbot.dto.InforDTO;
-import com.diagbot.dto.LibraryDTO;
-import com.diagbot.dto.MedicalDTO;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.List;
-
-/**
- * @Description:
- * @author: Weixuan Huang
- * @time: 2019/1/17 16:23
- */
-@Getter
-@Setter
-public class AddTermVo {
-    /**
-     * 添加术语基本信息
-     */
-    private AddLibraryVo libraryVo;
-
-    /**
-     * 添加术语相关医学知识
-     */
-    private List<InforDTO> information;
-
-    /**
-     * 添加医学临床信息
-     */
-    private List<MedicalDTO> medicalInfo;
-}

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

@@ -15,4 +15,8 @@ import javax.validation.constraints.NotNull;
 public class TermVo {
     @NotNull(message="请输入医学术语")
     private String term;
+
+    private int id;
+
+    private int concept_id;
 }

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

@@ -1,20 +0,0 @@
-package com.diagbot.web;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Weixuan Huang
- * @since 2019-01-14
- */
-@Controller
-@RequestMapping("/bodypart")
-public class BodypartController {
-
-}

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

@@ -0,0 +1,46 @@
+package com.diagbot.web;
+
+
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.ConceptDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.dto.TermDTO;
+import com.diagbot.facade.ConceptFacade;
+import com.diagbot.vo.TermVo;
+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;
+
+import javax.validation.Valid;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author Weixuan Huang
+ * @since 2019-01-30
+ */
+@RestController
+@RequestMapping("/concept")
+@Api(value = "医学标准术语API", tags = { "医学标准术语API" })
+
+public class ConceptController {
+    @Autowired
+    private ConceptFacade conceptFacade;
+
+    @ApiOperation(value = "术语信息查询",
+            notes = "Term：术语名称，必填<br>")
+    @PostMapping("/getConceptInfo")
+    @SysLogger("getConceptInfo")
+    public RespDTO<TermDTO> getConceptInfo(@Valid @RequestBody TermVo termvo) {
+        ConceptDTO data = conceptFacade.getConceptInfo(termvo);
+
+        return RespDTO.onSuc(data);
+    }
+
+}

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

@@ -1,20 +0,0 @@
-package com.diagbot.web;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Weixuan Huang
- * @since 2019-01-14
- */
-@Controller
-@RequestMapping("/information")
-public class InformationController {
-
-}

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

@@ -1,20 +0,0 @@
-package com.diagbot.web;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Weixuan Huang
- * @since 2019-01-14
- */
-@Controller
-@RequestMapping("/lexicon")
-public class LexiconController {
-
-}

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

@@ -1,69 +0,0 @@
-package com.diagbot.web;
-
-
-import com.diagbot.annotation.SysLogger;
-import com.diagbot.dto.LibraryDTO;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.dto.TermDTO;
-import com.diagbot.facade.LibraryFacade;
-import com.diagbot.vo.AddTermVo;
-import com.diagbot.vo.TermVo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-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 springfox.documentation.annotations.ApiIgnore;
-
-import javax.validation.Valid;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Weixuan Huang
- * @since 2019-01-14
- */
-@RestController
-@RequestMapping("/library")
-@Api(value = "医学术语API", tags = { "医学术语API" })
-
-public class LibraryController {
-    @Autowired
-    private LibraryFacade libraryFacade;
-
-    @ApiOperation(value = "术语信息查询",
-            notes = "Term：术语名称，必填<br>")
-    @PostMapping("/getTermInfo")
-    @SysLogger("getTermInfo")
-    public RespDTO<TermDTO> getTermInfo(@Valid @RequestBody TermVo termvo) {
-        TermDTO data = libraryFacade.getTermInfo(termvo);
-
-        return RespDTO.onSuc(data);
-    }
-
-    @ApiOperation(value = "术语基本信息查询",
-            notes = "Term: 术语名称，必填<br>")
-    @PostMapping("/getTerm")
-    @SysLogger("getTerm")
-    public RespDTO<LibraryDTO> getTerm(@Valid @RequestBody TermVo termVo) {
-        LibraryDTO libraryDTO = libraryFacade.getTerm(termVo);
-
-        return RespDTO.onSuc(libraryDTO);
-    }
-
-    @ApiOperation(value = "增添术语信息", notes = "Term: 术语名称，必填<br>")
-    @PostMapping("/addTerm")
-    @SysLogger("addTerm")
-    @Transactional
-    public RespDTO<Boolean> addTerm(AddTermVo addTermVo) {
-
-        Boolean result = libraryFacade.addTerm(addTermVo);
-        return RespDTO.onSuc(result);
-    }
-}

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

@@ -1,14 +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>
-
-</mapper>

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

@@ -0,0 +1,19 @@
+<?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.ConceptMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.Concept">
+        <id column="id" property="id" />
+        <result column="lib_id" property="libId" />
+        <result column="gmt_created" property="gmtCreated" />
+        <result column="gmt_modified" property="gmtModified" />
+    </resultMap>
+
+    <select id="getConcept" parameterType="com.diagbot.vo.TermVo" resultType="com.diagbot.dto.ConceptDTO">
+        SELECT
+        a.id, a.lib_id, a.gmt_created, a.gmt_modified
+        FROM concept a, library_info b
+        WHERE a.id = b.concept_id and b.name = #{term}
+    </select>
+</mapper>

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

@@ -1,24 +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.InformationMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.Information">
-        <id column="id" property="id" />
-        <result column="name" property="name" />
-        <result column="lib_id" property="libId" />
-        <result column="title" property="title" />
-        <result column="content" property="content" />
-    </resultMap>
-
-    <select id="getInformation" parameterType="com.diagbot.dto.LibraryDTO" resultType="com.diagbot.dto.InforDTO">
-        SELECT
-        a.id,
-        a.title,
-        a.content
-        FROM information a
-        LEFT JOIN library b on a.lib_id = b.id
-        WHERE b.id = #{id}
-    </select>
-
-</mapper>

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

@@ -1,24 +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.LibraryMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.Library">
-        <id column="id" property="id" />
-        <result column="name" property="name" />
-        <result column="type" property="type" />
-        <result column="synony" property="synony" />
-    </resultMap>
-
-    <select id="getLibrary" parameterType="com.diagbot.vo.TermVo" resultType="com.diagbot.dto.LibraryDTO">
-        SELECT
-        a.id,
-        a.name as term,
-        a.synony as synonymous
-        FROM library a
-        LEFT JOIN lexicon b on a.type = b.id
-        WHERE a.name = #{term}
-    </select>
-
-
-</mapper>

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

@@ -5,43 +5,19 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.diagbot.entity.Medical">
         <id column="id" property="id" />
-        <result column="name" property="name" />
+        <result column="concept_id" property="concept_id" />
+        <result column="type_id" property="typeId" />
         <result column="type" property="type" />
         <result column="std_name" property="stdName" />
-        <result column="cate_name" property="cateName" />
-        <result column="group" property="group" />
         <result column="gender" property="gender" />
         <result column="min_age" property="minAge" />
         <result column="max_age" property="maxAge" />
         <result column="bodypart" property="bodypart" />
         <result column="sub_bodypart" property="subBodypart" />
         <result column="display_order" property="displayOrder" />
+        <result column="dept" property="dept" />
         <result column="code" property="code" />
         <result column="note" property="note" />
     </resultMap>
 
-    <select id="getMedicalInfo" parameterType="com.diagbot.dto.LibraryDTO" resultType="com.diagbot.dto.MedicalDTO">
-        SELECT
-        a.id,
-        a.name,
-        c.name as typename,
-        a.type,
-        a.std_name,
-        a.cate_name,
-        a.group,
-        a.gender,
-        a.min_age,
-        a.max_age,
-        a.bodypart,
-        a.sub_bodypart,
-        a.display_order,
-        a.dept,
-        a.code,
-        a.note
-        FROM term a
-        LEFT JOIN library b on a.name = b.name
-        LEFT JOIN lexicon c on c.id = a.type_id
-        WHERE b.name = #{term}
-    </select>
-
 </mapper>