Merge remote-tracking branch 'origin/dev/icss' into dev/icss

icss-service/src/main/java/com/diagbot/entity/QuestionDetail.java

@@ -46,10 +46,6 @@ public class QuestionDetail implements Serializable {
      */
     private Long questionId;
 
-    /**
-     * question_relation
-     */
-    private Long questionRelation;
 
     /**
      * 排序号

icss-service/src/main/java/com/diagbot/entity/QuestionInfo.java

@@ -53,7 +53,7 @@ public class QuestionInfo implements Serializable {
     private Integer ageEnd;
 
     /**
-     * 类型（1：主诉 2：现病史 3：其他史 4：查体，5：化验 6：辅检 7：诊断）
+     * 类型（1：症状 3：其他史 4：查体，5：化验 6：辅检 7：诊断）
      */
     private Integer type;
 
@@ -69,7 +69,7 @@ public class QuestionInfo implements Serializable {
     private Integer subType;
 
     /**
-     * 标签标识(0：单项  1：组合项 2：填充项)
+     * 标签标识
      */
     private String tagType;
 

icss-service/src/main/java/com/diagbot/entity/QuestionMapping.java

@@ -71,6 +71,11 @@ public class QuestionMapping implements Serializable {
      */
     private Integer position;
 
+    /**
+     * 填写单显示位置
+     */
+    private Integer formPosition;
+
     /**
      * 主症状和伴随症状对应的question类型（0：症状公用 1：主症状特有 2：伴随症状特有 ）
      */

icss-service/src/main/java/com/diagbot/entity/QuestionRelation.java

@@ -1,78 +0,0 @@
-package com.diagbot.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * <p>
- * 标签关联表（同级关联）
- * </p>
- *
- * @author zhoutg
- * @since 2018-11-15
- */
-@Getter
-@Setter
-@TableName("icss_question_relation")
-public class QuestionRelation implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 是否删除,N:未删除，Y:删除
-     */
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    private Date gmtModified;
-
-    /**
-     * 创建人，0表示无创建人值
-     */
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    private String modifier;
-
-    /**
-     * 当前question
-     */
-    private Long curentQuestion;
-
-    /**
-     * 同级question
-     */
-    private Long siblingQuestion;
-
-    /**
-     * 排序号
-     */
-    private Integer orderNo;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-}

icss-service/src/main/java/com/diagbot/mapper/QuestionRelationMapper.java

@@ -1,16 +0,0 @@
-package com.diagbot.mapper;
-
-import com.diagbot.entity.QuestionRelation;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 标签关联表（同级关联） Mapper 接口
- * </p>
- *
- * @author zhoutg
- * @since 2018-11-15
- */
-public interface QuestionRelationMapper extends BaseMapper<QuestionRelation> {
-
-}

icss-service/src/main/java/com/diagbot/service/QuestionRelationService.java

@@ -1,16 +0,0 @@
-package com.diagbot.service;
-
-import com.diagbot.entity.QuestionRelation;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 标签关联表（同级关联） 服务类
- * </p>
- *
- * @author zhoutg
- * @since 2018-11-15
- */
-public interface QuestionRelationService extends IService<QuestionRelation> {
-
-}

icss-service/src/main/java/com/diagbot/service/impl/QuestionRelationServiceImpl.java

@@ -1,20 +0,0 @@
-package com.diagbot.service.impl;
-
-import com.diagbot.entity.QuestionRelation;
-import com.diagbot.mapper.QuestionRelationMapper;
-import com.diagbot.service.QuestionRelationService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 标签关联表（同级关联） 服务实现类
- * </p>
- *
- * @author zhoutg
- * @since 2018-11-15
- */
-@Service
-public class QuestionRelationServiceImpl extends ServiceImpl<QuestionRelationMapper, QuestionRelation> implements QuestionRelationService {
-
-}

icss-service/src/main/resources/mapper/QuestionMappingMapper.xml

@@ -13,6 +13,8 @@
         <result column="parent_question" property="parentQuestion" />
         <result column="son_question" property="sonQuestion" />
         <result column="order_no" property="orderNo" />
+        <result column="position" property="position" />
+        <result column="form_position" property="formPosition" />
         <result column="symptom_type" property="symptomType" />
         <result column="exclusion_type" property="exclusionType" />
         <result column="remark" property="remark" />

icss-service/src/main/resources/mapper/QuestionRelationMapper.xml

@@ -1,19 +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.QuestionRelationMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.QuestionRelation">
-        <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="curent_question" property="curentQuestion" />
-        <result column="sibling_question" property="siblingQuestion" />
-        <result column="order_no" property="orderNo" />
-        <result column="remark" property="remark" />
-    </resultMap>
-
-</mapper>