diff --git a/virtual-patient-model/src/main/java/com/supervision/model/MedicalRec.java b/virtual-patient-model/src/main/java/com/supervision/model/MedicalRec.java index d0a39116..0855da6e 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/MedicalRec.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/MedicalRec.java @@ -1,15 +1,13 @@ package com.supervision.model; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; -import java.util.List; +import java.util.Date; import com.baomidou.mybatisplus.extension.activerecord.Model; -import com.supervision.handler.StringListTypeHandler; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -32,6 +30,61 @@ public class MedicalRec extends Model<MedicalRec> implements Serializable { */ private String no; + /** + * 姓名 + */ + private String patientName; + + /** + * 性别 0:女 1:男 + */ + private String patientGender; + + /** + * 年龄 + */ + private Integer patientAge; + + /** + * 婚姻状况 0:未婚 1:已婚 + */ + private String patientMarriage; + + /** + * 职业 + */ + private String patientProfession; + + /** + * 电话 + */ + private String patientPhone; + + /** + * 籍贯 + */ + private String nativePlace; + + /** + * 民族 + */ + private String patientNation; + + /** + * 邮编 + */ + private String patientPostcode; + + /** + * 出生地 + */ + private String patientBirthplace; + + /** + * 现居住地址 + */ + private String patientHabitation; + /** * 病人ID */ @@ -64,6 +117,26 @@ public class MedicalRec extends Model<MedicalRec> implements Serializable { @ApiModelProperty("全面检查") private String fullCheck; + /** + * 创建人ID + */ + private String createUserId; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 更新人 + */ + private String updateUserId; + + /** + * 更新时间 + */ + private Date updateTime; + @TableField(exist = false) private static final long serialVersionUID = 1L; } \ No newline at end of file diff --git a/virtual-patient-model/src/main/resources/mapper/MedicalRecMapper.xml b/virtual-patient-model/src/main/resources/mapper/MedicalRecMapper.xml index 135d3df8..6d31215c 100644 --- a/virtual-patient-model/src/main/resources/mapper/MedicalRecMapper.xml +++ b/virtual-patient-model/src/main/resources/mapper/MedicalRecMapper.xml @@ -8,22 +8,43 @@ <id property="id" column="id" jdbcType="VARCHAR"/> <result property="no" column="no" jdbcType="VARCHAR"/> <result property="patientId" column="patient_id" jdbcType="VARCHAR"/> + <result property="patientName" column="patient_name" jdbcType="VARCHAR"/> + <result property="patientGender" column="patient_gender" jdbcType="VARCHAR"/> + <result property="patientAge" column="patient_age" jdbcType="INTEGER"/> + <result property="patientMarriage" column="patient_marriage" jdbcType="VARCHAR"/> + <result property="patientProfession" column="patient_profession" jdbcType="VARCHAR"/> + <result property="patientPhone" column="patient_phone" jdbcType="VARCHAR"/> + <result property="nativePlace" column="native_place" jdbcType="VARCHAR"/> + <result property="patientNation" column="patient_nation" jdbcType="VARCHAR"/> + <result property="patientPostcode" column="patient_postcode" jdbcType="VARCHAR"/> + <result property="patientBirthplace" column="patient_birthplace" jdbcType="VARCHAR"/> + <result property="patientHabitation" column="patient_habitation" jdbcType="VARCHAR"/> <result property="diseaseId" column="disease_id" jdbcType="VARCHAR"/> <result property="patientSelfDesc" column="patient_self_desc" jdbcType="VARCHAR"/> <result property="symptoms" column="symptoms" jdbcType="VARCHAR"/> <result property="primarilyDiagnosisCriteria" column="primarily_diagnosis_criteria" jdbcType="VARCHAR"/> <result property="confirmDiagnosisCriteria" column="confirm_diagnosis_criteria" jdbcType="VARCHAR"/> <result property="differentialDiagnosisCriteria" column="differential_diagnosis_criteria" jdbcType="VARCHAR"/> - + <result property="fullCheck" column="full_check" jdbcType="VARCHAR"/> + <result property="createUserId" column="create_user_id" jdbcType="VARCHAR"/> + <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/> + <result property="updateUserId" column="update_user_id" jdbcType="VARCHAR"/> + <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/> </resultMap> <sql id="Base_Column_List"> - id - ,no,patient_id, + id,no,patient_id, + patient_name,patient_gender,patient_age, + patient_marriage,patient_profession,patient_phone, + native_place,patient_nation,patient_postcode, + patient_birthplace,patient_habitation,disease_id, patient_self_desc,symptoms,primarily_diagnosis_criteria, - confirm_diagnosis_criteria,confirm_diagnosis_criteria + confirm_diagnosis_criteria,differential_diagnosis_criteria,full_check, + create_user_id,create_time,update_user_id, + update_time </sql> + <update id="updateMedicalRecNo"> UPDATE vp_medical_rec SET no = CONCAT(#{code}, LPAD(