问诊记录保存修改

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

@@ -1,160 +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 +
-        "}";
-    }
-}
+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 zhoutg
+ * @since 2019-05-06
+ */
+@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 conceptId;
+
+    /**
+     * 药品概念名称
+     */
+    private String conceptName;
+
+    /**
+     * 备注
+     */
+    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 getConceptId() {
+        return conceptId;
+    }
+
+    public void setConceptId(Long conceptId) {
+        this.conceptId = conceptId;
+    }
+    public String getConceptName() {
+        return conceptName;
+    }
+
+    public void setConceptName(String conceptName) {
+        this.conceptName = conceptName;
+    }
+    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 +
+        ", conceptId=" + conceptId +
+        ", conceptName=" + conceptName +
+        ", remark=" + remark +
+        "}";
+    }
+}

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

@@ -1,173 +1,186 @@
-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 +
-        "}";
-    }
-}
+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 zhoutg
+ * @since 2019-05-06
+ */
+@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 conceptId;
+
+    /**
+     * 量表概念名称
+     */
+    private String conceptName;
+
+    /**
+     * 量表页面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 getConceptId() {
+        return conceptId;
+    }
+
+    public void setConceptId(Long conceptId) {
+        this.conceptId = conceptId;
+    }
+    public String getConceptName() {
+        return conceptName;
+    }
+
+    public void setConceptName(String conceptName) {
+        this.conceptName = conceptName;
+    }
+    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 +
+        ", conceptId=" + conceptId +
+        ", conceptName=" + conceptName +
+        ", htmlContent=" + htmlContent +
+        ", remark=" + remark +
+        "}";
+    }
+}

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

@@ -245,10 +245,10 @@ public class TreatmentFacade {
                 List<Medicition> medicitionList = Lists.newLinkedList();
                 for (InquiryDrug inquiryDrug : inquiryDrugList) {
                     Medicition medicition = new Medicition();
-                    medicition.setId(inquiryDrug.getQuestionId());
-                    medicition.setMedicitionName(inquiryDrug.getTagName());
+                    medicition.setId(inquiryDrug.getConceptId());
+                    medicition.setMedicitionName(inquiryDrug.getConceptName());
                     medicition.setIsShow("1");
-                    Boolean hasIntroduce = introduceMapFacade.hasIntroduceByQuestionName(inquiryDrug.getTagName(), QuestionTypeEnum.Drug.getKey());
+                    Boolean hasIntroduce = introduceMapFacade.hasIntroduceByQuestionName(inquiryDrug.getConceptName(), QuestionTypeEnum.Drug.getKey());
                     if (hasIntroduce) {
                         medicition.setShowInfo("1");
                     } else {

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

@@ -17,17 +17,17 @@ import lombok.Setter;
 public class SaveInquiryDrugVO {
 	
 	/**
-	 * 药品标签id
+	 * 药品概念id
 	 */
-    @NotNull(message="药品标签id必传")
-    @ApiModelProperty(value="药品标签id",required=true)
-    private Long questionId;
+    @NotNull(message="药品概念id必传")
+    @ApiModelProperty(value="药品概念id",required=true)
+    private Long conceptId;
 
     /**
-     * 药品标签名
+     * 药品概念名称
      */
-    @NotBlank(message="药品标签名必传")
-    @ApiModelProperty(value="药品标签名",required=true)
-    private String tagName;
+    @NotBlank(message="药品概念名称必传")
+    @ApiModelProperty(value="药品概念名称",required=true)
+    private String conceptName;
 
 }

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

@@ -20,14 +20,19 @@ import lombok.Setter;
 public class SaveInquiryScaleVO {
 	
 	/**
-     * 量表标签id
+     * 量表概念id
      */
-	@ApiModelProperty(value="量表标签id",required=true)
-	@NotNull(message="量表标签id必传")
-    private Long scaleId;
+	@ApiModelProperty(value="量表概念id",required=true)
+	@NotNull(message="量表概念id必传")
+    private Long conceptId;
 	
+    /**
+     * 量表概念名称
+     */
+	@NotBlank(message="量表概念名称必传")
+    @ApiModelProperty(value="量表概念名称",required=true)
+    private String conceptName;
 
-	
 	/**
      * 量表页面html内容
      */

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

@@ -11,8 +11,8 @@
         <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="concept_id" property="conceptId" />
+        <result column="concept_name" property="conceptName" />
         <result column="remark" property="remark" />
     </resultMap>
 

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

@@ -12,7 +12,8 @@
         <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="concept_id" property="conceptId" />
+        <result column="concept_name" property="conceptName" />
         <result column="html_content" property="htmlContent" />
         <result column="remark" property="remark" />
     </resultMap>

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

@@ -49,14 +49,14 @@ public class CodeGeneration {
         dsc.setDriverName("com.mysql.cj.jdbc.Driver");
         dsc.setUsername("root");
         dsc.setPassword("lantone");
-        dsc.setUrl("jdbc:mysql://192.168.2.236:3306/sys-icssncd?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8");
+        dsc.setUrl("jdbc:mysql://192.168.2.236:3306/sys-icss?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8");
         mpg.setDataSource(dsc);
 
         // 策略配置
         StrategyConfig strategy = new StrategyConfig();
         strategy.setTablePrefix(new String[] { "icss_" });// 此处可以修改为您的表前缀
         strategy.setNaming(NamingStrategy.underline_to_camel);// 表名生成策略
-        strategy.setInclude(new String[] { "icss_scale_content" }); // 需要生成的表
+        strategy.setInclude(new String[] { "icss_inquiry_drug","icss_inquiry_scale" }); // 需要生成的表
 
         strategy.setSuperServiceClass(null);
         strategy.setSuperServiceImplClass(null);