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

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

@@ -0,0 +1,68 @@
+package com.diagbot.dto;
+
+import java.util.Date;
+
+import com.diagbot.entity.DisclaimerInformation;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年11月21日 下午4:23:48
+ */
+@Setter
+@Getter
+public class DisclaimerInformationDTO {
+	private Long id;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 主表id
+     */
+    private Long versionId;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 描述
+     */
+    private String description;
+
+    /**
+     * 排序号
+     */
+    private String orderNo;
+
+    /**
+     * 1：启动，0：不启用
+     */
+    private String status;
+
+    /**
+     * 免责申明编号
+     */
+    private String disclaimerCode;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

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

@@ -3,6 +3,10 @@
  */
 package com.diagbot.dto;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -18,11 +22,15 @@ public class InquiryDetailDTO {
 	/**
      * 类型（1:主诉，2现病史，3其他史，4查体，5化验，6辅检，7诊断，8医嘱）
      */
+	@ApiModelProperty(value="类型（1:主诉，2现病史，3其他史，4查体，5化验，6辅检，7诊断，8医嘱）",required=true)
+	@NotNull(message="问诊明细-类型必传")
     private Integer type;
 
     /**
      * 内容字符串
      */
+    @ApiModelProperty(value="内容字符串",required=true)
+    @NotBlank(message="问诊明细-内容字符串必传")
     private String content;
 
 }

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

@@ -0,0 +1,19 @@
+package com.diagbot.dto;
+
+import com.diagbot.client.bean.FeatureRate;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2018/11/26 17:23
+ */
+@Getter
+@Setter
+public class PushKYJDTO {
+    private List<FeatureRate> dis;
+    private List<FeatureRate> labs;
+}

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

@@ -1,11 +1,16 @@
 package com.diagbot.dto;
 
-import com.diagbot.entity.QuestionUsual;
+import lombok.Getter;
+import lombok.Setter;
 
 /**
  * @Description:
  * @author: wangyu
  * @time: 2018/11/22 16:14
  */
-public class QuestionUsualDTO extends QuestionUsual {
+@Getter
+@Setter
+public class QuestionUsualDTO{
+
+    private String name;
 }

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

@@ -1,10 +1,17 @@
 package com.diagbot.dto;
 
+import lombok.Getter;
+import lombok.Setter;
+
 /**
  * @Description:
  * @author: rengb
  * @time: 2018/11/19 18:56
  */
+@Getter
+@Setter
 public class SaveInquiryDTO{
+	
+	private Long inquiryId;
 		
 }

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

@@ -0,0 +1,60 @@
+package com.diagbot.dto;
+
+import java.util.Date;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年11月21日 上午11:12:12
+ */
+@Getter
+@Setter
+public class VersionDetailDTO {
+	
+	private Long id;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+  
+    /**
+     * 版本主表id
+     */
+    private Long versionId;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 描述
+     */
+    private String description;
+
+    /**
+     * 排序号
+     */
+    private String orderNo;
+
+    /**
+     * 1：启动，0：不启用
+     */
+    private String status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+}

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

@@ -0,0 +1,48 @@
+package com.diagbot.dto;
+
+import java.util.Date;
+import java.util.List;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年11月21日 上午11:09:33
+ */
+@Getter
+@Setter
+public class VersionWrapperDTO {
+	
+	private Long id;
+	/**
+	 * 记录创建时间
+	 */
+	private Date gmtCreate;
+
+	/**
+	 * 创建人，0表示无创建人值
+	 */
+	private String creator;
+
+	/**
+	 * 名称
+	 */
+	private String name;
+
+	private Date refreshTime;
+
+	/**
+	 * 1：启动，0：不启用
+	 */
+	private String status;
+
+	private List<VersionDetailDTO> detail;
+	/**
+	 * 备注
+	 */
+	private String remark;
+
+}

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

@@ -0,0 +1,222 @@
+package com.diagbot.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+/**
+ * <p>
+ * 数据埋点统计表
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2018-11-20
+ */
+@TableName("icss_buried_some_statistical")
+public class BuriedSomeStatistical 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;
+
+    /**
+     * 医院id
+     */
+    private Long hospitalId;
+
+    /**
+     * 部门id
+     */
+    private Long hospitalDeptId;
+
+    /**
+     * 医生id
+     */
+    private Long doctorId;
+
+    /**
+     * 病人id
+     */
+    private Long patientId;
+
+    /**
+     * 就诊号
+     */
+    private String inquiryCode;
+
+    /**
+     * 标签ID
+     */
+    private Integer labelId;
+
+    /**
+     * 标签名
+     */
+    private String labelName;
+
+    /**
+     * 操作类型
+     */
+    private String operationType;
+
+    /**
+     * 操作次数
+     */
+    private Integer operationNum;
+
+    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 Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date 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 getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Long hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+    public Long getHospitalDeptId() {
+        return hospitalDeptId;
+    }
+
+    public void setHospitalDeptId(Long hospitalDeptId) {
+        this.hospitalDeptId = hospitalDeptId;
+    }
+    public Long getDoctorId() {
+        return doctorId;
+    }
+
+    public void setDoctorId(Long doctorId) {
+        this.doctorId = doctorId;
+    }
+    public Long getPatientId() {
+        return patientId;
+    }
+
+    public void setPatientId(Long patientId) {
+        this.patientId = patientId;
+    }
+    public String getInquiryCode() {
+        return inquiryCode;
+    }
+
+    public void setInquiryCode(String inquiryCode) {
+        this.inquiryCode = inquiryCode;
+    }
+    public Integer getLabelId() {
+        return labelId;
+    }
+
+    public void setLabelId(Integer labelId) {
+        this.labelId = labelId;
+    }
+    public String getLabelName() {
+        return labelName;
+    }
+
+    public void setLabelName(String labelName) {
+        this.labelName = labelName;
+    }
+    public String getOperationType() {
+        return operationType;
+    }
+
+    public void setOperationType(String operationType) {
+        this.operationType = operationType;
+    }
+    public Integer getOperationNum() {
+        return operationNum;
+    }
+
+    public void setOperationNum(Integer operationNum) {
+        this.operationNum = operationNum;
+    }
+
+    @Override
+    public String toString() {
+        return "BuriedSomeStatistical{" +
+        "id=" + id +
+        ", isDeleted=" + isDeleted +
+        ", gmtCreate=" + gmtCreate +
+        ", gmtModified=" + gmtModified +
+        ", creator=" + creator +
+        ", modifier=" + modifier +
+        ", hospitalId=" + hospitalId +
+        ", hospitalDeptId=" + hospitalDeptId +
+        ", doctorId=" + doctorId +
+        ", patientId=" + patientId +
+        ", inquiryCode=" + inquiryCode +
+        ", labelId=" + labelId +
+        ", labelName=" + labelName +
+        ", operationType=" + operationType +
+        ", operationNum=" + operationNum +
+        "}";
+    }
+}

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

@@ -0,0 +1,196 @@
+package com.diagbot.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+/**
+ * <p>
+ * 免责申明详情
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2018-11-20
+ */
+@TableName("icss_disclaimer_information")
+public class DisclaimerInformation 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;
+
+    /**
+     * 主表id
+     */
+    private Long versionId;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 描述
+     */
+    private String description;
+
+    /**
+     * 排序号
+     */
+    private String orderNo;
+
+    /**
+     * 1：启动，0：不启用
+     */
+    private String status;
+
+    /**
+     * 免责申明编号
+     */
+    private String disclaimerCode;
+
+    /**
+     * 备注
+     */
+    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 Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date 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 getVersionId() {
+        return versionId;
+    }
+
+    public void setVersionId(Long versionId) {
+        this.versionId = versionId;
+    }
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+    public String getDisclaimerCode() {
+        return disclaimerCode;
+    }
+
+    public void setDisclaimerCode(String disclaimerCode) {
+        this.disclaimerCode = disclaimerCode;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        return "DisclaimerInformation{" +
+        "id=" + id +
+        ", isDeleted=" + isDeleted +
+        ", gmtCreate=" + gmtCreate +
+        ", gmtModified=" + gmtModified +
+        ", creator=" + creator +
+        ", modifier=" + modifier +
+        ", versionId=" + versionId +
+        ", title=" + title +
+        ", description=" + description +
+        ", orderNo=" + orderNo +
+        ", status=" + status +
+        ", disclaimerCode=" + disclaimerCode +
+        ", remark=" + remark +
+        "}";
+    }
+}

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

