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

icss-service/src/main/java/com/diagbot/dto/QuestionDTO.java

@@ -23,14 +23,13 @@ public class QuestionDTO {
     private Integer type;//类型（1：主诉 2：现病史 3：其他史 4：查体，5：化验 6：辅检 7：诊断）
     private Integer controlType; //控件类型
     private Integer subType; //子类型
-    private String isGroup; //组合项标识(0：单项  1：组合项)
+    private String tagType; //标签标识(0：单项  1：组合项 2：填充项)
     private String addLine; //添加换行符(0：不换行，1：换行)
     private String labelPrefix; //前置内容
     private String labelSuffix; //后置内容
     private BigDecimal minValue; //最小值
     private BigDecimal maxValue; //最大值
     private String judgeType; //判断类型（0:本身异常；1:本身正常；2:数字范围；3:计算公式；9:无需判断）
-    private String tagQuestions; //标签关联questions
     private String copyType;//是否显示 + (0：不显示 1 ：显示)
     private List<QuestionDetail> questionDetailList = new ArrayList<>(); //标签明细表
     private List<QuestionDTO> questionMapping = new ArrayList<>();     //下级标签

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

@@ -31,6 +31,16 @@ public class QuestionDetail implements Serializable {
      */
     private String name;
 
+    /**
+     * 前置内容
+     */
+    private String labelPrefix;
+
+    /**
+     * 后置内容
+     */
+    private String labelSuffix;
+
     /**
      * question_id
      */

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

@@ -58,14 +58,10 @@ public class QuestionInfo implements Serializable {
     private Integer type;
 
     /**
-     * 控件类型(0：标签 1：下拉单选 2：下拉多选 3：联合下拉单选 4：联合下拉多选 5：占位标签)
+     * 控件类型
      */
     private Integer controlType;
 
-    /**
-     * 输入框的格式
-     */
-    private Integer inputFormat;
 
     /**
      * 子类型，(31：既往史 32：家族史 33：个人史 34：月经史 35：婚育史)
@@ -73,9 +69,9 @@ public class QuestionInfo implements Serializable {
     private Integer subType;
 
     /**
-     * 组合项标识(0：单项  1：组合项)
+     * 标签标识(0：单项  1：组合项 2：填充项)
      */
-    private String isGroup;
+    private String tagType;
 
     /**
      * 添加换行符(0：不换行，1：换行)
@@ -107,10 +103,6 @@ public class QuestionInfo implements Serializable {
      */
     private String judgeType;
 
-    /**
-     * 标签关联questions
-     */
-    private String tagQuestions;
 
     /**
      * 是否显示 + (0：不显示 1 ：显示)

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

@@ -74,7 +74,13 @@ public class QuestionMapping implements Serializable {
     /**
      * 主症状和伴随症状对应的question类型（0：症状公用 1：主症状特有 2：伴随症状特有 ）
      */
-    private Integer type;
+    private Integer symptomType;
+
+    /**
+     * 互斥类型
+     */
+    private Integer exclusionType;
+
 
     /**
      * 备注

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

@@ -0,0 +1,170 @@
+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 wangyu
+ * @since 2018-11-21
+ */
+public class TranFieldInfo 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;
+
+    /**
+     * 唯一主键(通常是医院编码:hospitalId)
+     */
+    private String uuid;
+
+    /**
+     * icss需要的字段
+     */
+    private String icssField;
+
+    /**
+     * 医院个性化字段
+     */
+    private String hisField;
+
+    /**
+     * 状态
+     */
+    private String status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    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 getUuid() {
+        return uuid;
+    }
+
+    public void setUuid(String uuid) {
+        this.uuid = uuid;
+    }
+    public String getIcssField() {
+        return icssField;
+    }
+
+    public void setIcssField(String icssField) {
+        this.icssField = icssField;
+    }
+    public String getHisField() {
+        return hisField;
+    }
+
+    public void setHisField(String hisField) {
+        this.hisField = hisField;
+    }
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        return "TranFieldInfo{" +
+        "id=" + id +
+        ", isDeleted=" + isDeleted +
+        ", gmtCreate=" + gmtCreate +
+        ", gmtModified=" + gmtModified +
+        ", creator=" + creator +
+        ", modifier=" + modifier +
+        ", uuid=" + uuid +
+        ", icssField=" + icssField +
+        ", hisField=" + hisField +
+        ", status=" + status +
+        ", remark=" + remark +
+        "}";
+    }
+}

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

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.TranFieldInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 字段对应表 Mapper 接口
+ * </p>
+ *
+ * @author wangyu
+ * @since 2018-11-21
+ */
+public interface TranFieldInfoMapper extends BaseMapper<TranFieldInfo> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.TranFieldInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 字段对应表 服务类
+ * </p>
+ *
+ * @author wangyu
+ * @since 2018-11-21
+ */
+public interface TranFieldInfoService extends IService<TranFieldInfo> {
+
+}

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

@@ -0,0 +1,20 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.entity.TranFieldInfo;
+import com.diagbot.mapper.TranFieldInfoMapper;
+import com.diagbot.service.TranFieldInfoService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 字段对应表 服务实现类
+ * </p>
+ *
+ * @author wangyu
+ * @since 2018-11-21
+ */
+@Service
+public class TranFieldInfoServiceImpl extends ServiceImpl<TranFieldInfoMapper, TranFieldInfo> implements TranFieldInfoService {
+
+}

icss-service/src/main/java/com/diagbot/web/TranFieldInfoController.java

@@ -0,0 +1,21 @@
+package com.diagbot.web;
+
+
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 字段对应表 前端控制器
+ * </p>
+ *
+ * @author wangyu
+ * @since 2018-11-21
+ */
+@RestController
+@RequestMapping("/tranFieldInfo")
+@Api(value = "字段对应信息API", tags = { "字段对应信息API" })
+public class TranFieldInfoController {
+
+}

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

@@ -6,6 +6,8 @@
     <resultMap id="BaseResultMap" type="com.diagbot.entity.QuestionDetail">
         <id column="id" property="id" />
         <result column="name" property="name" />
+        <result column="label_prefix" property="labelPrefix" />
+        <result column="label_suffix" property="labelSuffix" />
         <result column="question_id" property="questionId" />
         <result column="order_no" property="orderNo" />
         <result column="default_select" property="defaultSelect" />

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

@@ -12,16 +12,14 @@
         <result column="age_end" property="ageEnd" />
         <result column="type" property="type" />
         <result column="control_type" property="controlType" />
-        <result column="input_format" property="inputFormat" />
         <result column="sub_type" property="subType" />
-        <result column="is_group" property="isGroup" />
+        <result column="tag_type" property="tagType" />
         <result column="add_line" property="addLine" />
         <result column="label_prefix" property="labelPrefix" />
         <result column="label_suffix" property="labelSuffix" />
         <result column="min_value" property="minValue" />
         <result column="max_value" property="maxValue" />
         <result column="judge_type" property="judgeType" />
-        <result column="tag_questions" property="tagQuestions" />
         <result column="copy_type" property="copyType" />
         <result column="remark" property="remark" />
     </resultMap>

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

@@ -13,8 +13,8 @@
         <result column="parent_question" property="parentQuestion" />
         <result column="son_question" property="sonQuestion" />
         <result column="order_no" property="orderNo" />
-        <result column="show_type" property="showType" />
-        <result column="type" property="type" />
+        <result column="symptom_type" property="symptomType" />
+        <result column="exclusion_type" property="exclusionType" />
         <result column="remark" property="remark" />
     </resultMap>
 

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

@@ -0,0 +1,20 @@
+<?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.TranFieldInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.TranFieldInfo">
+        <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="uuid" property="uuid" />
+        <result column="icss_field" property="icssField" />
+        <result column="his_field" property="hisField" />
+        <result column="status" property="status" />
+        <result column="remark" property="remark" />
+    </resultMap>
+
+</mapper>