diff --git a/tcm/src/main/java/com/ccsens/tcm/api/PatientController.java b/tcm/src/main/java/com/ccsens/tcm/api/PatientController.java index 3effde29..ec83a2a5 100644 --- a/tcm/src/main/java/com/ccsens/tcm/api/PatientController.java +++ b/tcm/src/main/java/com/ccsens/tcm/api/PatientController.java @@ -1,5 +1,6 @@ package com.ccsens.tcm.api; +import cn.hutool.core.lang.Snowflake; import io.swagger.annotations.Api; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/tcm/src/main/java/com/ccsens/tcm/bean/po/ReportCode.java b/tcm/src/main/java/com/ccsens/tcm/bean/po/ReportCode.java index f2ce8459..2cda23fc 100644 --- a/tcm/src/main/java/com/ccsens/tcm/bean/po/ReportCode.java +++ b/tcm/src/main/java/com/ccsens/tcm/bean/po/ReportCode.java @@ -10,7 +10,7 @@ public class ReportCode implements Serializable { private String name; - private String parentId; + private String parentCode; private Byte must; @@ -20,6 +20,8 @@ public class ReportCode implements Serializable { private String remark; + private Byte reportType; + private Long operator; private Date createdAt; @@ -54,12 +56,12 @@ public class ReportCode implements Serializable { this.name = name == null ? null : name.trim(); } - public String getParentId() { - return parentId; + public String getParentCode() { + return parentCode; } - public void setParentId(String parentId) { - this.parentId = parentId == null ? null : parentId.trim(); + public void setParentCode(String parentCode) { + this.parentCode = parentCode == null ? null : parentCode.trim(); } public Byte getMust() { @@ -94,6 +96,14 @@ public class ReportCode implements Serializable { this.remark = remark == null ? null : remark.trim(); } + public Byte getReportType() { + return reportType; + } + + public void setReportType(Byte reportType) { + this.reportType = reportType; + } + public Long getOperator() { return operator; } @@ -135,11 +145,12 @@ public class ReportCode implements Serializable { sb.append(", id=").append(id); sb.append(", code=").append(code); sb.append(", name=").append(name); - sb.append(", parentId=").append(parentId); + sb.append(", parentCode=").append(parentCode); sb.append(", must=").append(must); sb.append(", level=").append(level); sb.append(", sort=").append(sort); sb.append(", remark=").append(remark); + sb.append(", reportType=").append(reportType); sb.append(", operator=").append(operator); sb.append(", createdAt=").append(createdAt); sb.append(", updatedAt=").append(updatedAt); diff --git a/tcm/src/main/java/com/ccsens/tcm/bean/po/ReportCodeExample.java b/tcm/src/main/java/com/ccsens/tcm/bean/po/ReportCodeExample.java index d17bb563..faaac339 100644 --- a/tcm/src/main/java/com/ccsens/tcm/bean/po/ReportCodeExample.java +++ b/tcm/src/main/java/com/ccsens/tcm/bean/po/ReportCodeExample.java @@ -305,73 +305,73 @@ public class ReportCodeExample { return (Criteria) this; } - public Criteria andParentIdIsNull() { - addCriterion("parent_id is null"); + public Criteria andParentCodeIsNull() { + addCriterion("parent_code is null"); return (Criteria) this; } - public Criteria andParentIdIsNotNull() { - addCriterion("parent_id is not null"); + public Criteria andParentCodeIsNotNull() { + addCriterion("parent_code is not null"); return (Criteria) this; } - public Criteria andParentIdEqualTo(String value) { - addCriterion("parent_id =", value, "parentId"); + public Criteria andParentCodeEqualTo(String value) { + addCriterion("parent_code =", value, "parentCode"); return (Criteria) this; } - public Criteria andParentIdNotEqualTo(String value) { - addCriterion("parent_id <>", value, "parentId"); + public Criteria andParentCodeNotEqualTo(String value) { + addCriterion("parent_code <>", value, "parentCode"); return (Criteria) this; } - public Criteria andParentIdGreaterThan(String value) { - addCriterion("parent_id >", value, "parentId"); + public Criteria andParentCodeGreaterThan(String value) { + addCriterion("parent_code >", value, "parentCode"); return (Criteria) this; } - public Criteria andParentIdGreaterThanOrEqualTo(String value) { - addCriterion("parent_id >=", value, "parentId"); + public Criteria andParentCodeGreaterThanOrEqualTo(String value) { + addCriterion("parent_code >=", value, "parentCode"); return (Criteria) this; } - public Criteria andParentIdLessThan(String value) { - addCriterion("parent_id <", value, "parentId"); + public Criteria andParentCodeLessThan(String value) { + addCriterion("parent_code <", value, "parentCode"); return (Criteria) this; } - public Criteria andParentIdLessThanOrEqualTo(String value) { - addCriterion("parent_id <=", value, "parentId"); + public Criteria andParentCodeLessThanOrEqualTo(String value) { + addCriterion("parent_code <=", value, "parentCode"); return (Criteria) this; } - public Criteria andParentIdLike(String value) { - addCriterion("parent_id like", value, "parentId"); + public Criteria andParentCodeLike(String value) { + addCriterion("parent_code like", value, "parentCode"); return (Criteria) this; } - public Criteria andParentIdNotLike(String value) { - addCriterion("parent_id not like", value, "parentId"); + public Criteria andParentCodeNotLike(String value) { + addCriterion("parent_code not like", value, "parentCode"); return (Criteria) this; } - public Criteria andParentIdIn(List values) { - addCriterion("parent_id in", values, "parentId"); + public Criteria andParentCodeIn(List values) { + addCriterion("parent_code in", values, "parentCode"); return (Criteria) this; } - public Criteria andParentIdNotIn(List values) { - addCriterion("parent_id not in", values, "parentId"); + public Criteria andParentCodeNotIn(List values) { + addCriterion("parent_code not in", values, "parentCode"); return (Criteria) this; } - public Criteria andParentIdBetween(String value1, String value2) { - addCriterion("parent_id between", value1, value2, "parentId"); + public Criteria andParentCodeBetween(String value1, String value2) { + addCriterion("parent_code between", value1, value2, "parentCode"); return (Criteria) this; } - public Criteria andParentIdNotBetween(String value1, String value2) { - addCriterion("parent_id not between", value1, value2, "parentId"); + public Criteria andParentCodeNotBetween(String value1, String value2) { + addCriterion("parent_code not between", value1, value2, "parentCode"); return (Criteria) this; } @@ -625,6 +625,66 @@ public class ReportCodeExample { return (Criteria) this; } + public Criteria andReportTypeIsNull() { + addCriterion("report_type is null"); + return (Criteria) this; + } + + public Criteria andReportTypeIsNotNull() { + addCriterion("report_type is not null"); + return (Criteria) this; + } + + public Criteria andReportTypeEqualTo(Byte value) { + addCriterion("report_type =", value, "reportType"); + return (Criteria) this; + } + + public Criteria andReportTypeNotEqualTo(Byte value) { + addCriterion("report_type <>", value, "reportType"); + return (Criteria) this; + } + + public Criteria andReportTypeGreaterThan(Byte value) { + addCriterion("report_type >", value, "reportType"); + return (Criteria) this; + } + + public Criteria andReportTypeGreaterThanOrEqualTo(Byte value) { + addCriterion("report_type >=", value, "reportType"); + return (Criteria) this; + } + + public Criteria andReportTypeLessThan(Byte value) { + addCriterion("report_type <", value, "reportType"); + return (Criteria) this; + } + + public Criteria andReportTypeLessThanOrEqualTo(Byte value) { + addCriterion("report_type <=", value, "reportType"); + return (Criteria) this; + } + + public Criteria andReportTypeIn(List values) { + addCriterion("report_type in", values, "reportType"); + return (Criteria) this; + } + + public Criteria andReportTypeNotIn(List values) { + addCriterion("report_type not in", values, "reportType"); + return (Criteria) this; + } + + public Criteria andReportTypeBetween(Byte value1, Byte value2) { + addCriterion("report_type between", value1, value2, "reportType"); + return (Criteria) this; + } + + public Criteria andReportTypeNotBetween(Byte value1, Byte value2) { + addCriterion("report_type not between", value1, value2, "reportType"); + return (Criteria) this; + } + public Criteria andOperatorIsNull() { addCriterion("operator is null"); return (Criteria) this; diff --git a/tcm/src/main/resources/mapper_raw/ReportCodeMapper.xml b/tcm/src/main/resources/mapper_raw/ReportCodeMapper.xml index 5310c71d..46115637 100644 --- a/tcm/src/main/resources/mapper_raw/ReportCodeMapper.xml +++ b/tcm/src/main/resources/mapper_raw/ReportCodeMapper.xml @@ -5,11 +5,12 @@ - + + @@ -74,8 +75,8 @@ - id, code, name, parent_id, must, level, sort, remark, operator, created_at, updated_at, - rec_status + id, code, name, parent_code, must, level, sort, remark, report_type, operator, created_at, + updated_at, rec_status