@@ -0,0 +1,157 @@
+package com.diagbot.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+/**
+ * <p>
+ * 医生页面模板信息（文本和半结构）
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2018-11-20
+ */
+@TableName("icss_doctor_page_mode")
+public class DoctorPageMode 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;
+
+    /**
+     * 医生id
+     */
+    private Long doctorId;
+
+    /**
+     * 模式分类
+     */
+    private Integer modeClassify;
+
+    /**
+     * 模式值
+     */
+    private Integer modeValue;
+
+    /**
+     * 备注
+     */
+    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 Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date 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 getDoctorId() {
+        return doctorId;
+    }
+
+    public void setDoctorId(Long doctorId) {
+        this.doctorId = doctorId;
+    }
+    public Integer getModeClassify() {
+        return modeClassify;
+    }
+
+    public void setModeClassify(Integer modeClassify) {
+        this.modeClassify = modeClassify;
+    }
+    public Integer getModeValue() {
+        return modeValue;
+    }
+
+    public void setModeValue(Integer modeValue) {
+        this.modeValue = modeValue;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        return "DoctorPageMode{" +
+        "id=" + id +
+        ", isDeleted=" + isDeleted +
+        ", gmtCreate=" + gmtCreate +
+        ", gmtModified=" + gmtModified +
+        ", creator=" + creator +
+        ", modifier=" + modifier +
+        ", doctorId=" + doctorId +
+        ", modeClassify=" + modeClassify +
+        ", modeValue=" + modeValue +
+        ", remark=" + remark +
+        "}";
+    }
+}

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

@@ -0,0 +1,183 @@
+package com.diagbot.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+/**
+ * <p>
+ * 版本详情(关于)
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2018-11-20
+ */
+@TableName("icss_version_detail")
+public class VersionDetail 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;
+
+    /**
+     * 版本主表id
+     */
+    private Long versionId;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 描述
+     */
+    private String description;
+
+    /**
+     * 排序号
+     */
+    private String orderNo;
+
+    /**
+     * 1：启动，0：不启用
+     */
+    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 Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date 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 getVersionId() {
+        return versionId;
+    }
+
+    public void setVersionId(Long versionId) {
+        this.versionId = versionId;
+    }
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+    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 "VersionDetail{" +
+        "id=" + id +
+        ", isDeleted=" + isDeleted +
+        ", gmtCreate=" + gmtCreate +
+        ", gmtModified=" + gmtModified +
+        ", creator=" + creator +
+        ", modifier=" + modifier +
+        ", versionId=" + versionId +
+        ", title=" + title +
+        ", description=" + description +
+        ", orderNo=" + orderNo +
+        ", status=" + status +
+        ", remark=" + remark +
+        "}";
+    }
+}

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

@@ -0,0 +1,154 @@
+package com.diagbot.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+/**
+ * <p>
+ * 版本信息(关于)
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2018-11-20
+ */
+@TableName("icss_version_info")
+public class VersionInfo 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;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    private Date refreshTime;
+
+    /**
+     * 1：启动，0：不启用
+     */
+    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 Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date 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 Date getRefreshTime() {
+        return refreshTime;
+    }
+
+    public void setRefreshTime(Date refreshTime) {
+        this.refreshTime = refreshTime;
+    }
+    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 "VersionInfo{" +
+        "id=" + id +
+        ", isDeleted=" + isDeleted +
+        ", gmtCreate=" + gmtCreate +
+        ", gmtModified=" + gmtModified +
+        ", creator=" + creator +
+        ", modifier=" + modifier +
+        ", name=" + name +
+        ", refreshTime=" + refreshTime +
+        ", status=" + status +
+        ", remark=" + remark +
+        "}";
+    }
+}

icss-service/src/main/java/com/diagbot/enums/QualitativeTypeEnum.java

