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

icss-service/src/main/java/com/diagbot/client/bean/AdverseReaction.java

@@ -0,0 +1,19 @@
+package com.diagbot.client.bean;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * @Description: 不良反应
+ * @Author:zhaops
+ * @time: 2019/3/14 11:14
+ */
+@Getter
+@Setter
+public class AdverseReaction {
+    private String name;  //名称
+    private Integer controlType; //控件类型
+    private List<AdverseReactionDetail> details;
+}

icss-service/src/main/java/com/diagbot/client/bean/AdverseReactionDetail.java

@@ -0,0 +1,16 @@
+package com.diagbot.client.bean;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description: 不良反应明细
+ * @Author:zhaops
+ * @time: 2019/3/14 11:19
+ */
+@Getter
+@Setter
+public class AdverseReactionDetail {
+    private String name;
+    private Integer isSelected; //是否选中：0-未选中，1-选中
+}

icss-service/src/main/java/com/diagbot/client/bean/MedicalIndication.java

@@ -0,0 +1,20 @@
+package com.diagbot.client.bean;
+
+import com.alibaba.fastjson.JSONObject;
+import lombok.Getter;
+import lombok.Setter;
+
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2019/3/14 14:40
+ */
+@Getter
+@Setter
+public class MedicalIndication {
+    private Integer type; //1-量表，2-核心指标，3-公式，4，是否
+    private String name;
+    private JSONObject content;  //type<>1 量表之外的内容
+    private String scaleName;    //type=1 量表名字
+}

icss-service/src/main/java/com/diagbot/client/bean/ResponseData.java

@@ -18,8 +18,11 @@ public class ResponseData {
     private List<FeatureRate> dis = new ArrayList<>(10);
     private List<FeatureRate> labs = new ArrayList<>(10);
     private List<FeatureRate> pacs = new ArrayList<>(10);
-    private List<FeatureRate> history=new ArrayList<>(10);
+    private List<FeatureRate> history = new ArrayList<>(10);
     private Map<String, JSONObject> treat;
+    private Map<String, JSONObject> scale;
+    private Map<String, JSONObject> managementEvaluation;
+    private List<MedicalIndication> medicalIndications;
 
     private Map<String, Map<String, String>> inputs = new HashMap<>(10, 0.5f);
 
@@ -95,4 +98,28 @@ public class ResponseData {
     public void setInputs(Map<String, Map<String, String>> inputs) {
         this.inputs = inputs;
     }
-}
+
+    public Map<String, JSONObject> getScale() {
+        return scale;
+    }
+
+    public void setScale(Map<String, JSONObject> scale) {
+        this.scale = scale;
+    }
+
+    public Map<String, JSONObject> getManagementEvaluation() {
+        return managementEvaluation;
+    }
+
+    public void setManagementEvaluation(Map<String, JSONObject> managementEvaluation) {
+        this.managementEvaluation = managementEvaluation;
+    }
+
+    public List<MedicalIndication> getMedicalIndications() {
+        return medicalIndications;
+    }
+
+    public void setMedicalIndications(List<MedicalIndication> medicalIndications) {
+        this.medicalIndications = medicalIndications;
+    }
+}

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

@@ -13,6 +13,7 @@ import lombok.Setter;
 public class DisDTO {
 
     private Long id;// id
+    private Long parentId;// parentId
     private String name;//内容
     private Integer type;//类型(0:慢病，1：急诊)
     private Integer tagType; //标签标识

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

@@ -0,0 +1,18 @@
+package com.diagbot.dto;
+
+import com.diagbot.client.bean.MedicalIndication;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description: 指标推送结果
+ * @Author:zhaops
+ * @time: 2019/3/14 14:44
+ */
+@Getter
+@Setter
+public class MedicalIndicationDTO extends MedicalIndication {
+    private Long id;
+    private String tagName;
+    private ScaleDTO scale;
+}

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

@@ -1,5 +1,6 @@
 package com.diagbot.dto;
 
+import com.alibaba.fastjson.JSONObject;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -17,8 +18,12 @@ public class PushDTO {
     private List<QuestionDTO> symptom;
     private List<QuestionDTO> other;
     private List<QuestionDTO> vital;
+    private List<QuestionDTO> importantVital;
     private List<QuestionDTO> lab;
     private List<QuestionDTO> pacs;
     private Map<String, List<QuestionDTO>> dis;
-    private Map<String,Object> treat;
-}
+    private Map<String, Object> treat;
+    private Map<String, JSONObject> managementEvaluation;
+    private Map<String, JSONObject> scale;
+    private List<MedicalIndicationDTO> medicalIndications;
+}

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

@@ -40,5 +40,6 @@ public class QuestionDTO {
     private String joint = "";     //标签后的连接符
     private List<QuestionDetail> questionDetailList = new ArrayList<>(); //标签明细表
     private List<QuestionDTO> questionMapping = new ArrayList<>();     //下级标签
+    private String uniqueName; //隐藏名称
     private String remark;//备注
 }

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

@@ -33,4 +33,11 @@ public class ReadInquiryDTO{
 	
 	private List<InquiryDetail> detailList;
 	
+	
+	/**
+     * 问诊记录用药明细
+     */
+	@ApiModelProperty(value="问诊记录用药明细")
+	private List<ReadInquiryDrugDTO> drugList;
+	
 }

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

@@ -0,0 +1,29 @@
+package com.diagbot.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: rengb
+ * @time: 2019/3/14 11:36
+ */
+@Getter
+@Setter
+public class ReadInquiryDrugDTO{
+	
+	
+	/**
+     * 药品标签id
+     */
+	@ApiModelProperty(value="药品标签id")
+    private Long questionId;
+
+    /**
+     * 药品标签名
+     */
+	@ApiModelProperty(value="药品标签名")
+    private String tagName;
+	
+}

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

@@ -0,0 +1,54 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 量表内容
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2019-03-11
+ */
+@Getter
+@Setter
+public class ScaleContentDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+
+    /**
+     * 量表标签id
+     */
+    private Long scaleId;
+
+    /**
+     * 内容
+     */
+    private String content;
+
+    /**
+     * 0:文本，1：大数据接口填充
+     */
+    private Integer type;
+
+    /**
+     * 排序号
+     */
+    private Integer orderNo;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

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

@@ -0,0 +1,17 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description: 量表
+ * @Author:zhaops
+ * @time: 2019/3/14 14:45
+ */
+@Getter
+@Setter
+public class ScaleDTO {
+    private Long id;
+    private String name;
+    private String tagName;
+}

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

