Browse Source

1、删除无用代码

zhaops 4 years ago
parent
commit
14d48739cb

+ 6 - 17
src/main/java/com/diagbot/entity/DeptConfig.java

@@ -1,16 +1,11 @@
 package com.diagbot.entity;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.diagbot.util.StringUtil;
 import lombok.Getter;
 import lombok.Setter;
 
 import javax.validation.constraints.NotBlank;
-import javax.xml.ws.ServiceMode;
-import java.io.Serializable;
 import java.util.Date;
 import java.util.Objects;
 
@@ -22,17 +17,12 @@ import java.util.Objects;
  * @author zhaops
  * @since 2020-08-12
  */
-@TableName("tran_dept_config")
 @Getter
 @Setter
-public class DeptConfig implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
+public class DeptConfig {
     /**
      * 主键
      */
-    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
     /**
@@ -88,8 +78,7 @@ public class DeptConfig implements Serializable {
     /**
      * 对应项编码
      */
-    //@Excel(name = "对应项编码", width = 40, orderNum = "3")
-    private String uniqueCode;
+    private String code;
 
     /**
      * 是否匹配(0-未匹配、1-已匹配)
@@ -116,7 +105,7 @@ public class DeptConfig implements Serializable {
                 ", hisName=" + hisName +
                 ", hisCode=" + hisCode +
                 ", uniqueName=" + uniqueName +
-                ", uniqueCode=" + uniqueCode +
+                ", code=" + code +
                 "}";
     }
 
@@ -135,12 +124,12 @@ public class DeptConfig implements Serializable {
                 && Objects.equals(hisName, deptConfig.hisName)
                 && Objects.equals(hisCode, deptConfig.hisCode)
                 && Objects.equals(uniqueName, deptConfig.uniqueName)
-                && Objects.equals(uniqueCode, deptConfig.uniqueCode);
+                && Objects.equals(code, deptConfig.code);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(id, isDeleted, hospitalId, hisName, hisCode, uniqueName, uniqueCode);
+        return Objects.hash(id, isDeleted, hospitalId, hisName, hisCode, uniqueName, code);
     }
 
     public static boolean nonNull(DeptConfig o) {
@@ -149,6 +138,6 @@ public class DeptConfig implements Serializable {
                 && StringUtil.isBlank(o.hisName)
                 && StringUtil.isBlank(o.hisCode)
                 && StringUtil.isBlank(o.uniqueName)
-                && StringUtil.isBlank(o.uniqueCode)));
+                && StringUtil.isBlank(o.code)));
     }
 }

+ 6 - 15
src/main/java/com/diagbot/entity/DiseaseConfig.java

@@ -1,15 +1,11 @@
 package com.diagbot.entity;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.diagbot.util.StringUtil;
 import lombok.Getter;
 import lombok.Setter;
 
 import javax.validation.constraints.NotBlank;
-import java.io.Serializable;
 import java.util.Date;
 import java.util.Objects;
 
@@ -21,17 +17,12 @@ import java.util.Objects;
  * @author zhaops
  * @since 2020-07-28
  */
-@TableName("tran_disease_config")
 @Getter
 @Setter
-public class DiseaseConfig implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
+public class DiseaseConfig {
     /**
      * 主键
      */
-    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
     /**
@@ -82,7 +73,7 @@ public class DiseaseConfig implements Serializable {
      * ICD-10编码
      */
     @Excel(name = "ICD-10编码", width = 40, orderNum = "2", isImportField = "true")
-    private String icdCode;
+    private String code;
 
     /**
      * 是否匹配(0-未匹配、1-已匹配)
@@ -108,7 +99,7 @@ public class DiseaseConfig implements Serializable {
                 ", hospitalId=" + hospitalId +
                 ", hisName=" + hisName +
                 ", uniqueName=" + uniqueName +
-                ", icdCode=" + icdCode +
+                ", code=" + code +
                 ", isMatch=" + isMatch +
                 ", source=" + source +
                 "}";
@@ -128,12 +119,12 @@ public class DiseaseConfig implements Serializable {
                 && Objects.equals(hospitalId, diseaseConfig.hospitalId)
                 && Objects.equals(hisName, diseaseConfig.hisName)
                 && Objects.equals(uniqueName, diseaseConfig.uniqueName)
-                && Objects.equals(icdCode, diseaseConfig.icdCode);
+                && Objects.equals(code, diseaseConfig.code);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(id, isDeleted, hospitalId, hisName, uniqueName, icdCode);
+        return Objects.hash(id, isDeleted, hospitalId, hisName, uniqueName, code);
     }
 
     public static boolean nonNull(DiseaseConfig o) {
@@ -141,6 +132,6 @@ public class DiseaseConfig implements Serializable {
                 || (o.hospitalId == null
                 && StringUtil.isBlank(o.hisName)
                 && StringUtil.isBlank(o.uniqueName)
-                && StringUtil.isBlank(o.icdCode)));
+                && StringUtil.isBlank(o.code)));
     }
 }

+ 6 - 18
src/main/java/com/diagbot/entity/DrugConfig.java

@@ -2,16 +2,12 @@ package com.diagbot.entity;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
-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 com.diagbot.util.StringUtil;
 import lombok.Getter;
 import lombok.Setter;
 
 import javax.validation.constraints.NotBlank;
-import java.io.Serializable;
 import java.util.Date;
 import java.util.Objects;
 
@@ -23,17 +19,12 @@ import java.util.Objects;
  * @author zhaops
  * @since 2020-07-28
  */
-@TableName("tran_drug_config")
 @Getter
 @Setter
-public class DrugConfig implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
+public class DrugConfig {
     /**
      * 主键
      */
-    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
     /**
@@ -71,7 +62,6 @@ public class DrugConfig implements Serializable {
      */
     @Excel(name = "医院药品名称", width = 40, orderNum = "1", isImportField = "true")
     @NotBlank(message = "请输入医院药品名称")
-    //@Size(max = 80, min = 1,message = "医院药品名称长度需要在1-80字符长度之间")
     private String hisName;
 
     /**
@@ -79,14 +69,12 @@ public class DrugConfig implements Serializable {
      */
     @Excel(name = "标准药品名称", width = 40, orderNum = "2", isImportField = "true")
     @NotBlank(message = "请输入标准药品名称")
-    //@Size(max = 80, min = 1,message = "标准药品名称长度需要在1-80字符长度之间")
     private String uniqueName;
 
     /**
      * 标准编码
      */
-    //@Excel(name = "对应项编码", width = 40, orderNum = "3")
-    private String uniqueCode;
+    private String code;
 
     /**
      * 剂型
@@ -120,7 +108,7 @@ public class DrugConfig implements Serializable {
                 ", hospitalId=" + hospitalId +
                 ", hisName=" + hisName +
                 ", uniqueName=" + uniqueName +
-                ", uniqueCode=" + uniqueCode +
+                ", code=" + code +
                 ", form=" + form +
                 "}";
     }
@@ -140,12 +128,12 @@ public class DrugConfig implements Serializable {
                 && Objects.equals(hisName, drugConfig.hisName)
                 && Objects.equals(form, drugConfig.form)
                 && Objects.equals(uniqueName, drugConfig.uniqueName)
-                && Objects.equals(uniqueCode, drugConfig.uniqueCode);
+                && Objects.equals(code, drugConfig.code);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(id, isDeleted, hospitalId, hisName, form, uniqueName, uniqueCode);
+        return Objects.hash(id, isDeleted, hospitalId, hisName, form, uniqueName, code);
     }
 
     public static boolean nonNull(DrugConfig o) {
@@ -153,7 +141,7 @@ public class DrugConfig implements Serializable {
                 || (o.hospitalId == null
                 && StringUtil.isBlank(o.hisName)
                 && StringUtil.isBlank(o.uniqueName)
-                && StringUtil.isBlank(o.uniqueCode)
+                && StringUtil.isBlank(o.code)
                 && StringUtil.isBlank(o.form)));
     }
 }

+ 6 - 17
src/main/java/com/diagbot/entity/LisConfig.java

@@ -2,17 +2,12 @@ package com.diagbot.entity;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
-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 com.diagbot.util.StringUtil;
-import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 
 import javax.validation.constraints.NotBlank;
-import java.io.Serializable;
 import java.util.Date;
 import java.util.Objects;
 
@@ -24,18 +19,12 @@ import java.util.Objects;
  * @author zhaops
  * @since 2020-07-28
  */
-@Data
-@TableName("tran_lis_config")
 @Getter
 @Setter
-public class LisConfig implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
+public class LisConfig {
     /**
      * 主键
      */
-    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
     /**
@@ -93,7 +82,7 @@ public class LisConfig implements Serializable {
      * 对应项目编码
      */
     //@Excel(name = "对应项目编码", width = 40, orderNum = "3")
-    private String uniqueCode;
+    private String code;
 
     /**
      * 是否匹配(0-未匹配、1-已匹配)
@@ -120,7 +109,7 @@ public class LisConfig implements Serializable {
                 ", hisName=" + hisName +
                 ", hisDetailName=" + hisDetailName +
                 ", uniqueName=" + uniqueName +
-                ", uniqueCode=" + uniqueCode +
+                ", code=" + code +
                 "}";
     }
 
@@ -139,12 +128,12 @@ public class LisConfig implements Serializable {
                 && Objects.equals(hisName, lisConfig.hisName)
                 && Objects.equals(hisDetailName, lisConfig.hisDetailName)
                 && Objects.equals(uniqueName, lisConfig.uniqueName)
-                && Objects.equals(uniqueCode, lisConfig.uniqueCode);
+                && Objects.equals(code, lisConfig.code);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(id, isDeleted, hospitalId, hisName, hisDetailName, uniqueName, uniqueCode);
+        return Objects.hash(id, isDeleted, hospitalId, hisName, hisDetailName, uniqueName, code);
     }
 
     public static boolean nonNull(LisConfig o) {
@@ -153,6 +142,6 @@ public class LisConfig implements Serializable {
                 && StringUtil.isBlank(o.hisName)
                 && StringUtil.isBlank(o.hisDetailName)
                 && StringUtil.isBlank(o.uniqueName)
-                && StringUtil.isBlank(o.uniqueCode)));
+                && StringUtil.isBlank(o.code)));
     }
 }

+ 6 - 11
src/main/java/com/diagbot/entity/NurseConfig.java

@@ -21,17 +21,12 @@ import java.util.Objects;
  * @author zhaops
  * @since 2021-04-26
  */
-@TableName("tran_nurse_config")
 @Getter
 @Setter
-public class NurseConfig implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
+public class NurseConfig{
     /**
      * 主键
      */
-    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
     /**
@@ -81,7 +76,7 @@ public class NurseConfig implements Serializable {
     /**
      * 标准编码
      */
-    private String uniqueCode;
+    private String code;
 
     /**
      * 是否匹配(0-未匹配、1-已匹配)
@@ -107,7 +102,7 @@ public class NurseConfig implements Serializable {
                 ", hospitalId=" + hospitalId +
                 ", hisName=" + hisName +
                 ", uniqueName=" + uniqueName +
-                ", uniqueCode=" + uniqueCode +
+                ", code=" + code +
                 "}";
     }
 
@@ -125,12 +120,12 @@ public class NurseConfig implements Serializable {
                 && Objects.equals(hospitalId, nurseConfig.hospitalId)
                 && Objects.equals(hisName, nurseConfig.hisName)
                 && Objects.equals(uniqueName, nurseConfig.uniqueName)
-                && Objects.equals(uniqueCode, nurseConfig.uniqueCode);
+                && Objects.equals(code, nurseConfig.code);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(id, isDeleted, hospitalId, hisName, uniqueName, uniqueCode);
+        return Objects.hash(id, isDeleted, hospitalId, hisName, uniqueName, code);
     }
 
     public static boolean nonNull(NurseConfig o) {
@@ -138,6 +133,6 @@ public class NurseConfig implements Serializable {
                 || (o.hospitalId == null
                 && StringUtil.isBlank(o.hisName)
                 && StringUtil.isBlank(o.uniqueName)
-                && StringUtil.isBlank(o.uniqueCode)));
+                && StringUtil.isBlank(o.code)));
     }
 }

+ 6 - 11
src/main/java/com/diagbot/entity/OperationConfig.java

@@ -23,15 +23,10 @@ import java.util.Objects;
  */
 @Getter
 @Setter
-@TableName("tran_operation_config")
-public class OperationConfig implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
+public class OperationConfig{
     /**
      * 主键
      */
-    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
     /**
@@ -82,7 +77,7 @@ public class OperationConfig implements Serializable {
      * 对应项编码
      */
     //@Excel(name = "对应项编码", width = 40, orderNum = "2")
-    private String uniqueCode;
+    private String code;
 
     /**
      * 是否匹配(0-未匹配、1-已匹配)
@@ -109,7 +104,7 @@ public class OperationConfig implements Serializable {
                 ", hospitalId=" + hospitalId +
                 ", hisName=" + hisName +
                 ", uniqueName=" + uniqueName +
-                ", uniqueCode=" + uniqueCode +
+                ", code=" + code +
                 "}";
     }
 
@@ -127,12 +122,12 @@ public class OperationConfig implements Serializable {
                 && Objects.equals(hospitalId, operationConfig.hospitalId)
                 && Objects.equals(hisName, operationConfig.hisName)
                 && Objects.equals(uniqueName, operationConfig.uniqueName)
-                && Objects.equals(uniqueCode, operationConfig.uniqueCode);
+                && Objects.equals(code, operationConfig.code);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(id, isDeleted, hospitalId, hisName, uniqueName, uniqueCode);
+        return Objects.hash(id, isDeleted, hospitalId, hisName, uniqueName, code);
     }
 
     public static boolean nonNull(OperationConfig o) {
@@ -140,6 +135,6 @@ public class OperationConfig implements Serializable {
                 || (o.hospitalId == null
                 && StringUtil.isBlank(o.hisName)
                 && StringUtil.isBlank(o.uniqueName)
-                && StringUtil.isBlank(o.uniqueCode)));
+                && StringUtil.isBlank(o.code)));
     }
 }

+ 5 - 10
src/main/java/com/diagbot/entity/PacsConfig.java

@@ -23,15 +23,10 @@ import java.util.Objects;
  */
 @Getter
 @Setter
-@TableName("tran_pacs_config")
 public class PacsConfig implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
     /**
      * 主键
      */
-    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
     /**
@@ -82,7 +77,7 @@ public class PacsConfig implements Serializable {
      * 对应项编码
      */
     //@Excel(name = "对应项编码", width = 40, orderNum = "2")
-    private String uniqueCode;
+    private String code;
 
     /**
      * 是否匹配(0-未匹配、1-已匹配)
@@ -109,7 +104,7 @@ public class PacsConfig implements Serializable {
                 ", hospitalId=" + hospitalId +
                 ", hisName=" + hisName +
                 ", uniqueName=" + uniqueName +
-                ", uniqueCode=" + uniqueCode +
+                ", code=" + code +
                 "}";
     }
 
@@ -127,12 +122,12 @@ public class PacsConfig implements Serializable {
                 && Objects.equals(hospitalId, pacsConfig.hospitalId)
                 && Objects.equals(hisName, pacsConfig.hisName)
                 && Objects.equals(uniqueName, pacsConfig.uniqueName)
-                && Objects.equals(uniqueCode, pacsConfig.uniqueCode);
+                && Objects.equals(code, pacsConfig.code);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(id, isDeleted, hospitalId, hisName, uniqueName, uniqueCode);
+        return Objects.hash(id, isDeleted, hospitalId, hisName, uniqueName, code);
     }
 
     public static boolean nonNull(PacsConfig o) {
@@ -140,6 +135,6 @@ public class PacsConfig implements Serializable {
                 || (o.hospitalId == null
                 && StringUtil.isBlank(o.hisName)
                 && StringUtil.isBlank(o.uniqueName)
-                && StringUtil.isBlank(o.uniqueCode)));
+                && StringUtil.isBlank(o.code)));
     }
 }

+ 6 - 11
src/main/java/com/diagbot/entity/ScaleConfig.java

@@ -23,15 +23,10 @@ import java.util.Objects;
  */
 @Getter
 @Setter
-@TableName("tran_scale_config")
-public class ScaleConfig implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
+public class ScaleConfig{
     /**
      * 主键
      */
-    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
     /**
@@ -81,7 +76,7 @@ public class ScaleConfig implements Serializable {
     /**
      * 标准编码
      */
-    private String uniqueCode;
+    private String code;
 
     /**
      * 是否匹配(0-未匹配、1-已匹配)
@@ -108,7 +103,7 @@ public class ScaleConfig implements Serializable {
                 ", hospitalId=" + hospitalId +
                 ", hisName=" + hisName +
                 ", uniqueName=" + uniqueName +
-                ", uniqueCode=" + uniqueCode +
+                ", code=" + code +
                 "}";
     }
 
@@ -126,12 +121,12 @@ public class ScaleConfig implements Serializable {
                 && Objects.equals(hospitalId, scaleConfig.hospitalId)
                 && Objects.equals(hisName, scaleConfig.hisName)
                 && Objects.equals(uniqueName, scaleConfig.uniqueName)
-                && Objects.equals(uniqueCode, scaleConfig.uniqueCode);
+                && Objects.equals(code, scaleConfig.code);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(id, isDeleted, hospitalId, hisName, uniqueName, uniqueCode);
+        return Objects.hash(id, isDeleted, hospitalId, hisName, uniqueName, code);
     }
 
     public static boolean nonNull(ScaleConfig o) {
@@ -139,6 +134,6 @@ public class ScaleConfig implements Serializable {
                 || (o.hospitalId == null
                 && StringUtil.isBlank(o.hisName)
                 && StringUtil.isBlank(o.uniqueName)
-                && StringUtil.isBlank(o.uniqueCode)));
+                && StringUtil.isBlank(o.code)));
     }
 }

+ 6 - 11
src/main/java/com/diagbot/entity/TcmdiseaseConfig.java

@@ -23,15 +23,10 @@ import java.util.Objects;
  */
 @Getter
 @Setter
-@TableName("tran_tcmdisease_config")
-public class TcmdiseaseConfig implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
+public class TcmdiseaseConfig{
     /**
      * 主键
      */
-    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
     /**
@@ -82,7 +77,7 @@ public class TcmdiseaseConfig implements Serializable {
      * 标准编码
      */
     @Excel(name = "中医疾病代码", width = 40, orderNum = "2", isImportField = "true")
-    private String uniqueCode;
+    private String code;
 
     /**
      * 是否匹配(0-未匹配、1-已匹配)
@@ -108,7 +103,7 @@ public class TcmdiseaseConfig implements Serializable {
                 ", hospitalId=" + hospitalId +
                 ", hisName=" + hisName +
                 ", uniqueName=" + uniqueName +
-                ", uniqueCode=" + uniqueCode +
+                ", code=" + code +
                 "}";
     }
 
@@ -126,12 +121,12 @@ public class TcmdiseaseConfig implements Serializable {
                 && Objects.equals(hospitalId, tcmdiseaseConfig.hospitalId)
                 && Objects.equals(hisName, tcmdiseaseConfig.hisName)
                 && Objects.equals(uniqueName, tcmdiseaseConfig.uniqueName)
-                && Objects.equals(uniqueCode, tcmdiseaseConfig.uniqueCode);
+                && Objects.equals(code, tcmdiseaseConfig.code);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(id, isDeleted, hospitalId, hisName, uniqueName, uniqueCode);
+        return Objects.hash(id, isDeleted, hospitalId, hisName, uniqueName, code);
     }
 
     public static boolean nonNull(TcmdiseaseConfig o) {
@@ -139,6 +134,6 @@ public class TcmdiseaseConfig implements Serializable {
                 || (o.hospitalId == null
                 && StringUtil.isBlank(o.hisName)
                 && StringUtil.isBlank(o.uniqueName)
-                && StringUtil.isBlank(o.uniqueCode)));
+                && StringUtil.isBlank(o.code)));
     }
 }

+ 6 - 15
src/main/java/com/diagbot/entity/TcmsyndromeConfig.java

@@ -1,15 +1,11 @@
 package com.diagbot.entity;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.diagbot.util.StringUtil;
 import lombok.Getter;
 import lombok.Setter;
 
 import javax.validation.constraints.NotBlank;
-import java.io.Serializable;
 import java.util.Date;
 import java.util.Objects;
 
@@ -23,15 +19,10 @@ import java.util.Objects;
  */
 @Getter
 @Setter
-@TableName("tran_tcmsyndrome_config")
-public class TcmsyndromeConfig implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
+public class TcmsyndromeConfig {
     /**
      * 主键
      */
-    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
     /**
@@ -82,7 +73,7 @@ public class TcmsyndromeConfig implements Serializable {
      * 标准编码
      */
     @Excel(name = "中医证候代码", width = 40, orderNum = "2", isImportField = "true")
-    private String uniqueCode;
+    private String code;
 
     /**
      * 是否匹配(0-未匹配、1-已匹配)
@@ -108,7 +99,7 @@ public class TcmsyndromeConfig implements Serializable {
                 ", hospitalId=" + hospitalId +
                 ", hisName=" + hisName +
                 ", uniqueName=" + uniqueName +
-                ", uniqueCode=" + uniqueCode +
+                ", code=" + code +
                 "}";
     }
 
@@ -126,12 +117,12 @@ public class TcmsyndromeConfig implements Serializable {
                 && Objects.equals(hospitalId, tcmsyndromeConfig.hospitalId)
                 && Objects.equals(hisName, tcmsyndromeConfig.hisName)
                 && Objects.equals(uniqueName, tcmsyndromeConfig.uniqueName)
-                && Objects.equals(uniqueCode, tcmsyndromeConfig.uniqueCode);
+                && Objects.equals(code, tcmsyndromeConfig.code);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(id, isDeleted, hospitalId, hisName, uniqueName, uniqueCode);
+        return Objects.hash(id, isDeleted, hospitalId, hisName, uniqueName, code);
     }
 
     public static boolean nonNull(TcmsyndromeConfig o) {
@@ -139,6 +130,6 @@ public class TcmsyndromeConfig implements Serializable {
                 || (o.hospitalId == null
                 && StringUtil.isBlank(o.hisName)
                 && StringUtil.isBlank(o.uniqueName)
-                && StringUtil.isBlank(o.uniqueCode)));
+                && StringUtil.isBlank(o.code)));
     }
 }

+ 10 - 111
src/main/java/com/diagbot/entity/TransfusionConfig.java

@@ -1,13 +1,11 @@
 package com.diagbot.entity;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.diagbot.util.StringUtil;
+import lombok.Getter;
+import lombok.Setter;
 
 import javax.validation.constraints.NotBlank;
-import java.io.Serializable;
 import java.util.Date;
 import java.util.Objects;
 
@@ -19,15 +17,12 @@ import java.util.Objects;
  * @author zhaops
  * @since 2020-08-31
  */
-@TableName("tran_transfusion_config")
-public class TransfusionConfig implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
+@Getter
+@Setter
+public class TransfusionConfig {
     /**
      * 主键
      */
-    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
     /**
@@ -78,7 +73,7 @@ public class TransfusionConfig implements Serializable {
      * 对应项编码
      */
     //@Excel(name = "对应项编码", width = 40, orderNum = "2")
-    private String uniqueCode;
+    private String code;
 
     /**
      * 是否匹配(0-未匹配、1-已匹配)
@@ -92,102 +87,6 @@ public class TransfusionConfig implements Serializable {
     @Excel(name = "数据来源", width = 20, orderNum = "5", replace = { "标准词_1", "同义词_2", "编码_3", "历史数据_4", "相似词_5", "数据迁移_99", "_null" }, isImportField = "true")
     private Integer source;
 
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-
-    public Date getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(Date gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    public String getModifier() {
-        return modifier;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-
-    public Long getHospitalId() {
-        return hospitalId;
-    }
-
-    public void setHospitalId(Long hospitalId) {
-        this.hospitalId = hospitalId;
-    }
-
-    public String getHisName() {
-        return hisName;
-    }
-
-    public void setHisName(String hisName) {
-        this.hisName = hisName;
-    }
-
-    public String getUniqueName() {
-        return uniqueName;
-    }
-
-    public void setUniqueName(String uniqueName) {
-        this.uniqueName = uniqueName;
-    }
-
-    public String getUniqueCode() {
-        return uniqueCode;
-    }
-
-    public void setUniqueCode(String uniqueCode) {
-        this.uniqueCode = uniqueCode;
-    }
-
-    public Integer getIsMatch() {
-        return isMatch;
-    }
-
-    public void setIsMatch(Integer isMatch) {
-        this.isMatch = isMatch;
-    }
-
-    public Integer getSource() {
-        return source;
-    }
-
-    public void setSource(Integer source) {
-        this.source = source;
-    }
-
     @Override
     public String toString() {
         return "TransfusionConfig{" +
@@ -200,7 +99,7 @@ public class TransfusionConfig implements Serializable {
                 ", hospitalId=" + hospitalId +
                 ", hisName=" + hisName +
                 ", uniqueName=" + uniqueName +
-                ", uniqueCode=" + uniqueCode +
+                ", code=" + code +
                 "}";
     }
 
@@ -218,12 +117,12 @@ public class TransfusionConfig implements Serializable {
                 && Objects.equals(hospitalId, transfusionConfig.hospitalId)
                 && Objects.equals(hisName, transfusionConfig.hisName)
                 && Objects.equals(uniqueName, transfusionConfig.uniqueName)
-                && Objects.equals(uniqueCode, transfusionConfig.uniqueCode);
+                && Objects.equals(code, transfusionConfig.code);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(id, isDeleted, hospitalId, hisName, uniqueName, uniqueCode);
+        return Objects.hash(id, isDeleted, hospitalId, hisName, uniqueName, code);
     }
 
     public static boolean nonNull(TransfusionConfig o) {
@@ -231,6 +130,6 @@ public class TransfusionConfig implements Serializable {
                 || (o.hospitalId == null
                 && StringUtil.isBlank(o.hisName)
                 && StringUtil.isBlank(o.uniqueName)
-                && StringUtil.isBlank(o.uniqueCode)));
+                && StringUtil.isBlank(o.code)));
     }
 }