diff --git a/tcm/src/main/java/com/ccsens/tcm/bean/dto/PatientDto.java b/tcm/src/main/java/com/ccsens/tcm/bean/dto/PatientDto.java index 61412509..5b105cf2 100644 --- a/tcm/src/main/java/com/ccsens/tcm/bean/dto/PatientDto.java +++ b/tcm/src/main/java/com/ccsens/tcm/bean/dto/PatientDto.java @@ -69,7 +69,8 @@ public class PatientDto { private Long testQuestionsId; @ApiModelProperty("内容") private String contents; - + @ApiModelProperty("内容的类型 默认为0 0普通的选项或填写的内容,1关联的其他信息,2题目的说明信息") + private byte contentsType = 0; } @Data @ApiModel("查询的患者基本信息") diff --git a/tcm/src/main/java/com/ccsens/tcm/bean/po/PatientRecord.java b/tcm/src/main/java/com/ccsens/tcm/bean/po/PatientRecord.java index 3b6645c0..eb193ecf 100644 --- a/tcm/src/main/java/com/ccsens/tcm/bean/po/PatientRecord.java +++ b/tcm/src/main/java/com/ccsens/tcm/bean/po/PatientRecord.java @@ -24,6 +24,8 @@ public class PatientRecord implements Serializable { private Byte recStatus; + private Byte contentsType; + private static final long serialVersionUID = 1L; public Long getId() { @@ -106,6 +108,14 @@ public class PatientRecord implements Serializable { this.recStatus = recStatus; } + public Byte getContentsType() { + return contentsType; + } + + public void setContentsType(Byte contentsType) { + this.contentsType = contentsType; + } + @Override public String toString() { StringBuilder sb = new StringBuilder(); @@ -122,6 +132,7 @@ public class PatientRecord implements Serializable { sb.append(", createdAt=").append(createdAt); sb.append(", updateAt=").append(updateAt); sb.append(", recStatus=").append(recStatus); + sb.append(", contentsType=").append(contentsType); sb.append("]"); return sb.toString(); } diff --git a/tcm/src/main/java/com/ccsens/tcm/bean/po/PatientRecordExample.java b/tcm/src/main/java/com/ccsens/tcm/bean/po/PatientRecordExample.java index 7e94183f..21c67b84 100644 --- a/tcm/src/main/java/com/ccsens/tcm/bean/po/PatientRecordExample.java +++ b/tcm/src/main/java/com/ccsens/tcm/bean/po/PatientRecordExample.java @@ -714,6 +714,66 @@ public class PatientRecordExample { addCriterion("rec_status not between", value1, value2, "recStatus"); return (Criteria) this; } + + public Criteria andContentsTypeIsNull() { + addCriterion("contents_type is null"); + return (Criteria) this; + } + + public Criteria andContentsTypeIsNotNull() { + addCriterion("contents_type is not null"); + return (Criteria) this; + } + + public Criteria andContentsTypeEqualTo(Byte value) { + addCriterion("contents_type =", value, "contentsType"); + return (Criteria) this; + } + + public Criteria andContentsTypeNotEqualTo(Byte value) { + addCriterion("contents_type <>", value, "contentsType"); + return (Criteria) this; + } + + public Criteria andContentsTypeGreaterThan(Byte value) { + addCriterion("contents_type >", value, "contentsType"); + return (Criteria) this; + } + + public Criteria andContentsTypeGreaterThanOrEqualTo(Byte value) { + addCriterion("contents_type >=", value, "contentsType"); + return (Criteria) this; + } + + public Criteria andContentsTypeLessThan(Byte value) { + addCriterion("contents_type <", value, "contentsType"); + return (Criteria) this; + } + + public Criteria andContentsTypeLessThanOrEqualTo(Byte value) { + addCriterion("contents_type <=", value, "contentsType"); + return (Criteria) this; + } + + public Criteria andContentsTypeIn(List values) { + addCriterion("contents_type in", values, "contentsType"); + return (Criteria) this; + } + + public Criteria andContentsTypeNotIn(List values) { + addCriterion("contents_type not in", values, "contentsType"); + return (Criteria) this; + } + + public Criteria andContentsTypeBetween(Byte value1, Byte value2) { + addCriterion("contents_type between", value1, value2, "contentsType"); + return (Criteria) this; + } + + public Criteria andContentsTypeNotBetween(Byte value1, Byte value2) { + addCriterion("contents_type not between", value1, value2, "contentsType"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { diff --git a/tcm/src/main/resources/mapper_raw/PatientRecordMapper.xml b/tcm/src/main/resources/mapper_raw/PatientRecordMapper.xml index 65bb6e48..34320376 100644 --- a/tcm/src/main/resources/mapper_raw/PatientRecordMapper.xml +++ b/tcm/src/main/resources/mapper_raw/PatientRecordMapper.xml @@ -12,6 +12,7 @@ + @@ -73,7 +74,7 @@ id, patient_id, test_questions_id, contents, user_id, collect_time, time_slot, created_at, - update_at, rec_status + update_at, rec_status, contents_type @@ -221,6 +228,9 @@ rec_status = #{record.recStatus,jdbcType=TINYINT}, + + contents_type = #{record.contentsType,jdbcType=TINYINT}, + @@ -237,7 +247,8 @@ time_slot = #{record.timeSlot,jdbcType=TIMESTAMP}, created_at = #{record.createdAt,jdbcType=TIMESTAMP}, update_at = #{record.updateAt,jdbcType=TIMESTAMP}, - rec_status = #{record.recStatus,jdbcType=TINYINT} + rec_status = #{record.recStatus,jdbcType=TINYINT}, + contents_type = #{record.contentsType,jdbcType=TINYINT} @@ -272,6 +283,9 @@ rec_status = #{recStatus,jdbcType=TINYINT}, + + contents_type = #{contentsType,jdbcType=TINYINT}, + where id = #{id,jdbcType=BIGINT} @@ -285,7 +299,8 @@ time_slot = #{timeSlot,jdbcType=TIMESTAMP}, created_at = #{createdAt,jdbcType=TIMESTAMP}, update_at = #{updateAt,jdbcType=TIMESTAMP}, - rec_status = #{recStatus,jdbcType=TINYINT} + rec_status = #{recStatus,jdbcType=TINYINT}, + contents_type = #{contentsType,jdbcType=TINYINT} where id = #{id,jdbcType=BIGINT} \ No newline at end of file