@@ -60,6 +60,11 @@ public class DisType implements Serializable {
      */
     private Long disId;
 
+    /**
+     * parentId
+     */
+    private Long parentId;
+
     /**
      * 0：慢病，1：急诊
      */

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

@@ -0,0 +1,160 @@
+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 rengb
+ * @since 2019-03-12
+ */
+@TableName("icss_inquiry_drug")
+public class InquiryDrug 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 inquiryId;
+
+    /**
+     * 标签id
+     */
+    private Long questionId;
+
+    /**
+     * 标签名
+     */
+    private String tagName;
+
+    /**
+     * 备注
+     */
+    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 getInquiryId() {
+        return inquiryId;
+    }
+
+    public void setInquiryId(Long inquiryId) {
+        this.inquiryId = inquiryId;
+    }
+    public Long getQuestionId() {
+        return questionId;
+    }
+
+    public void setQuestionId(Long questionId) {
+        this.questionId = questionId;
+    }
+    public String getTagName() {
+        return tagName;
+    }
+
+    public void setTagName(String tagName) {
+        this.tagName = tagName;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        return "InquiryDrug{" +
+        "id=" + id +
+        ", isDeleted=" + isDeleted +
+        ", gmtCreate=" + gmtCreate +
+        ", gmtModified=" + gmtModified +
+        ", creator=" + creator +
+        ", modifier=" + modifier +
+        ", inquiryId=" + inquiryId +
+        ", questionId=" + questionId +
+        ", tagName=" + tagName +
+        ", remark=" + remark +
+        "}";
+    }
+}

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

@@ -0,0 +1,147 @@
+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 rengb
+ * @since 2019-03-12
+ */
+@TableName("icss_inquiry_evaluation")
+public class InquiryEvaluation 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 inquiryId;
+
+    /**
+     * 评估页面html内容
+     */
+    private String htmlContent;
+
+    /**
+     * 备注
+     */
+    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 getInquiryId() {
+        return inquiryId;
+    }
+
+    public void setInquiryId(Long inquiryId) {
+        this.inquiryId = inquiryId;
+    }
+    public String getHtmlContent() {
+        return htmlContent;
+    }
+
+    public void setHtmlContent(String htmlContent) {
+        this.htmlContent = htmlContent;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        return "InquiryEvaluation{" +
+        "id=" + id +
+        ", isDeleted=" + isDeleted +
+        ", gmtCreate=" + gmtCreate +
+        ", gmtModified=" + gmtModified +
+        ", creator=" + creator +
+        ", modifier=" + modifier +
+        ", inquiryId=" + inquiryId +
+        ", htmlContent=" + htmlContent +
+        ", remark=" + remark +
+        "}";
+    }
+}

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

@@ -0,0 +1,173 @@
+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 rengb
+ * @since 2019-03-12
+ */
+@TableName("icss_inquiry_scale")
+public class InquiryScale 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 inquiryId;
+
+    /**
+     * 问诊记录评估结果表id
+     */
+    private Long inquiryEvaluationId;
+
+    /**
+     * 量表标签id
+     */
+    private Long scaleId;
+
+    /**
+     * 量表页面html内容
+     */
+    private String htmlContent;
+
+    /**
+     * 备注
+     */
+    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 getInquiryId() {
+        return inquiryId;
+    }
+
+    public void setInquiryId(Long inquiryId) {
+        this.inquiryId = inquiryId;
+    }
+    public Long getInquiryEvaluationId() {
+        return inquiryEvaluationId;
+    }
+
+    public void setInquiryEvaluationId(Long inquiryEvaluationId) {
+        this.inquiryEvaluationId = inquiryEvaluationId;
+    }
+    public Long getScaleId() {
+        return scaleId;
+    }
+
+    public void setScaleId(Long scaleId) {
+        this.scaleId = scaleId;
+    }
+    public String getHtmlContent() {
+        return htmlContent;
+    }
+
+    public void setHtmlContent(String htmlContent) {
+        this.htmlContent = htmlContent;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        return "InquiryScale{" +
+        "id=" + id +
+        ", isDeleted=" + isDeleted +
+        ", gmtCreate=" + gmtCreate +
+        ", gmtModified=" + gmtModified +
+        ", creator=" + creator +
+        ", modifier=" + modifier +
+        ", inquiryId=" + inquiryId +
+        ", inquiryEvaluationId=" + inquiryEvaluationId +
+        ", scaleId=" + scaleId +
+        ", htmlContent=" + htmlContent +
+        ", remark=" + remark +
+        "}";
+    }
+}

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

@@ -0,0 +1,57 @@
+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;
+
+/**
+ * <p>
+ * 量表内容表
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2019-03-11
+ */
+@TableName("icss_scale_content")
+@Getter
+@Setter
+public class ScaleContent implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 量表标签id
+     */
+    private Long scaleId;
+
+    /**
+     * 内容
+     */
+    private String content;
+
+    /**
+     * 0:文本，1：大数据接口填充
+     */
+    private Integer type;
+
+    /**
+     * 排序号
+     */
+    private Integer orderNo;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

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

