问诊记录对象修改

prec-service/src/main/java/com/diagbot/entity/InquiryInfo.java

@@ -1,11 +1,10 @@
 package com.diagbot.entity;
 
-import java.io.Serializable;
-import java.util.Date;
-
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
 
 /**
  * <p>
@@ -13,7 +12,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
  * </p>
  *
  * @author gaodm
- * @since 2019-06-21
+ * @since 2019-11-19
  */
 @TableName("prec_inquiry_info")
 public class InquiryInfo implements Serializable {
@@ -66,6 +65,21 @@ public class InquiryInfo implements Serializable {
      */
     private String hospitalName;
 
+    /**
+     * 子医院id
+     */
+    private Long sonHospitalId;
+
+    /**
+     * 子医院code
+     */
+    private String sonHospitalCode;
+
+    /**
+     * 子医院名称
+     */
+    private String sonHospitalName;
+
     /**
      * 医院科室id
      */
@@ -151,6 +165,11 @@ public class InquiryInfo implements Serializable {
      */
     private String dataJson;
 
+    /**
+     * 是否被引用：0-未引用；1-已引用
+     */
+    private Integer isQuoted;
+
     /**
      * 备注
      */
@@ -219,6 +238,27 @@ public class InquiryInfo implements Serializable {
     public void setHospitalName(String hospitalName) {
         this.hospitalName = hospitalName;
     }
+    public Long getSonHospitalId() {
+        return sonHospitalId;
+    }
+
+    public void setSonHospitalId(Long sonHospitalId) {
+        this.sonHospitalId = sonHospitalId;
+    }
+    public String getSonHospitalCode() {
+        return sonHospitalCode;
+    }
+
+    public void setSonHospitalCode(String sonHospitalCode) {
+        this.sonHospitalCode = sonHospitalCode;
+    }
+    public String getSonHospitalName() {
+        return sonHospitalName;
+    }
+
+    public void setSonHospitalName(String sonHospitalName) {
+        this.sonHospitalName = sonHospitalName;
+    }
     public Long getHospitalDeptId() {
         return hospitalDeptId;
     }
@@ -338,6 +378,13 @@ public class InquiryInfo implements Serializable {
     public void setDataJson(String dataJson) {
         this.dataJson = dataJson;
     }
+    public Integer getIsQuoted() {
+        return isQuoted;
+    }
+
+    public void setIsQuoted(Integer isQuoted) {
+        this.isQuoted = isQuoted;
+    }
     public String getRemark() {
         return remark;
     }
@@ -349,33 +396,37 @@ public class InquiryInfo implements Serializable {
     @Override
     public String toString() {
         return "InquiryInfo{" +
-        "id=" + id +
-        ", isDeleted=" + isDeleted +
-        ", gmtCreate=" + gmtCreate +
-        ", gmtModified=" + gmtModified +
-        ", creator=" + creator +
-        ", modifier=" + modifier +
-        ", hospitalId=" + hospitalId +
-        ", hospitalCode=" + hospitalCode +
-        ", hospitalName=" + hospitalName +
-        ", hospitalDeptId=" + hospitalDeptId +
-        ", hospitalDeptCode=" + hospitalDeptCode +
-        ", hospitalDeptName=" + hospitalDeptName +
-        ", doctorId=" + doctorId +
-        ", doctorCode=" + doctorCode +
-        ", doctorName=" + doctorName +
-        ", patientId=" + patientId +
-        ", patientCode=" + patientCode +
-        ", patientName=" + patientName +
-        ", patientSex=" + patientSex +
-        ", patientPhone=" + patientPhone +
-        ", patientBirthday=" + patientBirthday +
-        ", patientIdNo=" + patientIdNo +
-        ", inquiryCode=" + inquiryCode +
-        ", regVisitedState=" + regVisitedState +
-        ", type=" + type +
-        ", dataJson=" + dataJson +
-        ", remark=" + remark +
-        "}";
+                "id=" + id +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                ", hospitalId=" + hospitalId +
+                ", hospitalCode=" + hospitalCode +
+                ", hospitalName=" + hospitalName +
+                ", sonHospitalId=" + sonHospitalId +
+                ", sonHospitalCode=" + sonHospitalCode +
+                ", sonHospitalName=" + sonHospitalName +
+                ", hospitalDeptId=" + hospitalDeptId +
+                ", hospitalDeptCode=" + hospitalDeptCode +
+                ", hospitalDeptName=" + hospitalDeptName +
+                ", doctorId=" + doctorId +
+                ", doctorCode=" + doctorCode +
+                ", doctorName=" + doctorName +
+                ", patientId=" + patientId +
+                ", patientCode=" + patientCode +
+                ", patientName=" + patientName +
+                ", patientSex=" + patientSex +
+                ", patientPhone=" + patientPhone +
+                ", patientBirthday=" + patientBirthday +
+                ", patientIdNo=" + patientIdNo +
+                ", inquiryCode=" + inquiryCode +
+                ", regVisitedState=" + regVisitedState +
+                ", type=" + type +
+                ", dataJson=" + dataJson +
+                ", isQuoted=" + isQuoted +
+                ", remark=" + remark +
+                "}";
     }
 }

prec-service/src/main/resources/mapper/InquiryInfoMapper.xml

@@ -13,6 +13,9 @@
         <result column="hospital_id" property="hospitalId" />
         <result column="hospital_code" property="hospitalCode" />
         <result column="hospital_name" property="hospitalName" />
+        <result column="son_hospital_id" property="sonHospitalId" />
+        <result column="son_hospital_code" property="sonHospitalCode" />
+        <result column="son_hospital_name" property="sonHospitalName" />
         <result column="hospital_dept_id" property="hospitalDeptId" />
         <result column="hospital_dept_code" property="hospitalDeptCode" />
         <result column="hospital_dept_name" property="hospitalDeptName" />
@@ -30,6 +33,7 @@
         <result column="reg_visited_state" property="regVisitedState" />
         <result column="type" property="type" />
         <result column="data_json" property="dataJson" />
+        <result column="is_quoted" property="isQuoted" />
         <result column="remark" property="remark" />
     </resultMap>
 

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.generator.config.DataSourceConfig;
 import com.baomidou.mybatisplus.generator.config.GlobalConfig;
 import com.baomidou.mybatisplus.generator.config.PackageConfig;
 import com.baomidou.mybatisplus.generator.config.StrategyConfig;
+import com.baomidou.mybatisplus.generator.config.rules.DateType;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.baomidou.mybatisplus.generator.engine.FreemarkerTemplateEngine;
 
@@ -34,6 +35,7 @@ public class CodeGeneration {
         gc.setBaseResultMap(true);// XML ResultMap
         gc.setBaseColumnList(false);// XML columList
         gc.setAuthor("gaodm");// 作者
+        gc.setDateType(DateType.ONLY_DATE);
 
         // 自定义文件命名，注意 %s 会自动填充表实体属性！
         gc.setControllerName("%sController");
@@ -56,7 +58,7 @@ public class CodeGeneration {
         StrategyConfig strategy = new StrategyConfig();
         strategy.setTablePrefix(new String[] { "prec_" });// 此处可以修改为您的表前缀
         strategy.setNaming(NamingStrategy.underline_to_camel);// 表名生成策略
-        strategy.setInclude(new String[] { "prec_question_info" }); // 需要生成的表
+        strategy.setInclude(new String[] { "prec_inquiry_info" }); // 需要生成的表
 
         strategy.setSuperServiceClass(null);
         strategy.setSuperServiceImplClass(null);