@@ -0,0 +1,49 @@
+package com.diagbot.enums;
+
+import com.diagbot.core.KeyedNamed;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2018/11/26 17:38
+ */
+public enum QualitativeTypeEnum implements KeyedNamed {
+    Negative(0, "阴性"),
+    Positive(1, "阳性");
+
+    @Setter
+    private Integer key;
+
+    @Setter
+    private String name;
+
+    QualitativeTypeEnum(Integer key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static QualitativeTypeEnum getEnum(Integer key) {
+        for (QualitativeTypeEnum item : QualitativeTypeEnum.values()) {
+            if (item.key == key) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(Integer key) {
+        QualitativeTypeEnum item = getEnum(key);
+        return item != null ? item.name : null;
+    }
+
+    @Override
+    public int getKey() {
+        return key;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+}

icss-service/src/main/java/com/diagbot/enums/QuantitativeTypeEnum.java

@@ -0,0 +1,51 @@
+package com.diagbot.enums;
+
+import com.diagbot.core.KeyedNamed;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2018/11/26 17:42
+ */
+public enum  QuantitativeTypeEnum implements KeyedNamed {
+    Normal(0, "正常"),
+    Up(1, "升高"),
+    Down(2, "降低");
+
+
+    @Setter
+    private Integer key;
+
+    @Setter
+    private String name;
+
+    QuantitativeTypeEnum(Integer key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static QuantitativeTypeEnum getEnum(Integer key) {
+        for (QuantitativeTypeEnum item : QuantitativeTypeEnum.values()) {
+            if (item.key == key) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(Integer key) {
+        QuantitativeTypeEnum item = getEnum(key);
+        return item != null ? item.name : null;
+    }
+
+    @Override
+    public int getKey() {
+        return key;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+}

icss-service/src/main/java/com/diagbot/enums/StatusEnum.java

@@ -0,0 +1,51 @@
+package com.diagbot.enums;
+
+import com.diagbot.core.KeyedNamed;
+
+import lombok.Setter;
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年11月21日 下午2:31:42
+ */
+public enum StatusEnum implements KeyedNamed {
+    Disable(0, "禁用"),
+    Enable(1, "启用");
+
+    @Setter
+    private Integer key;
+
+    @Setter
+    private String name;
+
+    StatusEnum(Integer key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static StatusEnum getEnum(Integer key) {
+        for (StatusEnum item : StatusEnum.values()) {
+            if (item.key == key) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(Integer key) {
+        StatusEnum item = getEnum(key);
+        return item != null ? item.name : null;
+    }
+
+    @Override
+    public int getKey() {
+        return key;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+}
+

icss-service/src/main/java/com/diagbot/facade/DoctorPageModeFacade.java

@@ -0,0 +1,69 @@
+package com.diagbot.facade;
+
+import javax.validation.Valid;
+
+import org.springframework.stereotype.Component;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.diagbot.entity.DoctorPageMode;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.service.impl.DoctorPageModeServiceImpl;
+import com.diagbot.util.DateUtil;
+import com.diagbot.vo.DoctorIdVO;
+import com.diagbot.vo.DoctorPageModeVO;
+/**
+ * 
+ * @author wangfeng
+ * @Description: 医生页面模式设置
+ * @date 2018年11月20日 下午2:56:01
+ */
+@Component
+public class DoctorPageModeFacade extends DoctorPageModeServiceImpl {
+
+	/**
+	 * 保存医生页面结构设置信息
+	 * @param doctorPageModeVO
+	 * @return
+	 */
+	public boolean saveDoctorPageMode(@Valid DoctorPageModeVO doctorPageModeVO) {
+		QueryWrapper<DoctorPageMode> doctorPageModeWrapper = new QueryWrapper<>();
+		doctorPageModeWrapper.eq("doctor_id", doctorPageModeVO.getDoctorId()).eq("is_deleted", IsDeleteEnum.N.getKey());
+		DoctorPageMode datas = getOne(doctorPageModeWrapper);
+		boolean res = false;
+		if (datas != null) {
+			UpdateWrapper<DoctorPageMode> doctorPageModeUpdate = new UpdateWrapper<>();
+			doctorPageModeUpdate.eq("doctor_id", doctorPageModeVO.getDoctorId())
+			               .eq("is_deleted", IsDeleteEnum.N.getKey())
+			               .set("mode_classify",doctorPageModeVO.getModeClassify())
+			               .set("mode_value",doctorPageModeVO.getModeValue() )
+			               .set("modifier",doctorPageModeVO.getDoctorId().toString() )
+			               .set("gmt_modified", DateUtil.now());
+			 res = update(new DoctorPageMode(), doctorPageModeUpdate);
+			//throw new CommonException(CommonErrorCode.NOT_EXISTS, "该模板名已存在");
+		}else {
+			DoctorPageMode doctorPageMode = new DoctorPageMode();
+			doctorPageMode.setDoctorId(doctorPageModeVO.getDoctorId());
+			doctorPageMode.setModeClassify(doctorPageModeVO.getModeClassify());
+			doctorPageMode.setModeValue(doctorPageModeVO.getModeValue());
+			doctorPageMode.setCreator(doctorPageModeVO.getDoctorId().toString());
+			doctorPageMode.setGmtCreate(DateUtil.now());
+			res = save(doctorPageMode);
+		}
+		
+		return res;
+	}
+
+	/**
+	 * 获取医生页面结构设置信息
+	 * @param doctorIdVO
+	 * @return
+	 */
+	public DoctorPageMode getDoctorPageMode(@Valid DoctorIdVO doctorIdVO) {
+		QueryWrapper<DoctorPageMode> doctorPageModeWrapper = new QueryWrapper<>();
+		doctorPageModeWrapper.eq("doctor_id", doctorIdVO.getDoctorId()).eq("is_deleted", IsDeleteEnum.N.getKey());
+		DoctorPageMode doctorPageModeData = getOne(doctorPageModeWrapper);
+		return doctorPageModeData;
+	}
+
+}

icss-service/src/main/java/com/diagbot/facade/InquiryInfoFacade.java

@@ -60,10 +60,10 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
 			this.save(inquiryInfoSave);
 			inquiryId = inquiryInfoSave.getId();
 		}else{
+			inquiryId = inquiryInfo.getId();
 			inquiryInfoSave.setId(inquiryId);
 			this.updateById(inquiryInfoSave);
 			
-			inquiryId = inquiryInfo.getId();
 			inquiryDetailFacade.removeByInquiryId(inquiryId);
 		}
 		
@@ -78,6 +78,7 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
 		}
 		inquiryDetailFacade.saveInquiryDetails(inquiryDetailList);
 		
+		saveInquiryDTO.setInquiryId(inquiryId);
 		return saveInquiryDTO;
 	}
 

icss-service/src/main/java/com/diagbot/facade/PushFacade.java

@@ -7,6 +7,7 @@ import com.diagbot.client.bean.Response;
 import com.diagbot.client.bean.ResponseData;
 import com.diagbot.client.bean.SearchData;
 import com.diagbot.dto.PushDTO;
+import com.diagbot.dto.PushKYJDTO;
 import com.diagbot.dto.QuestionDTO;
 import com.diagbot.entity.DeptInfo;
 import com.diagbot.entity.DeptVital;
@@ -17,6 +18,8 @@ import com.diagbot.enums.QuestionTypeEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.util.EntityUtil;
+import com.diagbot.vo.LisKYJVO;
+import com.diagbot.vo.PushKYJVO;
 import com.diagbot.vo.PushVO;
 import com.diagbot.vo.QuestionVO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -182,6 +185,36 @@ public class PushFacade {
         return pushDTO;
     }
 
+
+    /**
+     * 推理接口-快易检
+     * @param pushKYJVO
+     * @return
+     */
+    public PushKYJDTO pushKYJ(PushKYJVO pushKYJVO) {
+        PushVO pushVO = new PushVO();
+        pushVO.setAge(pushKYJVO.getAge());
+        pushVO.setSex(pushKYJVO.getSex());
+
+        //参数预处理
+        String lis="";
+        for(LisKYJVO lisKYJVO:pushKYJVO.getLisKYJVOList()){
+            String lisDetail="";
+            if(lisKYJVO.getValue()!=null){
+
+            }
+            if(lisKYJVO.getOtherValue()!=null){
+                
+            }
+        }
+
+        ResponseData responseData = pushAI(pushVO);
+        PushKYJDTO pushKYJDTO = new PushKYJDTO();
+        pushKYJDTO.setLabs(responseData.getLabs());
+        pushKYJDTO.setDis(responseData.getDis());
+        return pushKYJDTO;
+    }
+
     /**
      * 将list 转换成 map
      *

icss-service/src/main/java/com/diagbot/facade/VersionDetailFacaed.java

@@ -0,0 +1,60 @@
+package com.diagbot.facade;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.stereotype.Component;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.dto.VersionDetailDTO;
+import com.diagbot.entity.VersionDetail;
+import com.diagbot.entity.VersionInfo;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.enums.StatusEnum;
+import com.diagbot.service.impl.VersionDetailServiceImpl;
+import com.diagbot.service.impl.VersionInfoServiceImpl;
+
+/**
+ * 版本详情
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年11月21日 上午11:38:40
+ */
+@Component
+public class VersionDetailFacaed extends VersionDetailServiceImpl {
+
+	/**
+	 * 根据版本id查询版本详情
+	 * @param id
+	 * @return
+	 */
+	public List<VersionDetailDTO> getById(Long id) {
+		QueryWrapper<VersionDetail> versionDetailQuery = new QueryWrapper<>();
+
+		versionDetailQuery.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("STATUS", StatusEnum.Enable.getKey())
+				.eq("version_id", id).orderByAsc("order_no");
+
+		VersionDetail versionDetail = new VersionDetail();
+		versionDetail.setVersionId(id);
+		List<VersionDetail> datas = list(versionDetailQuery);
+		// System.out.println("List<VersionDetail>==="+datas.toString());
+		List<VersionDetailDTO> dataNew = new ArrayList<VersionDetailDTO>();
+		//过滤字段
+		for (VersionDetail versionData : datas) {
+			VersionDetailDTO versionDTO = new VersionDetailDTO();
+			versionDTO.setId(versionData.getId());
+			versionDTO.setCreator(versionData.getCreator());
+			versionDTO.setDescription(versionData.getDescription());
+			versionDTO.setGmtCreate(versionData.getGmtCreate());
+			versionDTO.setOrderNo(versionData.getOrderNo());
+			versionDTO.setRemark(versionData.getRemark());
+			versionDTO.setStatus(versionData.getStatus());
+			versionDTO.setTitle(versionData.getTitle());
+			versionDTO.setVersionId(versionData.getVersionId());
+			dataNew.add(versionDTO);
+		}
+		return dataNew;
+
+	}
+}

icss-service/src/main/java/com/diagbot/facade/VersionInfoFacade.java

@@ -0,0 +1,57 @@
+package com.diagbot.facade;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.dto.VersionDetailDTO;
+import com.diagbot.dto.VersionWrapperDTO;
+import com.diagbot.entity.VersionDetail;
+import com.diagbot.entity.VersionInfo;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.enums.StatusEnum;
+import com.diagbot.service.impl.VersionInfoServiceImpl;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: 版本信息
+ * @date 2018年11月21日 上午11:07:01
+ */
+@Component
+public class VersionInfoFacade  extends VersionInfoServiceImpl{
+	
+	@Autowired
+	VersionDetailFacaed versionDetailFacaed;
+
+	/**
+	 * 查询版本信息
+	 * @return
+	 */
+	public VersionWrapperDTO getVersionInfoAll() {
+		//查询最新的一条版本信息
+		QueryWrapper<VersionInfo> versionInfoQuery = new QueryWrapper<>();
+		versionInfoQuery.eq("is_deleted", IsDeleteEnum.N.getKey())
+		                .eq("STATUS",StatusEnum.Enable.getKey())
+		                .orderByDesc("refresh_time");
+		
+		VersionInfo versionInfo = getOne(versionInfoQuery);
+		VersionWrapperDTO versionList= new  VersionWrapperDTO();
+		
+		if(versionInfo!=null){
+			//当查出的数据不为空时，取到版本id，再去版本明细表中查询详细的信息
+			long id = versionInfo.getId();
+			List<VersionDetailDTO> detail = versionDetailFacaed.getById(id);
+			//System.out.println(detail.toString());
+		    versionList.setId(versionInfo.getId());
+		    versionList.setName(versionInfo.getName());
+		    versionList.setRefreshTime(versionInfo.getRefreshTime());
+		    versionList.setStatus(versionInfo.getStatus());
+		    versionList.setDetail(detail);	
+		}
+		
+		return versionList;
+	}
+}

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

@@ -0,0 +1,21 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.BuriedSomeStatistical;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 数据埋点统计表 Mapper 接口
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2018-11-20
+ */
+public interface BuriedSomeStatisticalMapper extends BaseMapper<BuriedSomeStatistical> {
+	
+	public boolean insertCodeBatch(List<BuriedSomeStatistical> reddemCode );
+
+}

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

@@ -0,0 +1,22 @@
+package com.diagbot.mapper;
+
+import com.diagbot.dto.DisclaimerInformationDTO;
+import com.diagbot.entity.DisclaimerInformation;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 免责申明详情 Mapper 接口
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2018-11-20
+ */
+public interface DisclaimerInformationMapper extends BaseMapper<DisclaimerInformation> {
+	
+	public List<DisclaimerInformationDTO> getDisclaimerInformationAll();
+
+}

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

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.DoctorPageMode;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 医生页面模板信息（文本和半结构） Mapper 接口
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2018-11-20
+ */
+public interface DoctorPageModeMapper extends BaseMapper<DoctorPageMode> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.VersionDetail;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 版本详情(关于) Mapper 接口
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2018-11-20
+ */
+public interface VersionDetailMapper extends BaseMapper<VersionDetail> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.VersionInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 版本信息(关于) Mapper 接口
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2018-11-20
+ */
+public interface VersionInfoMapper extends BaseMapper<VersionInfo> {
+
+}

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

@@ -0,0 +1,21 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.BuriedSomeStatistical;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 数据埋点统计表 服务类
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2018-11-20
+ */
+public interface BuriedSomeStatisticalService extends IService<BuriedSomeStatistical> {
+	
+	public boolean insertCodeBatch(List<BuriedSomeStatistical> reddemCode );
+
+}

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

@@ -0,0 +1,23 @@
+package com.diagbot.service;
+
+import com.diagbot.dto.DisclaimerInformationDTO;
+import com.diagbot.entity.DisclaimerInformation;
+import com.diagbot.mapper.DisclaimerInformationMapper;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 免责申明详情 服务类
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2018-11-20
+ */
+public interface DisclaimerInformationService extends IService<DisclaimerInformation> {
+	
+	public List<DisclaimerInformationDTO> getDisclaimerInformationAll();
+
+}

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

@@ -0,0 +1,16 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.DoctorPageMode;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 医生页面模板信息（文本和半结构） 服务类
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2018-11-20
+ */
+public interface DoctorPageModeService extends IService<DoctorPageMode> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.VersionDetail;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 版本详情(关于) 服务类
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2018-11-20
+ */
+public interface VersionDetailService extends IService<VersionDetail> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.VersionInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 版本信息(关于) 服务类
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2018-11-20
+ */
+public interface VersionInfoService extends IService<VersionInfo> {
+
+}

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

@@ -0,0 +1,29 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.entity.BuriedSomeStatistical;
+import com.diagbot.mapper.BuriedSomeStatisticalMapper;
+import com.diagbot.service.BuriedSomeStatisticalService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 数据埋点统计表 服务实现类
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2018-11-20
+ */
+@Service
+public class BuriedSomeStatisticalServiceImpl extends ServiceImpl<BuriedSomeStatisticalMapper, BuriedSomeStatistical> implements BuriedSomeStatisticalService {
+
+	@Override
+	public boolean insertCodeBatch(List<BuriedSomeStatistical> reddemCode) {
+		// TODO Auto-generated method stub
+		return baseMapper.insertCodeBatch(reddemCode);
+	}
+
+}

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

@@ -0,0 +1,31 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.dto.DisclaimerInformationDTO;
+import com.diagbot.entity.DisclaimerInformation;
+import com.diagbot.mapper.DisclaimerInformationMapper;
+import com.diagbot.service.DisclaimerInformationService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 免责申明详情 服务实现类
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2018-11-20
+ */
+@Service
+public class DisclaimerInformationServiceImpl extends ServiceImpl<DisclaimerInformationMapper, DisclaimerInformation> implements DisclaimerInformationService {
+
+	
+	@Override
+	public List<DisclaimerInformationDTO> getDisclaimerInformationAll() {
+		 
+		return baseMapper.getDisclaimerInformationAll();
+	}
+
+}

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

@@ -0,0 +1,20 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.entity.DoctorPageMode;
+import com.diagbot.mapper.DoctorPageModeMapper;
+import com.diagbot.service.DoctorPageModeService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 医生页面模板信息（文本和半结构） 服务实现类
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2018-11-20
+ */
+@Service
+public class DoctorPageModeServiceImpl extends ServiceImpl<DoctorPageModeMapper, DoctorPageMode> implements DoctorPageModeService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.entity.VersionDetail;
+import com.diagbot.mapper.VersionDetailMapper;
+import com.diagbot.service.VersionDetailService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 版本详情(关于) 服务实现类
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2018-11-20
+ */
+@Service
+public class VersionDetailServiceImpl extends ServiceImpl<VersionDetailMapper, VersionDetail> implements VersionDetailService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.entity.VersionInfo;
+import com.diagbot.mapper.VersionInfoMapper;
+import com.diagbot.service.VersionInfoService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 版本信息(关于) 服务实现类
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2018-11-20
+ */
+@Service
+public class VersionInfoServiceImpl extends ServiceImpl<VersionInfoMapper, VersionInfo> implements VersionInfoService {
+
+}

icss-service/src/main/java/com/diagbot/vo/BuriedSomeStatisticalVO.java

@@ -0,0 +1,52 @@
+package com.diagbot.vo;
+
+import java.util.List;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年11月23日 上午10:03:11
+ */
+@Getter
+@Setter
+public class BuriedSomeStatisticalVO {
+	 /**
+     * 医院id
+     */
+	@NotNull(message = "请输入医院id")
+    private Long hospitalId;
+
+    /**
+     * 部门id
+     */
+	@NotNull(message = "请输入部门id")
+    private Long hospitalDeptId;
+
+    /**
+     * 医生id
+     */
+	@NotNull(message = "请输入医生id")
+    private Long doctorId;
+
+    /**
+     * 病人id
+     */
+	@NotNull(message = "请输入病人id")
+    private Long patientId;
+
+    /**
+     * 就诊号
+     */
+	@NotBlank(message = "请输入就诊号")
+    private String inquiryCode;
+
+	private List<Taggeds> taggeds;
+	
+}

icss-service/src/main/java/com/diagbot/vo/DoctorIdVO.java

@@ -0,0 +1,23 @@
+package com.diagbot.vo;
+
+import javax.validation.constraints.NotNull;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年11月20日 下午3:41:15
+ */
+@Getter
+@Setter
+public class DoctorIdVO {
+
+	/**
+     * 医生id
+     */
+	@NotNull(message = "请输入医生id")
+    private Long doctorId;
+}

icss-service/src/main/java/com/diagbot/vo/DoctorPageModeVO.java

@@ -0,0 +1,33 @@
+package com.diagbot.vo;
+
+import javax.validation.constraints.NotNull;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年11月20日 下午3:15:26
+ */
+@Setter
+@Getter
+public class DoctorPageModeVO {
+	/**
+     * 医生id
+     */
+	@NotNull(message = "请输入医生id")
+    private Long doctorId;
+    /**
+     * 模式分类
+     */
+    private Integer modeClassify;
+
+    /**
+     * 模式值
+     */
+    private Integer modeValue;
+
+
+}

icss-service/src/main/java/com/diagbot/vo/LisExcelWrapperVO.java

@@ -0,0 +1,29 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年11月26日 下午1:20:24
+ */
+@Setter
+@Getter
+public class LisExcelWrapperVO {
+
+private String mealName;
+	
+	private String itemName;
+	
+	private String unit;
+	
+	private String value;
+
+	@Override
+	public String toString() {
+		return "LisExcelWrapper [mealName=" + mealName + ", itemName=" + itemName + ", unit=" + unit + ", value="
+				+ value + "]";
+	}
+}

icss-service/src/main/java/com/diagbot/vo/LisKYJVO.java

@@ -0,0 +1,23 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2018/11/26 17:04
+ */
+@Getter
+@Setter
+public class LisKYJVO {
+    private String name ;//名称
+    private Double value;//值
+    private Double max;//最大值
+    private Double min;//最小值
+    private String units;//单位
+    private Integer  multipleState;//状态 0 1 2
+    private String  multipleValue;//状态值
+    private Integer  negativeState;//状态 (阴形,阳性)
+    private String otherValue;//
+}

icss-service/src/main/java/com/diagbot/vo/PushKYJVO.java

@@ -0,0 +1,22 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2018/11/26 17:05
+ */
+@Getter
+@Setter
+public class PushKYJVO {
+    @NotNull(message = "请输入年龄")
+    private Integer age;
+    @NotNull(message = "请输入性别")
+    private Integer sex;
+    private List<LisKYJVO> lisKYJVOList;
+}

icss-service/src/main/java/com/diagbot/vo/SaveInquiryVO.java

@@ -5,9 +5,11 @@ import java.util.List;
 import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 
 import com.diagbot.dto.InquiryDetailDTO;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -23,62 +25,73 @@ public class SaveInquiryVO {
 	/**
      * 医院id
      */
-	@NotBlank(message="医院id必传")
+	@ApiModelProperty(value="医院id",required=true)
+	@NotNull(message="医院id必传")
     private Long hospitalId;
 
     /**
      * 科室id
      */
-	@NotBlank(message="科室id必传")
+	@ApiModelProperty(value="科室id",required=true)
+	@NotNull(message="科室id必传")
     private Long hospitalDeptId;
 
     /**
      * 医生id
      */
-	@NotBlank(message="医生id必传")
+	@ApiModelProperty(value="医生id",required=true)
+	@NotNull(message="医生id必传")
     private Long doctorId;
 
     /**
      * 患者id
      */
-	@NotBlank(message="患者id必传")
+	@ApiModelProperty(value="患者id",required=true)
+	@NotNull(message="患者id必传")
     private Long patientId;
 
     /**
      * 就诊序列号
      */
+	@ApiModelProperty(value="就诊序列号",required=true)
 	@NotBlank(message="就诊序列号必传")
     private String inquiryCode;
 
     /**
-     * 就诊状态（0待接诊，1接诊中，2完成接诊）
+     * 就诊状态(0待接诊，1接诊中，2完成接诊)
      */
+	@ApiModelProperty(value="就诊状态(0待接诊，1接诊中，2完成接诊)")
     private Integer regVisitedState=1;
 
     /**
      * 分类(1:门诊,2:住院)
      */
+	@ApiModelProperty(value="分类(1:门诊,2:住院)")
     private Integer type=1;
 
     /**
      * 诊断
      */
+	@ApiModelProperty(value="诊断",required=true)
     @NotBlank(message="诊断必传")
     private String diagnose;
 
     /**
      * 类型：1：结构化 2：文本模式
      */
+	@ApiModelProperty(value="类型：1：结构化 2：文本模式")
     private Integer sign=1;
 
     /**
      * 内容JSON字符串
      */
+	@ApiModelProperty(value="内容JSON字符串",required=true)
     @NotBlank(message="内容JSON字符串必传")
     private String dataJson;
     
     @Valid
-    @NotEmpty
+    @ApiModelProperty(value="问诊明细",required=true)
+    @NotEmpty(message="问诊明细不能为空")
     private List<InquiryDetailDTO> detailList;
    
 }

icss-service/src/main/java/com/diagbot/vo/Taggeds.java

@@ -0,0 +1,40 @@
+package com.diagbot.vo;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2018年11月23日 上午10:35:30
+ */
+@Getter
+@Setter
+public class Taggeds {
+
+	/**
+     * 标签ID
+     */
+	@NotNull(message = "请输入标签ID")
+    private Integer labelId;
+
+    /**
+     * 标签名
+     */
+    private String labelName;
+
+    /**
+     * 操作类型
+     */
+    @NotBlank(message = "请输入操作类型")
+    private String operationType;
+
+    /**
+     * 操作次数
+     */
+    private Integer operationNum;
+}

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

@@ -0,0 +1,69 @@
+package com.diagbot.web;
+
+
+import java.util.List;
+
+import javax.validation.Valid;
+
+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 com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.DoctorPageMode;
+import com.diagbot.facade.DoctorPageModeFacade;
+import com.diagbot.vo.DoctorIdVO;
+import com.diagbot.vo.DoctorPageModeVO;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2018-11-20
+ */
+/**
+ * 
+ * @author wangfeng
+ * @Description: 医生页面结构设置（文本和半结构） 前端控制器
+ * @date 2018年11月20日 下午2:50:40
+ */
+@RestController
+@RequestMapping("/doctorPageMode")
+@Api(value = "医生页面结构设置API[by:wangfeng]", tags = { "WF——医生页面结构设置API" })
+@SuppressWarnings("unchecked")
+public class DoctorPageModeController {
+	
+	@Autowired
+	DoctorPageModeFacade doctorPageModeFacade;
+	
+	@ApiOperation(value = "保存医生页面结构设置信息[by:wangfeng]",notes = "医生id : doctorId;</br>模式分类: modeClassify;</br> 模式值: modeValue;")
+    @PostMapping("/saveDoctorPageModes")
+    @SysLogger("saveDoctorPageModes")
+    @Transactional
+    public RespDTO<Boolean> saveDoctorPageModes(@Valid @RequestBody DoctorPageModeVO doctorPageModeVO) {
+
+        boolean res = doctorPageModeFacade.saveDoctorPageMode(doctorPageModeVO);
+        
+        return RespDTO.onSuc(res);
+    }
+
+	@ApiOperation(value = "获取医生页面结构设置信息[by:wangfeng]",notes = "获取医生页面结构设置信息")
+    @PostMapping("/getDoctorPageModes")
+    @SysLogger("getDoctorPageModes")
+    @Transactional
+    public RespDTO<DoctorPageMode> getDoctorPageModes(@Valid @RequestBody DoctorIdVO doctorIdVO) {
+
+		DoctorPageMode doctorPageModeData = doctorPageModeFacade.getDoctorPageMode(doctorIdVO);
+        
+        return RespDTO.onSuc(doctorPageModeData);
+    }
+}

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

@@ -30,15 +30,15 @@ import io.swagger.annotations.ApiOperation;
 public class InquiryInfoController {
 	
 	@Autowired
-    private InquiryInfoFacade inquiryInfoFacade;
+	private InquiryInfoFacade inquiryInfoFacade;
 	
-	 @ApiOperation(value = "问诊记录保存[by:rengb]")
-	 @PostMapping("/getTopPatientInfo")
-	 @SysLogger("getTopPatientInfo")
-	 @Transactional
-	 public RespDTO<SaveInquiryDTO> saveInquiry(@Valid @RequestBody SaveInquiryVO saveInquiryVO) {
-		 return RespDTO.onSuc(inquiryInfoFacade.saveInquiry(saveInquiryVO));
-	 }
+	@ApiOperation(value = "问诊记录保存[by:rengb]")
+	@PostMapping("/saveInquiry")
+	@SysLogger("saveInquiry")
+	@Transactional
+	public RespDTO<SaveInquiryDTO> saveInquiry(@Valid @RequestBody SaveInquiryVO saveInquiryVO) {
+		return RespDTO.onSuc(inquiryInfoFacade.saveInquiry(saveInquiryVO));
+	}
 	
 	
 

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

@@ -28,14 +28,14 @@ import io.swagger.annotations.ApiOperation;
  */
 @RestController
 @RequestMapping("/printRecord")
-@Api(value = "打印记录API[by:wangfeng]", tags = { "打印记录API" })
+@Api(value = "打印记录API[by:wangfeng]", tags = { "WF——打印记录API" })
 @SuppressWarnings("unchecked")
 public class PrintRecordController {
 
 	@Autowired
 	PrintRecordFacade printRecordFacade;
 
-	@ApiOperation(value = "保存打印记录", notes = "疾病名称 :name</br>医生id:doctorId</br>医院编码 : hospitalId</br>"
+	@ApiOperation(value = "保存打印记录[by:wangfeng]", notes = "疾病名称 :name</br>医生id:doctorId</br>医院编码 : hospitalId</br>"
 			+ "患者id:patientId</br>"
 			+ "医院部门id:hospitalDeptId</br> 问诊号:inquiryCode</br>文本内容 :content </br>{chief;//主诉present;//现病史other;//其他史vital;//查体lis;//化验pacs;//辅检diag;//诊断advice;//医嘱}</br>dataJson:内容JSON字符串(打印页面展示)")
 	@PostMapping("/savePrintRecords")

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

@@ -3,8 +3,10 @@ package com.diagbot.web;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.client.bean.ResponseData;
 import com.diagbot.dto.PushDTO;
+import com.diagbot.dto.PushKYJDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.PushFacade;
+import com.diagbot.vo.PushKYJVO;
 import com.diagbot.vo.PushVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -42,9 +44,19 @@ public class PushController {
     @ApiOperation(value = "推理接口(直接返回大数据推理结果）[by:zhaops]",
             notes = "age： 年龄(必填)<br>" +
                     "sex：性别，1：男，2：女(必填)<br>")
-    @PostMapping("/push_ai")
-    @SysLogger("push_ai")
+    @PostMapping("/pushAI")
+    @SysLogger("pushAI")
     public RespDTO<ResponseData> pushAI(@RequestBody @Valid PushVO pushVO) {
         return RespDTO.onSuc(pushFacade.pushAI(pushVO));
     }
-}
+
+    @ApiOperation(value = "推理接口(快易检）[by:zhaops]",
+            notes = "age： 年龄(必填)<br>" +
+                    "sex：性别，1：男，2：女(必填)<br>" +
+                    "lisKYJVOList：化验项列表(必填)<br>")
+    @PostMapping("/pushKYJ")
+    @SysLogger("pushKYJ")
+    public RespDTO<PushKYJDTO> pushKYJ(@RequestBody @Valid PushKYJVO pushKYJVO) {
+        return RespDTO.onSuc(pushFacade.pushKYJ(pushKYJVO));
+    }
+}

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

@@ -33,7 +33,7 @@ import io.swagger.annotations.ApiOperation;
  */
 @RestController
 @RequestMapping("/templateInfo")
-@Api(value = "病历模板API[by:wangfeng]", tags = { "病历模板API" })
+@Api(value = "病历模板API[by:wangfeng]", tags = { "WF——病历模板API" })
 @SuppressWarnings("unchecked")
 public class TemplateInfoController {
 	

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

@@ -0,0 +1,19 @@
+package com.diagbot.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 版本详情(关于) 前端控制器
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2018-11-20
+ */
+@RestController
+@RequestMapping("/versionDetail")
+public class VersionDetailController {
+
+}

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

@@ -0,0 +1,53 @@
+package com.diagbot.web;
+
+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 com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.dto.VersionWrapperDTO;
+import com.diagbot.facade.VersionInfoFacade;
+import com.diagbot.vo.TemplateInfoRevampVO;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+
+import javax.validation.Valid;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * <p>
+ * 版本信息(关于) 前端控制器
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2018-11-20
+ */
+@RestController
+@RequestMapping("/versionInfo")
+@Api(value = "WF——版本信息(关于)API[by:wangfeng]", tags = { "版本信息(关于)API" })
+@SuppressWarnings("unchecked")
+public class VersionInfoController {
+
+	@Autowired
+	VersionInfoFacade versionInfoFacade;
+
+	@ApiOperation(value = "获取版本信息[by:wangfeng]", notes = "获取版本信息")
+	@PostMapping("/getVersionInfoAlls")
+	@SysLogger("getVersionInfoAlls")
+	@Transactional
+	public RespDTO<VersionWrapperDTO> getVersionInfoAlls() {
+
+		VersionWrapperDTO data = versionInfoFacade.getVersionInfoAll();
+
+		return RespDTO.onSuc(data);
+	}
+
+}

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

@@ -0,0 +1,45 @@
+<?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.BuriedSomeStatisticalMapper">
+
+	<!-- 通用查询映射结果 -->
+	<resultMap id="BaseResultMap" type="com.diagbot.entity.BuriedSomeStatistical">
+		<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="hospital_id" property="hospitalId" />
+		<result column="hospital_dept_id" property="hospitalDeptId" />
+		<result column="doctor_id" property="doctorId" />
+		<result column="patient_id" property="patientId" />
+		<result column="inquiry_code" property="inquiryCode" />
+		<result column="label_id" property="labelId" />
+		<result column="label_name" property="labelName" />
+		<result column="operation_type" property="operationType" />
+		<result column="operation_num" property="operationNum" />
+	</resultMap>
+	<insert id="insertCodeBatch" parameterType="java.util.List">
+		insert into icss_buried_some_statistical
+		(gmt_create , creator , hospital_id ,
+		hospital_dept_id , doctor_id , patient_id , inquiry_code ,
+		label_id , label_name , operation_type , operation_num )
+		values
+		<foreach collection="list" item="reddemCode" index="index"
+			separator=",">
+			(
+			#{reddemCode.gmtCreate}, #{reddemCode.creator},
+			#{reddemCode.hospitalId},
+			#{reddemCode.hospitalDeptId},
+			#{reddemCode.doctorId},
+			#{reddemCode.patientId},
+			#{reddemCode.inquiryCode},
+			#{reddemCode.labelId},
+			#{reddemCode.labelName},
+			#{reddemCode.operationType},
+			#{reddemCode.operationNum}
+			)
+		</foreach>
+	</insert>
+</mapper>

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

@@ -0,0 +1,39 @@
+<?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.DisclaimerInformationMapper">
+
+	<!-- 通用查询映射结果 -->
+	<resultMap id="BaseResultMap" type="com.diagbot.entity.DisclaimerInformation">
+		<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="version_id" property="versionId" />
+		<result column="title" property="title" />
+		<result column="description" property="description" />
+		<result column="order_no" property="orderNo" />
+		<result column="status" property="status" />
+		<result column="disclaimer_code" property="disclaimerCode" />
+		<result column="remark" property="remark" />
+	</resultMap>
+	<select id="getDisclaimerInformationAll" resultType="com.diagbot.dto.DisclaimerInformationDTO">
+		SELECT
+		id as id,
+		gmt_create as gmtCreate,
+		creator as creator,
+		version_id as versionId,
+		title as title,
+		description as description,
+		order_no as orderNo,
+		status as status,
+		disclaimer_code as disclaimerCode,
+		remark as remark
+		FROM icss_disclaimer_information
+		WHERE is_deleted = "N"
+		and STATUS = '1'
+		AND version_id =0
+		ORDER BY order_no
+	</select>
+</mapper>

icss-service/src/main/resources/mapper/DoctorPageModeMapper.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.DoctorPageModeMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.DoctorPageMode">
+        <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="doctor_id" property="doctorId" />
+        <result column="mode_classify" property="modeClassify" />
+        <result column="mode_value" property="modeValue" />
+        <result column="remark" property="remark" />
+    </resultMap>
+
+</mapper>

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

@@ -0,0 +1,21 @@
+<?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.VersionDetailMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.VersionDetail">
+        <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="version_id" property="versionId" />
+        <result column="title" property="title" />
+        <result column="description" property="description" />
+        <result column="order_no" property="orderNo" />
+        <result column="status" property="status" />
+        <result column="remark" property="remark" />
+    </resultMap>
+
+</mapper>

icss-service/src/main/resources/mapper/VersionInfoMapper.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.VersionInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.VersionInfo">
+        <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="refresh_time" property="refreshTime" />
+        <result column="status" property="status" />
+        <result column="remark" property="remark" />
+    </resultMap>
+
+</mapper>

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

@@ -136,11 +136,6 @@ public class QuestionInfo implements Serializable {
      */
     private Integer showAdd;
 
-    /**
-     * 提示语
-     */
-    private String placeholder;
-
     /**
      * 备注
      */
@@ -307,13 +302,6 @@ public class QuestionInfo implements Serializable {
     public void setShowAdd(Integer showAdd) {
         this.showAdd = showAdd;
     }
-    public String getPlaceholder() {
-        return placeholder;
-    }
-
-    public void setPlaceholder(String placeholder) {
-        this.placeholder = placeholder;
-    }
     public String getRemark() {
         return remark;
     }
@@ -348,7 +336,6 @@ public class QuestionInfo implements Serializable {
         ", textGenerate=" + textGenerate +
         ", copyType=" + copyType +
         ", showAdd=" + showAdd +
-        ", placeholder=" + placeholder +
         ", remark=" + remark +
         "}";
     }

icssman-service/src/main/java/com/diagbot/facade/DeptVitalFacade.java

@@ -7,8 +7,10 @@ import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.QuestionTypeEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
+import com.diagbot.service.DeptVitalService;
 import com.diagbot.service.impl.DeptVitalServiceImpl;
 import com.diagbot.util.EntityUtil;
+import com.diagbot.util.UserUtils;
 import com.diagbot.vo.DeptVitalVO;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,10 +26,12 @@ import java.util.Map;
  * @time: 2018/11/22 11:45
  */
 @Component
-public class DeptVitalFacade extends DeptVitalServiceImpl {
+public class DeptVitalFacade extends DeptVitalServiceImpl implements DeptVitalService {
 
     @Autowired
     private QuestionInfoFacade questionInfoFacade;
+    @Autowired
+    private DeptVitalServiceImpl deptVitalServiceImpl;
 
     /**
      * 保存查体模板
@@ -61,9 +65,12 @@ public class DeptVitalFacade extends DeptVitalServiceImpl {
             DeptVital deptVital = new DeptVital();
             deptVital.setDeptId(deptVitalVO.getDeptId());
             deptVital.setVitalId(vital);
+            deptVital.setCreator(UserUtils.getCurrentPrincipleID());
             deptVital.setGmtCreate(new Date());
+            deptVitalList.add(deptVital);
         }
-        this.saveBatch(deptVitalList);
+
+        deptVitalServiceImpl.saveBatch(deptVitalList);
         return true;
     }
 }

icssman-service/src/main/java/com/diagbot/facade/IntroduceInfoFacade.java

@@ -1,20 +1,22 @@
 package com.diagbot.facade;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.entity.IntroduceDetail;
 import com.diagbot.entity.IntroduceInfo;
-import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.service.impl.IntroduceDetailServiceImpl;
 import com.diagbot.service.impl.IntroduceInfoServiceImpl;
 import com.diagbot.util.UserUtils;
+import com.diagbot.vo.IntroduceDetailVO;
 import com.diagbot.vo.IntroducePageVO;
 import com.diagbot.vo.IntroduceVO;
+import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.Arrays;
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -28,6 +30,8 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
     IntroduceMapFacade introduceMapFacade;
     @Autowired
     IntroduceDetailFacade introduceDetailFacade;
+    @Autowired
+    IntroduceDetailServiceImpl introduceDetailServiceImpl;
 
     /**
      * 保存提示信息（新增or修改）
@@ -39,15 +43,18 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
         IntroduceInfo introduceInfo = new IntroduceInfo();
         if (!(introduceVO.getId() == null)) {
             introduceInfo = this.getById(introduceVO.getId());
-            introduceInfo.setModifier(UserUtils.getCurrentPrincipleID());
+            //introduceInfo.setModifier(UserUtils.getCurrentPrincipleID());
             introduceInfo.setGmtModified(new Date());
         } else {
-            introduceInfo.setCreator(UserUtils.getCurrentPrincipleID());
+            //introduceInfo.setCreator(UserUtils.getCurrentPrincipleID());
             introduceInfo.setGmtCreate(new Date());
         }
         introduceInfo.setName(introduceVO.getName());
         introduceInfo.setRemark(introduceVO.getRemark());
 
+        //更新提示信息
+        this.saveOrUpdate(introduceInfo);
+
         //明细信息不更新，每次都删除重新插入
         //删除已有明细，物理删除
         if (!(introduceInfo.getId() == null)) {
@@ -55,15 +62,21 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
             detailQueryWrapper.eq("introduce_id", introduceInfo.getId());
             introduceDetailFacade.remove(detailQueryWrapper);
         }
-        //新增明细，清空id
-        for (IntroduceDetail detail : introduceVO.getDetailList()) {
-            detail.setId(null);
+        List<IntroduceDetail> introduceDetailList = Lists.newArrayList();
+        for (IntroduceDetailVO detailVO : introduceVO.getDetailVOList()) {
+            IntroduceDetail detail = new IntroduceDetail();
+            detail.setIntroduceId(introduceInfo.getId());
+            //detail.setCreator(UserUtils.getCurrentPrincipleID());
+            detail.setGmtCreate(new Date());
+            detail.setContent(detailVO.getContent());
+            detail.setText(detailVO.getText());
+            detail.setTitle(detailVO.getTitle());
+            detail.setOrderNo(detailVO.getOrderNo());
+            detail.setPosition(detailVO.getPosition());
+            introduceDetailList.add(detail);
         }
         //插入新的明细记录
-        introduceDetailFacade.saveOrUpdateBatch(introduceVO.getDetailList());
-
-        //更新提示信息
-        this.saveOrUpdate(introduceInfo);
+        introduceDetailServiceImpl.saveOrUpdateBatch(introduceDetailList);
         return true;
     }
 
@@ -111,4 +124,4 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
         IPage<IntroduceInfo> introduceInfoIPage = this.page(introducePageVO, introduceInfoQueryWrapper);
         return introduceInfoIPage;
     }
-}
+}

icssman-service/src/main/java/com/diagbot/facade/VitalOrderFacade.java

@@ -1,8 +1,17 @@
 package com.diagbot.facade;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.entity.VitalOrder;
 import com.diagbot.service.impl.VitalOrderServiceImpl;
+import com.diagbot.util.UserUtils;
+import com.diagbot.vo.VitalOrderVO;
+import com.google.common.collect.Lists;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * @Description:
  * @Author:zhaops
@@ -10,4 +19,25 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class VitalOrderFacade extends VitalOrderServiceImpl {
+
+    @Autowired
+    VitalOrderServiceImpl vitalOrderServiceImpl;
+
+    public Boolean saveVitalOrders(List<VitalOrderVO> vitalOrderVOList) {
+        //先删除现有排序
+        QueryWrapper<VitalOrder> vitalOrderQueryWrapper = new QueryWrapper<>();
+        vitalOrderQueryWrapper.eq("1", "1");
+        //插入新排序
+        List<VitalOrder> vitalOrderList = Lists.newArrayList();
+        for (VitalOrderVO vitalOrderVO : vitalOrderVOList) {
+            VitalOrder vitalOrder = new VitalOrder();
+            vitalOrder.setQuestionId(vitalOrderVO.getVitalId());
+            vitalOrder.setOrderNo(vitalOrderVO.getOrderNo());
+            vitalOrder.setCreator(UserUtils.getCurrentPrincipleID());
+            vitalOrder.setGmtCreate(new Date());
+            vitalOrderList.add(vitalOrder);
+        }
+        vitalOrderServiceImpl.saveBatch(vitalOrderList);
+        return true;
+    }
 }

icssman-service/src/main/java/com/diagbot/service/DeptVitalService.java

@@ -3,6 +3,8 @@ package com.diagbot.service;
 import com.diagbot.entity.DeptVital;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 科室查体对应表 服务类
@@ -12,5 +14,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2018-11-22
  */
 public interface DeptVitalService extends IService<DeptVital> {
-
+    Boolean saveRecords(List<DeptVital> deptVitalList);
 }

icssman-service/src/main/java/com/diagbot/service/impl/DeptVitalServiceImpl.java

@@ -6,6 +6,8 @@ import com.diagbot.service.DeptVitalService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 科室查体对应表 服务实现类
@@ -17,4 +19,9 @@ import org.springframework.stereotype.Service;
 @Service
 public class DeptVitalServiceImpl extends ServiceImpl<DeptVitalMapper, DeptVital> implements DeptVitalService {
 
+    public Boolean saveRecords(List<DeptVital> deptVitalList){
+        super.saveBatch(deptVitalList);
+        return true;
+    }
+
 }

icssman-service/src/main/java/com/diagbot/vo/IntroduceDetailVO.java

@@ -0,0 +1,34 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2018/11/26 16:47
+ */
+@Getter
+@Setter
+public class IntroduceDetailVO {
+    /**
+     * 提示信息
+     */
+    private String content;
+    /**
+     * 提示信息-纯文本
+     */
+    private String text;
+    /**
+     * 标题
+     */
+    private String title;
+    /**
+     * 排序号
+     */
+    private Integer orderNo;
+    /**
+     * 显示位置：1-右侧显示，0-都显示
+     */
+    private Integer position;
+}

icssman-service/src/main/java/com/diagbot/vo/IntroduceVO.java

@@ -19,5 +19,5 @@ public class IntroduceVO {
     @NotBlank(message = "请输入名称")
     private String name;
     private String remark;
-    private List<IntroduceDetail> detailList;
+    private List<IntroduceDetailVO> detailVOList;
 }

icssman-service/src/main/java/com/diagbot/vo/VitalOrderVO.java

@@ -0,0 +1,20 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2018/11/26 15:26
+ */
+@Getter
+@Setter
+public class VitalOrderVO {
+    @NotNull(message = "请输入查体标签ID")
+    private Long vitalId;
+    @NotNull(message = "请输入查体标签排序号")
+    private Integer orderNo;
+}

icssman-service/src/main/java/com/diagbot/web/DeptVitalController.java

@@ -4,9 +4,11 @@ package com.diagbot.web;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.DeptVital;
+import com.diagbot.facade.DeptVitalFacade;
 import com.diagbot.vo.DeptVitalVO;
 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;
@@ -27,12 +29,16 @@ import java.util.List;
 @Api(value = "查体模板相关API", tags = { "查体模板相关API" })
 public class DeptVitalController {
 
+    @Autowired
+    private DeptVitalFacade deptVitalFacade;
+
     @ApiOperation(value = "保存查体模板",
             notes = "deptId:科室ID，必填<br>" +
-                    "vitalIds:查体标签ids，必填<br>" )
+                    "vitalIds:查体标签ids，必填<br>")
     @PostMapping("/saveDeptVitals")
     @SysLogger("saveDeptVitals")
-    public RespDTO<Boolean> saveDeptVitals(@RequestBody DeptVitalVO deptVitalVO){
-        return RespDTO.onSuc(true);
+    public RespDTO<Boolean> saveDeptVitals(@RequestBody DeptVitalVO deptVitalVO) {
+        Boolean data = deptVitalFacade.saveDeptVitals(deptVitalVO);
+        return RespDTO.onSuc(data);
     }
 }

icssman-service/src/main/java/com/diagbot/web/IntroduceInfoController.java

@@ -39,7 +39,12 @@ public class IntroduceInfoController {
             notes = "id: 修改时带id,新增时为空<br>" +
                     "name: 名称，必填<br>" +
                     "remark：备注<br>" +
-                    "detailList:提示信息明细列表")
+                    "detailVOList:提示信息明细列表" +
+                    "title：提示信息标题<br>" +
+                    "content：提示信息<br>" +
+                    "text：提示信息-纯文本<br>" +
+                    "orderNo：排序号<br>" +
+                    "position：显示位置<br>")
     @PostMapping("/saveIntroduce")
     @SysLogger("saveIntroduce")
     public RespDTO<Boolean> saveIntroduce(@RequestBody @Valid IntroduceVO introduceVO) {

icssman-service/src/main/java/com/diagbot/web/VitalOrderController.java

@@ -1,10 +1,21 @@
 package com.diagbot.web;
 
 
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.VitalOrderFacade;
+import com.diagbot.vo.DeptVitalVO;
+import com.diagbot.vo.VitalOrderVO;
 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 java.util.List;
+
 /**
  * <p>
  * 查体全局排序 前端控制器
@@ -18,5 +29,17 @@ import org.springframework.web.bind.annotation.RestController;
 @Api(value = "查体排序相关API", tags = { "查体排序相关API" })
 public class VitalOrderController {
 
+    @Autowired
+    private VitalOrderFacade vitalOrderFacade;
+
+    @ApiOperation(value = "保存查体顺序",
+            notes = "vital:查体标签ID，必填<br>" +
+                    "orderNo:查体排序号，必填<br>")
+    @PostMapping("/saveVitalOrders")
+    @SysLogger("saveVitalOrders")
+    public RespDTO<Boolean> saveVitalOrders(@RequestBody List<VitalOrderVO> vitalOrderVOList) {
+        Boolean data = vitalOrderFacade.saveVitalOrders(vitalOrderVOList);
+        return RespDTO.onSuc(data);
+    }
 
 }

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

@@ -27,7 +27,6 @@
         <result column="text_generate" property="textGenerate" />
         <result column="copy_type" property="copyType" />
         <result column="show_add" property="showAdd" />
-        <result column="placeholder" property="placeholder" />
         <result column="remark" property="remark" />
     </resultMap>