@@ -0,0 +1,49 @@
+package com.diagbot.enums;
+
+import com.diagbot.core.KeyedNamed;
+import lombok.Setter;
+
+/**
+ * @Description: 不良反应控件类型
+ * @Author:zhaops
+ * @time: 2019/3/14 11:16
+ */
+public enum  ARControlTypeEnum implements KeyedNamed {
+    Radio(1, "单选"),
+    CheckBox(0, "多选");
+
+    @Setter
+    private Integer key;
+
+    @Setter
+    private String name;
+
+    ARControlTypeEnum(Integer key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static ARControlTypeEnum getEnum(Integer key) {
+        for (ARControlTypeEnum item : ARControlTypeEnum.values()) {
+            if (item.key == key) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(Integer key) {
+        ARControlTypeEnum 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/FeatureTypeEnum.java

@@ -0,0 +1,57 @@
+package com.diagbot.enums;
+
+import com.diagbot.core.KeyedNamed;
+import lombok.Setter;
+
+/**
+ * @Description: 推送类型
+ * @Author:zhaops
+ * @time: 2019/3/14 11:28
+ */
+public enum FeatureTypeEnum implements KeyedNamed {
+    Symptom(1, "症状"),
+    Other(3, "其他史"),
+    Vital(4, "查体"),
+    Lis(5, "化验"),
+    Pacs(6, "辅检"),
+    Disease(7, "诊断"),
+    Treat(8, "治疗"),
+    Scale(21, "量表内容"),
+    MedicalIndication(22, "指标"),
+    ManagementEvaluation(11, "管理评估");
+
+    @Setter
+    private Integer key;
+
+    @Setter
+    private String name;
+
+    FeatureTypeEnum(Integer key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static FeatureTypeEnum getEnum(Integer key) {
+        for (FeatureTypeEnum item : FeatureTypeEnum.values()) {
+            if (item.key == key) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(Integer key) {
+        FeatureTypeEnum 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/QuestionTypeEnum.java

@@ -16,7 +16,9 @@ public enum QuestionTypeEnum implements KeyedNamed {
     Pacs(6, "辅检"),
     Disease(7, "诊断"),
     Drug(8, "药品"),
-    DrugClass(9, "药品分类");
+    DrugClass(9, "药品分类"),
+    Scale(21, "量表"),
+    MedicalIndication(22, "推送指标");
 
     @Setter
     private Integer key;

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

@@ -0,0 +1,51 @@
+package com.diagbot.enums;
+
+import com.diagbot.core.KeyedNamed;
+import lombok.Setter;
+
+/**
+ * 
+ * @author zhoutg
+ * @Description: 诊断类型
+ * @date 2018年11月21日 下午2:31:42
+ */
+public enum ScaleTypeEnum implements KeyedNamed {
+    TEXT(0, "文本"),
+    PUSH(1, "推理");
+
+    @Setter
+    private Integer key;
+
+    @Setter
+    private String name;
+
+    ScaleTypeEnum(Integer key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static ScaleTypeEnum getEnum(Integer key) {
+        for (ScaleTypeEnum item : ScaleTypeEnum.values()) {
+            if (item.key == key) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(Integer key) {
+        ScaleTypeEnum 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/DisTypeFacade.java

@@ -1,11 +1,17 @@
 package com.diagbot.facade;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.DisDTO;
 import com.diagbot.dto.DisTypeDTO;
+import com.diagbot.entity.DisType;
+import com.diagbot.entity.QuestionInfo;
 import com.diagbot.enums.DisTypeEnum;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.enums.QuestionTypeEnum;
 import com.diagbot.service.impl.DisTypeServiceImpl;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.ListUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -18,6 +24,8 @@ import java.util.Map;
  */
 @Component
 public class DisTypeFacade extends DisTypeServiceImpl {
+    @Autowired
+    private QuestionFacade questionFacade;
 
     /**
      * 返回诊断类型
@@ -40,4 +48,44 @@ public class DisTypeFacade extends DisTypeServiceImpl {
         }
         return res;
     }
+
+    /**
+     * 根据诊断id判断类型
+     *
+     * @param diseaseId
+     * @param type
+     * @return
+     */
+    public Boolean judgeByDisId(Long diseaseId, Integer type) {
+        QueryWrapper<DisType> disTypeQueryWrapper = new QueryWrapper<>();
+        disTypeQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("dis_id", diseaseId)
+                .eq("type", type);
+        DisType disType = this.getOne(disTypeQueryWrapper);
+        if (disType == null) {
+            return false;
+        } else {
+            return true;
+        }
+    }
+
+    /**
+     * 根据诊断名称判断类型
+     *
+     * @param disName
+     * @param type
+     * @return
+     */
+    public Boolean judgeByDisName(String disName, Integer type) {
+        QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
+        questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("tag_name", disName)
+                .eq("type", QuestionTypeEnum.Disease.getKey());
+        QuestionInfo disease = questionFacade.getOne(questionInfoQueryWrapper);
+        if (disease == null) {
+            return false;
+        } else {
+            return judgeByDisId(disease.getId(), type);
+        }
+    }
 }

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

@@ -0,0 +1,56 @@
+package com.diagbot.facade;
+
+import java.util.List;
+
+import org.springframework.stereotype.Component;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.entity.InquiryDrug;
+import com.diagbot.service.impl.InquiryDrugServiceImpl;
+import com.diagbot.util.ListUtil;
+
+/**
+ * @author rengb
+ * @Description
+ * @time 2019年3月12日下午2:08:08
+ */
+@Component
+public class InquiryDrugFacade extends InquiryDrugServiceImpl {
+	
+    /**
+     * 根据问诊记录id删除问诊记录处方用药明细
+     *
+     * @param inquiryId
+     */
+    public void removeByInquiryId(Long inquiryId) {
+        QueryWrapper<InquiryDrug> queryWrapper = new QueryWrapper<InquiryDrug>();
+        queryWrapper.eq("inquiry_id", inquiryId);
+        this.remove(queryWrapper);
+    }
+    
+    /**
+     * 批量保存问诊记录处方用药明细
+     *
+     * @param inquiryDrugList
+     */
+    public void saveInquiryDrugs(List<InquiryDrug> inquiryDrugList) {
+        if (ListUtil.isNotEmpty(inquiryDrugList)) {
+           super.saveBatch(inquiryDrugList);
+        }
+    }
+    
+    /**
+     * 根据问诊记录id获取问诊记录处方用药明细
+     *
+     * @param inquiryId
+     */
+    public List<InquiryDrug> getInquiryDrugs(Long inquiryId) {
+        QueryWrapper<InquiryDrug> queryWrapper = new QueryWrapper<InquiryDrug>();
+        queryWrapper.eq("inquiry_id", inquiryId);
+        return this.list(queryWrapper);
+    }
+    
+    
+    
+
+}

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

@@ -0,0 +1,28 @@
+package com.diagbot.facade;
+
+import org.springframework.stereotype.Component;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.entity.InquiryEvaluation;
+import com.diagbot.service.impl.InquiryEvaluationServiceImpl;
+
+/**
+ * @author rengb
+ * @Description
+ * @time 2019年3月12日下午2:08:08
+ */
+@Component
+public class InquiryEvaluationFacade extends InquiryEvaluationServiceImpl {
+	
+	/**
+     * 根据问诊记录id删除问诊记录评估结果
+     *
+     * @param inquiryId
+     */
+    public void removeByInquiryId(Long inquiryId) {
+        QueryWrapper<InquiryEvaluation> queryWrapper = new QueryWrapper<InquiryEvaluation>();
+        queryWrapper.eq("inquiry_id", inquiryId);
+        this.remove(queryWrapper);
+    }
+
+}

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

@@ -9,6 +9,7 @@ import java.util.Optional;
 import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -19,23 +20,29 @@ import com.diagbot.dto.HisInquiryDTO;
 import com.diagbot.dto.HospitalInfoDTO;
 import com.diagbot.dto.PatientInfoDTO;
 import com.diagbot.dto.ReadInquiryDTO;
+import com.diagbot.dto.ReadInquiryDrugDTO;
 import com.diagbot.dto.SaveInquiryDTO;
 import com.diagbot.entity.DoctorInfo;
 import com.diagbot.entity.HospitalDept;
 import com.diagbot.entity.InquiryDetail;
+import com.diagbot.entity.InquiryDrug;
+import com.diagbot.entity.InquiryEvaluation;
 import com.diagbot.entity.InquiryInfo;
+import com.diagbot.entity.InquiryScale;
 import com.diagbot.entity.PatientInfo;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.SexTypeEnum;
+import com.diagbot.service.InquiryDrugService;
+import com.diagbot.service.InquiryScaleService;
 import com.diagbot.service.impl.InquiryInfoServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
+import com.diagbot.util.ListUtil;
 import com.diagbot.vo.GetInquiryDetailVO;
 import com.diagbot.vo.GetLastOtherVO;
 import com.diagbot.vo.HisInquirysVO;
 import com.diagbot.vo.PatientInfoVO;
 import com.diagbot.vo.ReadInquiryVO;
-import com.diagbot.vo.SaveInquiryDetailVO;
 import com.diagbot.vo.SaveInquiryVO;
 
 /**
@@ -56,6 +63,18 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
     private DoctorInfoFacade doctorInfoFacade;
     @Autowired
     private HospitalDeptFacade hospitalDeptFacade;
+    @Autowired
+    private InquiryDrugFacade inquiryDrugFacade;
+    @Autowired
+    @Qualifier("inquiryDrugServiceImpl")
+    private InquiryDrugService inquiryDrugService;
+    @Autowired
+    private InquiryEvaluationFacade inquiryEvaluationFacade;
+    @Autowired
+    private InquiryScaleFacade inquiryScaleFacade;
+    @Autowired
+    @Qualifier("inquiryScaleServiceImpl")
+    private InquiryScaleService inquiryScaleService;
 
     /**
      * 问诊记录保存
@@ -101,21 +120,49 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
             this.updateById(inquiryInfoSave);
 
             inquiryDetailFacade.removeByInquiryId(inquiryId);
+            inquiryDrugFacade.removeByInquiryId(inquiryId);
+            inquiryEvaluationFacade.removeByInquiryId(inquiryId);
+            inquiryScaleFacade.removeByInquiryId(inquiryId);
         }
-
-        List<InquiryDetail> inquiryDetailList = new ArrayList<>();
-        for (SaveInquiryDetailVO i : saveInquiryVO.getDetailList()) {
-            InquiryDetail inquiryDetail = new InquiryDetail();
-            inquiryDetail.setInquiryId(inquiryId);
-            inquiryDetail.setType(i.getType());
-            inquiryDetail.setContent(i.getContent());
-            inquiryDetail.setGmtCreate(now);
-            inquiryDetailList.add(inquiryDetail);
-        }
-        if (inquiryDetailList.size() > 0) {
+        
+        Long inquiryId_=inquiryId;
+        
+        if(ListUtil.isNotEmpty(saveInquiryVO.getDetailList())){
+            List<InquiryDetail> inquiryDetailList = BeanUtil.listCopyTo(saveInquiryVO.getDetailList(),InquiryDetail.class);
+            inquiryDetailList.forEach(i->{
+            	i.setInquiryId(inquiryId_);
+            	i.setGmtCreate(now);
+            });
             inquiryDetailFacade.saveInquiryDetails(inquiryDetailList);
         }
-
+        
+        if(ListUtil.isNotEmpty(saveInquiryVO.getDrugList())){
+        	List<InquiryDrug> inquiryDrugList = BeanUtil.listCopyTo(saveInquiryVO.getDrugList(),InquiryDrug.class);
+            inquiryDrugList.stream().forEach(i->{
+            	i.setInquiryId(inquiryId_);
+            	i.setGmtCreate(now);
+            });
+            inquiryDrugService.saveBatch(inquiryDrugList);
+        }
+        
+        if(saveInquiryVO.getInquiryEvaluation()!=null){
+        	InquiryEvaluation inquiryEvaluation = new InquiryEvaluation();
+        	inquiryEvaluation.setInquiryId(inquiryId_);
+        	inquiryEvaluation.setGmtCreate(now);
+        	inquiryEvaluation.setHtmlContent(saveInquiryVO.getInquiryEvaluation().getHtmlContent());
+        	inquiryEvaluationFacade.save(inquiryEvaluation);
+        	
+        	if(ListUtil.isNotEmpty(saveInquiryVO.getInquiryEvaluation().getScaleList())){
+        		List<InquiryScale> inquiryScaleList = BeanUtil.listCopyTo(saveInquiryVO.getInquiryEvaluation().getScaleList(),InquiryScale.class);
+        		inquiryScaleList.forEach(i->{
+        			i.setInquiryId(inquiryId_);
+        			i.setInquiryEvaluationId(inquiryEvaluation.getId());
+        			i.setGmtCreate(now);
+        		});
+        		inquiryScaleService.saveBatch(inquiryScaleList);
+        	}
+        }
+        
         saveInquiryDTO.setInquiryId(inquiryId);
         return saveInquiryDTO;
     }
@@ -144,6 +191,11 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
             QueryWrapper<InquiryDetail> inquiryDetailQe = new QueryWrapper<>();
             inquiryDetailQe.eq("inquiry_id", inquiryInfo.getId());
             readInquiryDTO.setDetailList(inquiryDetailFacade.list(inquiryDetailQe).stream().sorted((a,b)->a.getType()-b.getType()).collect(Collectors.toList()));
+            
+            List<InquiryDrug> inquiryDrugList = inquiryDrugFacade.getInquiryDrugs(inquiryInfo.getId());
+            
+            List<ReadInquiryDrugDTO> drugList = BeanUtil.listCopyTo(inquiryDrugList,ReadInquiryDrugDTO.class);
+            readInquiryDTO.setDrugList(drugList);
         }
 
         return readInquiryDTO;

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

@@ -0,0 +1,42 @@
+package com.diagbot.facade;
+
+import java.util.List;
+
+import org.springframework.stereotype.Component;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.entity.InquiryScale;
+import com.diagbot.service.impl.InquiryScaleServiceImpl;
+import com.diagbot.util.ListUtil;
+
+/**
+ * @author rengb
+ * @Description
+ * @time 2019年3月12日下午2:08:08
+ */
+@Component
+public class InquiryScaleFacade extends InquiryScaleServiceImpl {
+	
+	/**
+     * 根据问诊记录id删除问诊记录评估结果量表明细
+     *
+     * @param inquiryId
+     */
+    public void removeByInquiryId(Long inquiryId) {
+        QueryWrapper<InquiryScale> queryWrapper = new QueryWrapper<InquiryScale>();
+        queryWrapper.eq("inquiry_id", inquiryId);
+        this.remove(queryWrapper);
+    }
+    
+    /**
+     * 批量保存问诊记录评估结果量表明细
+     *
+     * @param inquiryScaleList
+     */
+    public void saveInquiryScales(List<InquiryScale> inquiryScaleList) {
+        if (ListUtil.isNotEmpty(inquiryScaleList)) {
+           super.saveBatch(inquiryScaleList);
+        }
+    }
+
+}

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

@@ -1,6 +1,11 @@
 package com.diagbot.facade;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.entity.IntroduceMap;
+import com.diagbot.entity.QuestionInfo;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.IntroduceMapServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
@@ -10,4 +15,42 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class IntroduceMapFacade extends IntroduceMapServiceImpl {
-}
+    @Autowired
+    QuestionFacade questionFacade;
+
+    /**
+     * 根据标签id和类型判断时候有关联静态知识
+     *
+     * @param questionId
+     * @param type
+     * @return
+     */
+    public Boolean hasIntroduceByQuestionId(Long questionId, Integer type) {
+        QueryWrapper<IntroduceMap> introduceMapQueryWrapper = new QueryWrapper<>();
+        introduceMapQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("question_id", questionId).eq("type", type);
+        IntroduceMap introduceMap = this.getOne(introduceMapQueryWrapper);
+        if (introduceMap == null) {
+            return false;
+        } else {
+            return true;
+        }
+    }
+
+    /**
+     * 根据标签名称和类型判断时候有关联静态知识
+     *
+     * @param questionName
+     * @param type
+     * @return
+     */
+    public Boolean hasIntroduceByQuestionName(String questionName, Integer type) {
+        QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
+        questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("tag_name", questionName).eq("type", type);
+        QuestionInfo questionInfo = questionFacade.getOne(questionInfoQueryWrapper);
+        if (questionInfo == null) {
+            return false;
+        } else {
+            return hasIntroduceByQuestionId(questionInfo.getId(), type);
+        }
+    }
+}

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

@@ -5,6 +5,8 @@ import com.diagbot.entity.LisMapping;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.impl.LisMappingServiceImpl;
 import com.diagbot.util.EntityUtil;
+import com.diagbot.util.ListUtil;
+import com.diagbot.util.StringUtil;
 import org.springframework.stereotype.Component;
 
 import java.util.LinkedHashMap;
@@ -20,14 +22,14 @@ import java.util.Map;
 public class LisMappingFacade extends LisMappingServiceImpl {
 
     /**
-     * 获取化验公表映射关系 Map<mealName,Map<itemName,uniqueName>>
+     * 获取化验公表映射关系 Map<mealName,Map<itemName,uniqueName>> itemName 不为空
      *
      * @return
      */
     public Map<String, Map<String, String>> getLisMapping() {
         Map<String, Map<String, String>> retMap = new LinkedHashMap<>();
         QueryWrapper<LisMapping> lisMappingQueryWrapper = new QueryWrapper<>();
-        lisMappingQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
+        lisMappingQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).isNotNull("item_name").ne("item_name","");
         List<LisMapping> lisMappingList = this.list(lisMappingQueryWrapper);
         Map<String, List<LisMapping>> lisMappingMap = EntityUtil.makeEntityListMap(lisMappingList, "mealName");
         for (Map.Entry<String, List<LisMapping>> entry : lisMappingMap.entrySet()) {
@@ -40,6 +42,18 @@ public class LisMappingFacade extends LisMappingServiceImpl {
         return retMap;
     }
 
+    /**
+     * 获取化验公表映射关系 Map<mealName,uniqueName> itemName 为空
+     * @return
+     */
+    public Map<String,String> getLisMappingWithoutItemName() {
+        QueryWrapper<LisMapping> lisMappingQueryWrapper = new QueryWrapper<>();
+        lisMappingQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).isNull("item_name").or(i -> i.eq("item_name", ""));
+        List<LisMapping> lisMappingList = this.list(lisMappingQueryWrapper);
+        Map<String, String> retMap = EntityUtil.makeMapWithKeyValue(lisMappingList, "mealName", "uniqueName");
+        return retMap;
+    }
+
     /**
      * 化验公表映射关系  Map<uniqueName,List<mealName>>
      *
@@ -56,4 +70,36 @@ public class LisMappingFacade extends LisMappingServiceImpl {
         }
         return retMap;
     }
+
+
+    /**
+     *
+     * @param project 化验大项
+     * @param details 化验小项
+     * @return
+     */
+    public Map<String,Map<String,String>> getLisMappingByQuestion(String project,List<String> details){
+        Map<String,Map<String,String>> lisWithItemNamMap=getLisMapping();
+        Map<String,String> lisWithoutItemNameMap=getLisMappingWithoutItemName();
+
+        if(StringUtil.isBlank(project)){
+            return null;
+        }
+
+        Map<String,Map<String,String>> retMap=new LinkedHashMap<>();
+        Map<String,String> projectMap=new LinkedHashMap<>();
+        projectMap.put(project,lisWithoutItemNameMap.get(project));
+        retMap.put("project",projectMap);
+
+        if(ListUtil.isEmpty(details)){
+            return  retMap;
+        }
+
+        Map<String,String> detailMap=new LinkedHashMap<>();
+        for(String detail:details){
+            detailMap.put(detail,lisWithItemNamMap.get(project).get(detail));
+        }
+        retMap.put("details",detailMap);
+        return retMap;
+    }
 }

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

@@ -6,6 +6,7 @@ import com.diagbot.entity.QuestionDetail;
 import com.diagbot.entity.QuestionInfo;
 import com.diagbot.entity.wrapper.QuestionInfoWrapper;
 import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.enums.QuestionTypeEnum;
 import com.diagbot.service.impl.QuestionInfoServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.EntityUtil;
@@ -32,6 +33,8 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
 
     @Autowired
     QuestionDetailFacade questionDetailFacade;
+    @Autowired
+    LisMappingFacade lisMappingFacade;
 
     /**
      * 根据参数返回标签内容
@@ -99,6 +102,27 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
 
             }
         }
+
+        //获取uniqueName
+        if (res != null && res.getType() != null &&
+                QuestionTypeEnum.Lis.getKey() == res.getType().intValue()) {
+            String project = res.getName();
+            List<String> details = new ArrayList<>();
+            if (ListUtil.isNotEmpty(res.getQuestionMapping())) {
+                details = res.getQuestionMapping().stream().map(row -> row.getName()).collect(Collectors.toList());
+            }
+            Map<String, Map<String, String>> map = lisMappingFacade.getLisMappingByQuestion(project, details);
+            if (map != null) {
+                if (map.get("project") != null) {
+                    res.setUniqueName(map.get("project").get(res.getName()));
+                }
+                if (map.get("details") != null) {
+                    for (QuestionDTO bean : res.getQuestionMapping()) {
+                        bean.setUniqueName(map.get("details").get(bean.getName()));
+                    }
+                }
+            }
+        }
         return res;
     }
 
@@ -141,4 +165,19 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
         Map<Long, QuestionInfo> map = questionInfoList.stream().collect(Collectors.toMap(QuestionInfo::getId, questionInfo -> questionInfo));
         return map;
     }
+
+    /**
+     * 根据tagName和类型查找标签
+     * @param name
+     * @param type
+     * @return
+     */
+    public QuestionInfo getQuestionByTagNameAndType(String name,Integer type) {
+        QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
+        questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("tag_name", name).eq("type", type);
+        QuestionInfo questionInfo = this.getOne(questionInfoQueryWrapper);
+        return questionInfo;
+    }
+
 }

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

@@ -0,0 +1,41 @@
+package com.diagbot.facade;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.entity.ScaleContent;
+import com.diagbot.enums.ScaleTypeEnum;
+import com.diagbot.service.impl.ScaleContentServiceImpl;
+import com.diagbot.vo.PushVO;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @Description: 量表内容
+ * @author: zhoutg
+ * @time: 2018/11/19 13:19
+ */
+@Component
+public class ScaleContentFacade extends ScaleContentServiceImpl {
+
+    /**
+     * 返回诊断量表列表
+     *
+     * @return
+     */
+    public List<ScaleContent> getContent(PushVO pushVO) {
+        //获取内容列表
+        List<ScaleContent> data = this.list(new QueryWrapper<ScaleContent>()
+                .eq("scale_id", pushVO.getScaleId())
+                .orderByAsc("order_no"));
+
+        //看需是否要调用大数据
+        for(ScaleContent scaleContent : data) {
+            if(ScaleTypeEnum.PUSH.getKey() == scaleContent.getType()) {
+                //TODO 调用推理
+                scaleContent.setContent("大数据json字符串");
+                break;
+            }
+        }
+        return data;
+    }
+}

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

@@ -4,17 +4,26 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.client.bean.Medicition;
 import com.diagbot.client.bean.MedicitionClass;
+import com.diagbot.dto.QuestionDTO;
+import com.diagbot.entity.DisType;
+import com.diagbot.entity.InquiryDrug;
+import com.diagbot.entity.InquiryInfo;
 import com.diagbot.entity.IntroduceDetail;
 import com.diagbot.entity.IntroduceMap;
 import com.diagbot.entity.QuestionInfo;
+import com.diagbot.enums.DisTypeEnum;
 import com.diagbot.enums.IntroducePositionEnum;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.QuestionTypeEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
+import com.diagbot.util.BeanUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.FastJsonUtils;
+import com.google.common.collect.Lists;
+import com.sun.org.apache.xpath.internal.operations.Bool;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.stereotype.Component;
 
 import java.util.LinkedHashMap;
@@ -36,6 +45,12 @@ public class TreatmentFacade {
     IntroduceDetailFacade introduceDetailFacade;
     @Autowired
     IntroduceMapFacade introduceMapFacade;
+    @Autowired
+    DisTypeFacade disTypeFacade;
+    @Autowired
+    InquiryInfoFacade inquiryInfoFacade;
+    @Autowired
+    InquiryDrugFacade inquiryDrugFacade;
 
     /**
      * 获取治疗方案
@@ -43,7 +58,7 @@ public class TreatmentFacade {
      * @param
      * @return
      */
-    public Map<String, Object> getTreatment(Map<String, JSONObject> treatmentMap, Long diseaseId) {
+    public Map<String, Object> getTreatment(Map<String, JSONObject> treatmentMap, Long diseaseId, Long patientId) {
         Map<String, Object> retMap = new LinkedHashMap<>();
         QuestionInfo disease = questionFacade.getById(diseaseId);
         if (disease == null) {
@@ -64,17 +79,13 @@ public class TreatmentFacade {
         List<IntroduceDetail> surgeryTreatmentDetailList = getIntroduceDetailList(diseaseId, IntroducePositionEnum.SurgeryTreatment.getKey());
         retMap.put("surgeryTreatment", surgeryTreatmentDetailList.size() > 0 ? surgeryTreatmentDetailList.get(0).getContent() : "");
 
+
         //获取知识图谱治疗方案
         JSONObject treatmentJson = treatmentMap.get(disease.getTagName());
         if (treatmentJson == null || treatmentJson.isEmpty()) {
             return retMap;
         }
 
-        /*JSONObject treatmentJson = diseaseJson.getJSONObject(disease.getTagName());
-        if (treatmentJson == null || treatmentJson.isEmpty()) {
-            return retMap;
-        }*/
-
         List<MedicitionClass> drugsList = FastJsonUtils.getJsonToListByKey(treatmentJson.toString(), "treatment", MedicitionClass.class);
 
         List<String> classNameList = drugsList.stream().map(drugs -> drugs.getBigdrugsName()).collect(Collectors.toList());
@@ -112,6 +123,24 @@ public class TreatmentFacade {
         }
 
         retMap.put("treatment", drugsList);
+
+        //判断是否慢病，慢病增加回访时间，上次用药，不良反应
+        Boolean isChronic = disTypeFacade.judgeByDisId(diseaseId, DisTypeEnum.CHRONIC.getKey());
+        if (isChronic) {
+            //慢病，增加回访时间，暂时前端写死， 以后由只是图谱返回
+            retMap.put("followUp", null);
+
+            //上次用药
+            if (patientId == null) {
+                retMap.put("drugHistory", null);
+            } else {
+                retMap.put("drugHistory", getDrugHistory(patientId));
+            }
+
+            //不良反应
+            retMap.put("adverseReactions", null);
+
+        }
         return retMap;
     }
 
@@ -166,4 +195,55 @@ public class TreatmentFacade {
         List<IntroduceMap> introduceMapList = introduceMapFacade.list(introduceMapQueryWrapper);
         return introduceMapList;
     }
+
+    /**
+     * 根据病人id获取历史用药内容
+     *
+     * @param patientId
+     * @return
+     */
+    public Map<String, List<Medicition>> getDrugHistory(Long patientId) {
+        Map<String, List<Medicition>> drugHistoryMap = new LinkedHashMap<>();
+        QueryWrapper<InquiryInfo> inquiryInfoQueryWrapper = new QueryWrapper<>();
+        inquiryInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
+                eq("patient_id", patientId).
+                orderByDesc("gmt_modified");
+        List<InquiryInfo> inquiryInfoList = inquiryInfoFacade.list(inquiryInfoQueryWrapper);
+        Boolean chronicHistroy = false;
+        Boolean not_chronicHistory = false;
+        for (InquiryInfo inquiryInfo : inquiryInfoList) {
+            String[] diseases = inquiryInfo.getDiagnose().split(",|，");
+            if (diseases.length > 0) {
+                QueryWrapper<InquiryDrug> inquiryDrugQueryWrapper = new QueryWrapper<>();
+                inquiryDrugQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("inquiry_id", inquiryInfo.getId());
+                List<InquiryDrug> inquiryDrugList = inquiryDrugFacade.list(inquiryDrugQueryWrapper);
+                List<Medicition> medicitionList = Lists.newLinkedList();
+                for (InquiryDrug inquiryDrug : inquiryDrugList) {
+                    Medicition medicition = new Medicition();
+                    medicition.setId(inquiryDrug.getQuestionId());
+                    medicition.setMedicitionName(inquiryDrug.getTagName());
+                    medicition.setIsShow("1");
+                    Boolean hasIntroduce = introduceMapFacade.hasIntroduceByQuestionName(inquiryDrug.getTagName(), QuestionTypeEnum.Drug.getKey());
+                    if (hasIntroduce) {
+                        medicition.setShowInfo("1");
+                    } else {
+                        medicition.setShowInfo("0");
+                    }
+                    medicitionList.add(medicition);
+                }
+                Boolean isChronic = disTypeFacade.judgeByDisName(diseases[0], DisTypeEnum.CHRONIC.getKey());
+                if (isChronic) {
+                    if (!chronicHistroy)
+                        drugHistoryMap.put("慢病用药内容", medicitionList);
+                    chronicHistroy = true;
+                } else {
+                    if (!not_chronicHistory) {
+                        drugHistoryMap.put("普通病用药内容", medicitionList);
+                        not_chronicHistory = true;
+                    }
+                }
+            }
+        }
+        return drugHistoryMap;
+    }
 }

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

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.InquiryDrug;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 问诊记录处方用药明细表 Mapper 接口
+ * </p>
+ *
+ * @author rengb
+ * @since 2019-03-12
+ */
+public interface InquiryDrugMapper extends BaseMapper<InquiryDrug> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.InquiryEvaluation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 问诊记录评估结果表 Mapper 接口
+ * </p>
+ *
+ * @author rengb
+ * @since 2019-03-12
+ */
+public interface InquiryEvaluationMapper extends BaseMapper<InquiryEvaluation> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.InquiryScale;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 问诊记录评估结果量表明细表 Mapper 接口
+ * </p>
+ *
+ * @author rengb
+ * @since 2019-03-12
+ */
+public interface InquiryScaleMapper extends BaseMapper<InquiryScale> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.entity.ScaleContent;
+
+/**
+ * <p>
+ * 量表内容表 Mapper 接口
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2019-03-11
+ */
+public interface ScaleContentMapper extends BaseMapper<ScaleContent> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.InquiryDrug;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 问诊记录处方用药明细表 服务类
+ * </p>
+ *
+ * @author rengb
+ * @since 2019-03-12
+ */
+public interface InquiryDrugService extends IService<InquiryDrug> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.InquiryEvaluation;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 问诊记录评估结果表 服务类
+ * </p>
+ *
+ * @author rengb
+ * @since 2019-03-12
+ */
+public interface InquiryEvaluationService extends IService<InquiryEvaluation> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.InquiryScale;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 问诊记录评估结果量表明细表 服务类
+ * </p>
+ *
+ * @author rengb
+ * @since 2019-03-12
+ */
+public interface InquiryScaleService extends IService<InquiryScale> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.diagbot.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.entity.ScaleContent;
+
+/**
+ * <p>
+ * 量表内容表 服务类
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2019-03-11
+ */
+public interface ScaleContentService extends IService<ScaleContent> {
+
+}

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

@@ -0,0 +1,20 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.entity.InquiryDrug;
+import com.diagbot.mapper.InquiryDrugMapper;
+import com.diagbot.service.InquiryDrugService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 问诊记录处方用药明细表 服务实现类
+ * </p>
+ *
+ * @author rengb
+ * @since 2019-03-12
+ */
+@Service
+public class InquiryDrugServiceImpl extends ServiceImpl<InquiryDrugMapper, InquiryDrug> implements InquiryDrugService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.entity.InquiryEvaluation;
+import com.diagbot.mapper.InquiryEvaluationMapper;
+import com.diagbot.service.InquiryEvaluationService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 问诊记录评估结果表 服务实现类
+ * </p>
+ *
+ * @author rengb
+ * @since 2019-03-12
+ */
+@Service
+public class InquiryEvaluationServiceImpl extends ServiceImpl<InquiryEvaluationMapper, InquiryEvaluation> implements InquiryEvaluationService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.entity.InquiryScale;
+import com.diagbot.mapper.InquiryScaleMapper;
+import com.diagbot.service.InquiryScaleService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 问诊记录评估结果量表明细表 服务实现类
+ * </p>
+ *
+ * @author rengb
+ * @since 2019-03-12
+ */
+@Service
+public class InquiryScaleServiceImpl extends ServiceImpl<InquiryScaleMapper, InquiryScale> implements InquiryScaleService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.diagbot.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.entity.ScaleContent;
+import com.diagbot.mapper.ScaleContentMapper;
+import com.diagbot.service.ScaleContentService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 量表内容表 服务实现类
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2019-03-11
+ */
+@Service
+public class ScaleContentServiceImpl extends ServiceImpl<ScaleContentMapper, ScaleContent> implements ScaleContentService {
+
+}

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

@@ -0,0 +1,16 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2019/3/14 11:00
+ */
+@Getter
+@Setter
+public class MedicalIndicationVO {
+    private String name;
+    private String result;
+}

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

@@ -1,5 +1,6 @@
 package com.diagbot.vo;
 
+import com.diagbot.client.bean.AdverseReaction;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -29,4 +30,10 @@ public class PushVO {
     private String past;
     private String other;
     private Long diseaseId;
-}
+    private Long patientId;   //病人id
+    private String scaleName; //量表名称
+    private Long scaleId;     //量表id
+    private Integer disType;  //0-慢病,1-急诊,普通病不填
+    private List<AdverseReaction> adverseReactions; //不良反应
+    private List<MedicalIndicationVO> medicalIndications;   //推理指标
+}

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

@@ -13,7 +13,7 @@ import lombok.Setter;
 
 /**
  * @Description
- * @author rgb
+ * @author rengb
  * @time 2018年11月23日下午2:29:43
  */
 @Getter

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

@@ -0,0 +1,33 @@
+package com.diagbot.vo;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description
+ * @author rengb
+ * @time 2019年3月12日下午2:29:43
+ */
+@Getter
+@Setter
+public class SaveInquiryDrugVO {
+	
+	/**
+	 * 药品标签id
+	 */
+    @NotNull(message="药品标签id必传")
+    @ApiModelProperty(value="药品标签id",required=true)
+    private Long questionId;
+
+    /**
+     * 药品标签名
+     */
+    @NotBlank(message="药品标签名必传")
+    @ApiModelProperty(value="药品标签名",required=true)
+    private String tagName;
+
+}

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

@@ -0,0 +1,41 @@
+/**
+ * 
+ */
+package com.diagbot.vo;
+
+import java.util.List;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description
+ * @author rengb
+ * @time 2019年3月12日下午2:29:43
+ */
+@Getter
+@Setter
+public class SaveInquiryEvaluationVO {
+	
+	
+	/**
+     * 评估页面html内容
+     */
+	@ApiModelProperty(value="评估页面html内容",required=true)
+    @NotBlank(message="评估页面html内容必传")
+    private String htmlContent;
+	
+	/**
+	 * 评估量表明细
+	 */
+	@Valid
+    @ApiModelProperty(value="评估量表明细",required=true)
+    @NotEmpty(message="评估量表明细不能为空")
+    private List<SaveInquiryScaleVO> scaleList;
+
+}

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

@@ -0,0 +1,38 @@
+/**
+ * 
+ */
+package com.diagbot.vo;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description
+ * @author rengb
+ * @time 2019年3月12日下午2:29:43
+ */
+@Getter
+@Setter
+public class SaveInquiryScaleVO {
+	
+	/**
+     * 量表标签id
+     */
+	@ApiModelProperty(value="量表标签id",required=true)
+	@NotNull(message="量表标签id必传")
+    private Long scaleId;
+	
+
+	
+	/**
+     * 量表页面html内容
+     */
+	@ApiModelProperty(value="量表页面html内容",required=true)
+    @NotBlank(message="量表页面html内容必传")
+    private String htmlContent;
+
+}

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

@@ -94,9 +94,28 @@ public class SaveInquiryVO {
     @NotBlank(message="内容JSON字符串必传")
     private String dataJson;
     
+	/**
+	 * 问诊明细
+	 */
     @Valid
     @ApiModelProperty(value="问诊明细",required=true)
     @NotEmpty(message="问诊明细不能为空")
     private List<SaveInquiryDetailVO> detailList;
+    
+    /**
+     * 问诊药品明细
+     */
+    @Valid
+    @ApiModelProperty(value="问诊药品明细",required=true)
+    @NotEmpty(message="问诊药品明细不能为空")
+    private List<SaveInquiryDrugVO> drugList;
+    
+    /**
+     * 评估结果
+     */
+    @Valid
+    @ApiModelProperty(value="评估结果",required=true)
+    @NotNull(message="评估结果必传")
+    private SaveInquiryEvaluationVO inquiryEvaluation;
    
 }

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

@@ -3,8 +3,11 @@ package com.diagbot.web;
 
 import com.diagbot.dto.DisScaleDTO;
 import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.ScaleContent;
 import com.diagbot.facade.DisScaleFacade;
+import com.diagbot.facade.ScaleContentFacade;
 import com.diagbot.vo.DisScaleVO;
+import com.diagbot.vo.PushVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,18 +27,31 @@ import java.util.List;
  * @since 2019-03-11
  */
 @RestController
-@RequestMapping("/disScale")
+@RequestMapping("/scale")
 @Api(value = "诊断量表API", tags = { "诊断量表API" })
+@SuppressWarnings("unchecked")
 public class DisScaleController {
 
     @Autowired
     DisScaleFacade disScaleFacade;
 
+    @Autowired
+    ScaleContentFacade scaleContentFacade;
+
     @ApiOperation(value = "返回诊断量表列表[by:zhoutg]",
             notes = "")
-    @PostMapping("/getDisScale")
-    public RespDTO<List<DisScaleDTO>> getDisType(@RequestBody DisScaleVO scaleVO) {
+    @PostMapping("/getList")
+    public RespDTO<List<DisScaleDTO>> getList(@RequestBody DisScaleVO scaleVO) {
         List<DisScaleDTO> data = disScaleFacade.getDisScaleFac(scaleVO.getDisId());
         return RespDTO.onSuc(data);
     }
+
+
+    @ApiOperation(value = "获取量表内容[by:zhoutg]",
+            notes = "")
+    @PostMapping("/getContent")
+    public RespDTO<List<ScaleContent>> getContent(@RequestBody PushVO pushVO) {
+        List<ScaleContent> data = scaleContentFacade.getContent(pushVO);
+        return RespDTO.onSuc(data);
+    }
 }

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

@@ -22,6 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/disType")
 @Api(value = "诊断类型API", tags = { "诊断类型API" })
+@SuppressWarnings("unchecked")
 public class DisTypeController {
 
 

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

@@ -21,6 +21,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/feature")
+@SuppressWarnings("unchecked")
 @Api(value = "特征词提取相关API", tags = { "特征词提取相关API" })
 public class FeatureController {
 

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

@@ -1,5 +1,6 @@
 package com.diagbot.web;
 
+import com.alibaba.fastjson.JSONObject;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.client.bean.ResponseData;
 import com.diagbot.dto.PushDTO;
@@ -9,6 +10,7 @@ import com.diagbot.enums.InputModeEnum;
 import com.diagbot.facade.PushFacade;
 import com.diagbot.vo.PushKYJVO;
 import com.diagbot.vo.PushVO;
+import com.google.common.collect.Lists;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,8 +18,11 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
 
 import javax.validation.Valid;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Description:推理接口
@@ -122,4 +127,20 @@ public class PushController {
     public RespDTO<PushKYJDTO> pushKYJ(@RequestBody @Valid PushKYJVO pushKYJVO) {
         return RespDTO.onSuc(pushFacade.pushKYJ(pushKYJVO));
     }
+
+    @PostMapping("/getScaleContent")
+    @SysLogger("getScaleContent")
+    @ApiIgnore
+    public RespDTO<String> getScaleContent(@RequestBody @Valid PushVO pushVO) {
+        return RespDTO.onSuc(pushFacade.getScaleContent(pushVO));
+    }
+
+    @PostMapping("/getManagementEvaluationContent")
+    @SysLogger("getManagementEvaluationContent")
+    @ApiIgnore
+    public RespDTO<Map<String, JSONObject>> getManagementEvaluationContent(@RequestBody @Valid PushVO pushVO) {
+        List<String> titles = Lists.newLinkedList();
+        titles.add("疗效评估");
+        return RespDTO.onSuc(pushFacade.getManagementEvaluationContent(pushVO, titles));
+    }
 }

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

@@ -28,6 +28,7 @@ import java.util.List;
 @RestController
 @RequestMapping("/diseaseIcd")
 @Api(value = "对应的诊断icd API", tags = { "对应的诊断icd API" })
+@SuppressWarnings("unchecked")
 public class TranDiseaseIcdController {
     @Autowired
     TranDiseaseIcdFacade tranDiseaseIcdFacade;

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

@@ -24,6 +24,7 @@ import javax.validation.Valid;
 @RestController
 @RequestMapping("/treatment")
 @Api(value = "治疗方案相关API", tags = { "治疗方案相关API" })
+@SuppressWarnings("unchecked")
 public class TreatmentController {
     @Autowired
     TreatmentFacade treatmentFacade;

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

@@ -11,12 +11,13 @@
         <result column="creator" property="creator" />
         <result column="modifier" property="modifier" />
         <result column="dis_id" property="disId" />
+        <result column="parent_id" property="parentId" />
         <result column="type" property="type" />
         <result column="remark" property="remark" />
     </resultMap>
 
     <select id="getDisType" resultType="com.diagbot.dto.DisDTO">
-        SELECT a.type,b.name,b.id,b.tag_type FROM `icss_dis_type` a, icss_question_info b
+        SELECT a.type,a.parent_id,b.name,b.id,b.tag_type FROM `icss_dis_type` a, icss_question_info b
         where a.dis_id = b.id and a.is_deleted = 'N' and b.is_deleted = 'N' order by a.type
     </select>
 </mapper>

icss-service/src/main/resources/mapper/InquiryDrugMapper.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.InquiryDrugMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.InquiryDrug">
+        <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="inquiry_id" property="inquiryId" />
+        <result column="question_id" property="questionId" />
+        <result column="tag_name" property="tagName" />
+        <result column="remark" property="remark" />
+    </resultMap>
+
+</mapper>

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

@@ -0,0 +1,18 @@
+<?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.InquiryEvaluationMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.InquiryEvaluation">
+        <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="inquiry_id" property="inquiryId" />
+        <result column="html_content" property="htmlContent" />
+        <result column="remark" property="remark" />
+    </resultMap>
+
+</mapper>

icss-service/src/main/resources/mapper/InquiryScaleMapper.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.InquiryScaleMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.InquiryScale">
+        <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="inquiry_id" property="inquiryId" />
+        <result column="inquiry_evaluation_id" property="inquiryEvaluationId" />
+        <result column="scale_id" property="scaleId" />
+        <result column="html_content" property="htmlContent" />
+        <result column="remark" property="remark" />
+    </resultMap>
+
+</mapper>

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

@@ -0,0 +1,15 @@
+<?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.ScaleContentMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.ScaleContent">
+        <id column="id" property="id" />
+        <result column="scale_id" property="scaleId" />
+        <result column="content" property="content" />
+        <result column="type" property="type" />
+        <result column="order_no" property="orderNo" />
+        <result column="remark" property="remark" />
+    </resultMap>
+
+</mapper>

icss-service/src/test/java/com/diagbot/CodeGeneration.java

@@ -56,7 +56,7 @@ public class CodeGeneration {
         StrategyConfig strategy = new StrategyConfig();
         strategy.setTablePrefix(new String[] { "icss_" });// 此处可以修改为您的表前缀
         strategy.setNaming(NamingStrategy.underline_to_camel);// 表名生成策略
-        strategy.setInclude(new String[] { "icss_dis_scale" }); // 需要生成的表
+        strategy.setInclude(new String[] { "icss_scale_content" }); // 需要生成的表
 
         strategy.setSuperServiceClass(null);
         strategy.setSuperServiceImplClass(null);

tran-service/src/main/java/com/diagbot/web/TranDiseaseIcdController.java

@@ -29,6 +29,7 @@ import java.util.List;
 @RestController
 @RequestMapping("/diseaseIcd")
 @Api(value = "对应的诊断icd API", tags = { "对应的诊断icd API" })
+@SuppressWarnings("unchecked")
 public class TranDiseaseIcdController {
     @Autowired
     TranDiseaseIcdFacade diseaseIcdFacade;