20210128v1.1

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;

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);

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<String> values) {
-            addCriterion("parent_id in", values, "parentId");
+        public Criteria andParentCodeIn(List<String> values) {
+            addCriterion("parent_code in", values, "parentCode");
             return (Criteria) this;
         }
 
-        public Criteria andParentIdNotIn(List<String> values) {
-            addCriterion("parent_id not in", values, "parentId");
+        public Criteria andParentCodeNotIn(List<String> 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<Byte> values) {
+            addCriterion("report_type in", values, "reportType");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportTypeNotIn(List<Byte> 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;

tcm/src/main/resources/mapper_raw/ReportCodeMapper.xml

@@ -5,11 +5,12 @@
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="code" jdbcType="VARCHAR" property="code" />
     <result column="name" jdbcType="VARCHAR" property="name" />
-    <result column="parent_id" jdbcType="VARCHAR" property="parentId" />
+    <result column="parent_code" jdbcType="VARCHAR" property="parentCode" />
     <result column="must" jdbcType="TINYINT" property="must" />
     <result column="level" jdbcType="TINYINT" property="level" />
     <result column="sort" jdbcType="INTEGER" property="sort" />
     <result column="remark" jdbcType="VARCHAR" property="remark" />
+    <result column="report_type" jdbcType="TINYINT" property="reportType" />
     <result column="operator" jdbcType="BIGINT" property="operator" />
     <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
     <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
@@ -74,8 +75,8 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    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
   </sql>
   <select id="selectByExample" parameterType="com.ccsens.tcm.bean.po.ReportCodeExample" resultMap="BaseResultMap">
     select
@@ -109,15 +110,15 @@
   </delete>
   <insert id="insert" parameterType="com.ccsens.tcm.bean.po.ReportCode">
     insert into t_report_code (id, code, name, 
-      parent_id, must, level, 
-      sort, remark, operator, 
-      created_at, updated_at, rec_status
-      )
+      parent_code, must, level, 
+      sort, remark, report_type, 
+      operator, created_at, updated_at, 
+      rec_status)
     values (#{id,jdbcType=BIGINT}, #{code,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, 
-      #{parentId,jdbcType=VARCHAR}, #{must,jdbcType=TINYINT}, #{level,jdbcType=TINYINT}, 
-      #{sort,jdbcType=INTEGER}, #{remark,jdbcType=VARCHAR}, #{operator,jdbcType=BIGINT}, 
-      #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}
-      )
+      #{parentCode,jdbcType=VARCHAR}, #{must,jdbcType=TINYINT}, #{level,jdbcType=TINYINT}, 
+      #{sort,jdbcType=INTEGER}, #{remark,jdbcType=VARCHAR}, #{reportType,jdbcType=TINYINT}, 
+      #{operator,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, 
+      #{recStatus,jdbcType=TINYINT})
   </insert>
   <insert id="insertSelective" parameterType="com.ccsens.tcm.bean.po.ReportCode">
     insert into t_report_code
@@ -131,8 +132,8 @@
       <if test="name != null">
         name,
       </if>
-      <if test="parentId != null">
-        parent_id,
+      <if test="parentCode != null">
+        parent_code,
       </if>
       <if test="must != null">
         must,
@@ -146,6 +147,9 @@
       <if test="remark != null">
         remark,
       </if>
+      <if test="reportType != null">
+        report_type,
+      </if>
       <if test="operator != null">
         operator,
       </if>
@@ -169,8 +173,8 @@
       <if test="name != null">
         #{name,jdbcType=VARCHAR},
       </if>
-      <if test="parentId != null">
-        #{parentId,jdbcType=VARCHAR},
+      <if test="parentCode != null">
+        #{parentCode,jdbcType=VARCHAR},
       </if>
       <if test="must != null">
         #{must,jdbcType=TINYINT},
@@ -184,6 +188,9 @@
       <if test="remark != null">
         #{remark,jdbcType=VARCHAR},
       </if>
+      <if test="reportType != null">
+        #{reportType,jdbcType=TINYINT},
+      </if>
       <if test="operator != null">
         #{operator,jdbcType=BIGINT},
       </if>
@@ -216,8 +223,8 @@
       <if test="record.name != null">
         name = #{record.name,jdbcType=VARCHAR},
       </if>
-      <if test="record.parentId != null">
-        parent_id = #{record.parentId,jdbcType=VARCHAR},
+      <if test="record.parentCode != null">
+        parent_code = #{record.parentCode,jdbcType=VARCHAR},
       </if>
       <if test="record.must != null">
         must = #{record.must,jdbcType=TINYINT},
@@ -231,6 +238,9 @@
       <if test="record.remark != null">
         remark = #{record.remark,jdbcType=VARCHAR},
       </if>
+      <if test="record.reportType != null">
+        report_type = #{record.reportType,jdbcType=TINYINT},
+      </if>
       <if test="record.operator != null">
         operator = #{record.operator,jdbcType=BIGINT},
       </if>
@@ -253,11 +263,12 @@
     set id = #{record.id,jdbcType=BIGINT},
       code = #{record.code,jdbcType=VARCHAR},
       name = #{record.name,jdbcType=VARCHAR},
-      parent_id = #{record.parentId,jdbcType=VARCHAR},
+      parent_code = #{record.parentCode,jdbcType=VARCHAR},
       must = #{record.must,jdbcType=TINYINT},
       level = #{record.level,jdbcType=TINYINT},
       sort = #{record.sort,jdbcType=INTEGER},
       remark = #{record.remark,jdbcType=VARCHAR},
+      report_type = #{record.reportType,jdbcType=TINYINT},
       operator = #{record.operator,jdbcType=BIGINT},
       created_at = #{record.createdAt,jdbcType=TIMESTAMP},
       updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
@@ -275,8 +286,8 @@
       <if test="name != null">
         name = #{name,jdbcType=VARCHAR},
       </if>
-      <if test="parentId != null">
-        parent_id = #{parentId,jdbcType=VARCHAR},
+      <if test="parentCode != null">
+        parent_code = #{parentCode,jdbcType=VARCHAR},
       </if>
       <if test="must != null">
         must = #{must,jdbcType=TINYINT},
@@ -290,6 +301,9 @@
       <if test="remark != null">
         remark = #{remark,jdbcType=VARCHAR},
       </if>
+      <if test="reportType != null">
+        report_type = #{reportType,jdbcType=TINYINT},
+      </if>
       <if test="operator != null">
         operator = #{operator,jdbcType=BIGINT},
       </if>
@@ -309,11 +323,12 @@
     update t_report_code
     set code = #{code,jdbcType=VARCHAR},
       name = #{name,jdbcType=VARCHAR},
-      parent_id = #{parentId,jdbcType=VARCHAR},
+      parent_code = #{parentCode,jdbcType=VARCHAR},
       must = #{must,jdbcType=TINYINT},
       level = #{level,jdbcType=TINYINT},
       sort = #{sort,jdbcType=INTEGER},
       remark = #{remark,jdbcType=VARCHAR},
+      report_type = #{reportType,jdbcType=TINYINT},
       operator = #{operator,jdbcType=BIGINT},
       created_at = #{createdAt,jdbcType=TIMESTAMP},
       updated_at = #{updatedAt,jdbcType=TIMESTAMP},