Merge branch 'dev/20220228_v3.0.1通用版_渠道管理第一期' into debug

daqe-center/src/main/java/com/lantone/daqe/dto/GetMatchingDiseasePageDTO.java

@@ -0,0 +1,34 @@
+package com.lantone.daqe.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+/**
+ * @Description: 匹配诊断信息列表-接口出参
+ * @Author songxl
+ * @Date 2022/3/3
+ */
+@ApiModel(value = "匹配诊断信息列表-接口出参")
+@Getter
+@Setter
+public class GetMatchingDiseasePageDTO implements Serializable {
+
+    private static final long serialVersionUID = -756152304208774350L;
+
+
+    @ApiModelProperty(value = "ICD-10编码")
+    private String icd10;
+
+    @ApiModelProperty(value = "标准诊断名称")
+    private String standard;
+
+    @ApiModelProperty(value = "同义词")
+    private String synonym;
+
+    @ApiModelProperty(value = "是否匹配，1-已匹配，0-未匹配")
+    private String isMapping;
+}

daqe-center/src/main/java/com/lantone/daqe/dto/GetMatchingDrugPageDTO.java

@@ -0,0 +1,34 @@
+package com.lantone.daqe.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+/**
+ * @Description: 匹配诊断信息列表-接口出参
+ * @Author songxl
+ * @Date 2022/3/3
+ */
+@ApiModel(value = "获取药品匹配分页列表-接口出参")
+@Getter
+@Setter
+public class GetMatchingDrugPageDTO implements Serializable {
+
+    private static final long serialVersionUID = -1730618949257985054L;
+
+
+    @ApiModelProperty(value = "药品剂型")
+    private String form;
+
+    @ApiModelProperty(value = "标准诊断名称")
+    private String standard;
+
+    @ApiModelProperty(value = "同义词")
+    private String synonym;
+
+    @ApiModelProperty(value = "是否匹配，1-已匹配，0-未匹配")
+    private String isMapping;
+}

daqe-center/src/main/java/com/lantone/daqe/dto/GetMatchingOperationPageDTO.java

@@ -0,0 +1,34 @@
+package com.lantone.daqe.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+/**
+ * @Description: 获取手术匹配信息分页列表-接口出参
+ * @Author songxl
+ * @Date 2022/3/3
+ */
+@ApiModel(value = "获取手术匹配信息分页列表-接口出参")
+@Getter
+@Setter
+public class GetMatchingOperationPageDTO implements Serializable {
+
+    private static final long serialVersionUID = -4440220426907624413L;
+
+
+    @ApiModelProperty(value = "手术和操作代码")
+    private String code;
+
+    @ApiModelProperty(value = "标准手术/操作名称")
+    private String standard;
+
+    @ApiModelProperty(value = "同义词")
+    private String synonym;
+
+    @ApiModelProperty(value = "是否匹配，1-已匹配，0-未匹配")
+    private String isMapping;
+}

daqe-center/src/main/java/com/lantone/daqe/dto/GetRegularPageDTO.java

@@ -0,0 +1,31 @@
+package com.lantone.daqe.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+/**
+ * @Description: 获取正则式维护分页列表-接口出参
+ * @author: songxl
+ * @time: 2022/3/4 10:39
+ */
+@ApiModel(value = "获取正则式维护分页列表-接口出参")
+@Getter
+@Setter
+public class GetRegularPageDTO implements Serializable {
+
+    private static final long serialVersionUID = -6177667779756225188L;
+
+    @ApiModelProperty(value = "正则式名称")
+    private String name;
+
+    @ApiModelProperty(value = "正则式值")
+    private String val;
+
+    @ApiModelProperty(value = "描述")
+    private String description;
+
+}

daqe-center/src/main/java/com/lantone/daqe/entity/ColumnInfo.java

@@ -0,0 +1,89 @@
+package com.lantone.daqe.entity;
+
+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 lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 数据库表中的列信息记录表 实体类
+ * </p>
+ */
+@Data
+@TableName("dc_column_info")
+public class ColumnInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 表中文名
+     */
+    @TableField("table_cname")
+    private String tableCname;
+
+    /**
+     * 表英文名
+     */
+    @TableField("table_ename")
+    private String tableEname;
+
+    /**
+     * 字段中文名
+     */
+    @TableField("column_cname")
+    private String columnCname;
+
+    /**
+     * 字段英文名
+     */
+    @TableField("column_ename")
+    private String columnEname;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    @TableField("is_deleted")
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    @TableField("creator")
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    @TableField("modifier")
+    private String modifier;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+}

daqe-center/src/main/java/com/lantone/daqe/entity/ColumnResult.java

@@ -0,0 +1,191 @@
+package com.lantone.daqe.entity;
+
+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 lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 表字段的实际值问题校验结果汇总表 实体类
+ * </p>
+ */
+@Data
+@TableName("dc_column_result")
+public class ColumnResult implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 组织机构ID
+     */
+    @TableField("hospital_id")
+    private Long hospitalId;
+
+    /**
+     * 病人住院序号
+     */
+    @TableField("behospital_code")
+    private String behospitalCode;
+
+    /**
+     * 医院数据编号
+     */
+    @TableField("hospital_data_code")
+    private String hospitalDataCode;
+
+    /**
+     * 医院病历文书模板编号/非文书模块编号
+     */
+    @TableField("hosptial_datatmp_code")
+    private String hosptialDatatmpCode;
+
+    /**
+     * 医院病历文书模板名称/非文书模块名称
+     */
+    @TableField("hosptial_datatmp_name")
+    private String hosptialDatatmpName;
+
+    /**
+     * 标准数据模块ID
+     */
+    @TableField("mode_id")
+    private Long modeId;
+
+    /**
+     * 标准数据模块名称
+     */
+    @TableField("mode_name")
+    private String modeName;
+
+    /**
+     * 数据库表中的列信息记录ID
+     */
+    @TableField("column_id")
+    private Long columnId;
+
+    /**
+     * 表中文名
+     */
+    @TableField("table_cname")
+    private String tableCname;
+
+    /**
+     * 表英文名
+     */
+    @TableField("table_ename")
+    private String tableEname;
+
+    /**
+     * 字段中文名
+     */
+    @TableField("column_cname")
+    private String columnCname;
+
+    /**
+     * 字段英文名
+     */
+    @TableField("column_ename")
+    private String columnEname;
+
+    /**
+     * 校验字段所在表的表记录ID
+     */
+    @TableField("table_id")
+    private Long tableId;
+
+    /**
+     * 表字段的值
+     */
+    @TableField("table_val")
+    private String tableVal;
+
+    /**
+     * 字段问题类型,1-数据缺失，2-非标准值，3-正则校验失败
+     */
+    @TableField("type")
+    private String type;
+
+    /**
+     * 校验结果表记录ID，如：表字段的非空校验结果表、表字段的正则式校验结果表、表字段的标准值校验结果表
+     */
+    @TableField("result_id")
+    private Long resultId;
+
+    /**
+     * 是否已解决,0:未解决，1:已解决。机器通过比对，若数据问题已解决，则更新为已解决。
+     */
+    @TableField("is_solved")
+    private String isSolved;
+
+    /**
+     * 最近一次机器比对时间
+     */
+    @TableField("solve_time")
+    private Date solveTime;
+
+    /**
+     * 是否通过了人工核查,0:未通过，1:已通过。对于未解决的问题数据，人工进行干预，确认其是否通过校验。
+     */
+    @TableField("is_audited")
+    private String isAudited;
+
+    /**
+     * 最近一次人工核查时间
+     */
+    @TableField("audit_time")
+    private Date auditTime;
+
+    /**
+     * 描述
+     */
+    @TableField("description")
+    private String description;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    @TableField("is_deleted")
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    @TableField("creator")
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    @TableField("modifier")
+    private String modifier;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+}

daqe-center/src/main/java/com/lantone/daqe/entity/ColumnVerify.java

@@ -0,0 +1,119 @@
+package com.lantone.daqe.entity;
+
+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 lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 表字段的实际值问题校验维护汇总表 实体类
+ * </p>
+ */
+@Data
+@TableName("dc_column_verify")
+public class ColumnVerify implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 数据库表中的列信息记录ID
+     */
+    @TableField("column_id")
+    private Long columnId;
+
+    /**
+     * 表中文名
+     */
+    @TableField("table_cname")
+    private String tableCname;
+
+    /**
+     * 表英文名
+     */
+    @TableField("table_ename")
+    private String tableEname;
+
+    /**
+     * 字段中文名
+     */
+    @TableField("column_cname")
+    private String columnCname;
+
+    /**
+     * 字段英文名
+     */
+    @TableField("column_ename")
+    private String columnEname;
+
+    /**
+     * 校验类型,0:未知，1:数据缺失，2:标准值，3:正则
+     */
+    @TableField("type")
+    private String type;
+
+    /**
+     * 校验表记录ID，如：表字段的非空校验维护表、表字段的实际值与正则式关联表、表字段的标准值校验维护表
+     */
+    @TableField("verify_id")
+    private Long verifyId;
+
+    /**
+     * 校验表值
+     */
+    @TableField("verify_val")
+    private String verifyVal;
+
+    /**
+     * 描述
+     */
+    @TableField("description")
+    private String description;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    @TableField("is_deleted")
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    @TableField("gmt_create")
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    @TableField("gmt_modified")
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    @TableField("creator")
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    @TableField("modifier")
+    private String modifier;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+}

daqe-center/src/main/java/com/lantone/daqe/entity/NonnullInfo.java

@@ -26,6 +26,18 @@ public class NonnullInfo implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
+    /**
+     * 数据库表中的列信息记录ID
+     */
+    @TableField("column_id")
+    private Long columnId;
+
+    /**
+     * 是否必填,0:否，1:是
+     */
+    @TableField("is_required")
+    private String isRequired;
+
     /**
      * 是否删除,N:未删除，Y:删除
      */

daqe-center/src/main/java/com/lantone/daqe/entity/NonnullResult.java

@@ -26,6 +26,114 @@ public class NonnullResult implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
+    /**
+     * 组织机构ID
+     */
+    @TableField("hospital_id")
+    private Long hospitalId;
+
+    /**
+     * 病人住院序号
+     */
+    @TableField("behospital_code")
+    private String behospitalCode;
+
+    /**
+     * 医院数据编号
+     */
+    @TableField("hospital_data_code")
+    private String hospitalDataCode;
+
+    /**
+     * 医院病历文书模板编号/非文书模块编号
+     */
+    @TableField("hosptial_datatmp_code")
+    private String hosptialDatatmpCode;
+
+    /**
+     * 医院病历文书模板名称/非文书模块名称
+     */
+    @TableField("hosptial_datatmp_name")
+    private String hosptialDatatmpName;
+
+    /**
+     * 标准数据模块ID
+     */
+    @TableField("mode_id")
+    private Long modeId;
+
+    /**
+     * 标准数据模块名称
+     */
+    @TableField("mode_name")
+    private String modeName;
+
+    /**
+     * 数据库表中的列信息记录ID
+     */
+    @TableField("column_id")
+    private Long columnId;
+
+    /**
+     * 表中文名
+     */
+    @TableField("table_cname")
+    private String tableCname;
+
+    /**
+     * 表英文名
+     */
+    @TableField("table_ename")
+    private String tableEname;
+
+    /**
+     * 字段中文名
+     */
+    @TableField("column_cname")
+    private String columnCname;
+
+    /**
+     * 字段英文名
+     */
+    @TableField("column_ename")
+    private String columnEname;
+
+    /**
+     * 校验字段所在表的表记录ID
+     */
+    @TableField("table_id")
+    private Long tableId;
+
+    /**
+     * 是否已解决,0:未解决，1:已解决。机器通过比对，若数据问题已解决，则更新为已解决。
+     */
+    @TableField("is_solved")
+    private String isSolved;
+
+    /**
+     * 最近一次机器比对时间
+     */
+    @TableField("solve_time")
+    private Date solveTime;
+
+    /**
+     * 是否通过了人工核查,0:未通过，1:已通过。对于未解决的问题数据，人工进行干预，确认其是否通过校验。
+     */
+    @TableField("is_audited")
+    private String isAudited;
+
+    /**
+     * 最近一次人工核查时间
+     */
+    @TableField("audit_time")
+    private Date auditTime;
+
+    /**
+     * 描述
+     */
+    @TableField("description")
+    private String description;
+
     /**
      * 是否删除,N:未删除，Y:删除
      */

daqe-center/src/main/java/com/lantone/daqe/entity/OfficialCapacity.java

@@ -39,7 +39,7 @@ public class OfficialCapacity implements Serializable {
     private String name;
 
     /**
-     * 类型：1-职务；2-职称
+     * 类型:0:未知，1:职务，2职称
      */
     @TableField("type")
     private String type;

daqe-center/src/main/java/com/lantone/daqe/entity/RecordTemplate.java

@@ -51,10 +51,10 @@ public class RecordTemplate implements Serializable {
     private String content;
 
     /**
-     * 模板类型
+     * 模板类型,0:未知，1:html，2:xml
      */
-    @TableField("content_type")
-    private String contentType;
+    @TableField("type")
+    private String type;
 
     /**
      * 父模板代码

daqe-center/src/main/java/com/lantone/daqe/entity/RegularInfo.java

@@ -26,6 +26,24 @@ public class RegularInfo implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
+    /**
+     * 正则式名称
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 正则式值
+     */
+    @TableField("val")
+    private String val;
+
+    /**
+     * 描述
+     */
+    @TableField("description")
+    private String description;
+
     /**
      * 是否删除,N:未删除，Y:删除
      */

daqe-center/src/main/java/com/lantone/daqe/entity/RegularMapping.java

@@ -26,6 +26,18 @@ public class RegularMapping implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
+    /**
+     * 数据库表中的列信息记录ID
+     */
+    @TableField("column_id")
+    private Long columnId;
+
+    /**
+     * 正则式ID
+     */
+    @TableField("regular_id")
+    private Long regularId;
+
     /**
      * 是否删除,N:未删除，Y:删除
      */

daqe-center/src/main/java/com/lantone/daqe/entity/RegularResult.java

@@ -26,6 +26,144 @@ public class RegularResult implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
+    /**
+     * 组织机构ID
+     */
+    @TableField("hospital_id")
+    private Long hospitalId;
+
+    /**
+     * 病人住院序号
+     */
+    @TableField("behospital_code")
+    private String behospitalCode;
+
+    /**
+     * 医院数据编号
+     */
+    @TableField("hospital_data_code")
+    private String hospitalDataCode;
+
+    /**
+     * 医院病历文书模板编号/非文书模块编号
+     */
+    @TableField("hosptial_datatmp_code")
+    private String hosptialDatatmpCode;
+
+    /**
+     * 医院病历文书模板名称/非文书模块名称
+     */
+    @TableField("hosptial_datatmp_name")
+    private String hosptialDatatmpName;
+
+    /**
+     * 标准数据模块ID
+     */
+    @TableField("mode_id")
+    private Long modeId;
+
+    /**
+     * 标准数据模块名称
+     */
+    @TableField("mode_name")
+    private String modeName;
+
+    /**
+     * 数据库表中的列信息记录ID
+     */
+    @TableField("column_id")
+    private Long columnId;
+
+    /**
+     * 表中文名
+     */
+    @TableField("table_cname")
+    private String tableCname;
+
+    /**
+     * 表英文名
+     */
+    @TableField("table_ename")
+    private String tableEname;
+
+    /**
+     * 字段中文名
+     */
+    @TableField("column_cname")
+    private String columnCname;
+
+    /**
+     * 字段英文名
+     */
+    @TableField("column_ename")
+    private String columnEname;
+
+    /**
+     * 正则式ID
+     */
+    @TableField("regular_id")
+    private Long regularId;
+
+    /**
+     * 正则式名称
+     */
+    @TableField("regular_name")
+    private String regularName;
+
+    /**
+     * 正则式值
+     */
+    @TableField("regular_val")
+    private String regularVal;
+
+    /**
+     * 正则式描述
+     */
+    @TableField("regular_des")
+    private String regularDes;
+
+    /**
+     * 校验字段所在表的表记录ID
+     */
+    @TableField("table_id")
+    private Long tableId;
+
+    /**
+     * 表字段的值
+     */
+    @TableField("table_val")
+    private String tableVal;
+
+    /**
+     * 是否已解决,0:未解决，1:已解决。机器通过比对，若数据问题已解决，则更新为已解决。
+     */
+    @TableField("is_solved")
+    private String isSolved;
+
+    /**
+     * 最近一次机器比对时间
+     */
+    @TableField("solve_time")
+    private Date solveTime;
+
+    /**
+     * 是否通过了人工核查,0:未通过，1:已通过。对于未解决的问题数据，人工进行干预，确认其是否通过校验。
+     */
+    @TableField("is_audited")
+    private String isAudited;
+
+    /**
+     * 最近一次人工核查时间
+     */
+    @TableField("audit_time")
+    private Date auditTime;
+
+    /**
+     * 描述
+     */
+    @TableField("description")
+    private String description;
+
     /**
      * 是否删除,N:未删除，Y:删除
      */

daqe-center/src/main/java/com/lantone/daqe/entity/StandardvalueInfo.java

@@ -26,6 +26,18 @@ public class StandardvalueInfo implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
+    /**
+     * 数据库表中的列信息记录ID
+     */
+    @TableField("column_id")
+    private Long columnId;
+
+    /**
+     * 表字段的标准值
+     */
+    @TableField("val")
+    private String val;
+
     /**
      * 是否删除,N:未删除，Y:删除
      */

daqe-center/src/main/java/com/lantone/daqe/entity/StandardvalueMapping.java

@@ -26,6 +26,24 @@ public class StandardvalueMapping implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
+    /**
+     * 表字段的标准值校验ID
+     */
+    @TableField("standardvalue_id")
+    private Long standardvalueId;
+
+    /**
+     * 组织机构ID
+     */
+    @TableField("hospital_id")
+    private Long hospitalId;
+
+    /**
+     * 表字段的实际值
+     */
+    @TableField("hospital_val")
+    private String hospitalVal;
+
     /**
      * 是否删除,N:未删除，Y:删除
      */

daqe-center/src/main/java/com/lantone/daqe/entity/StandardvalueResult.java

@@ -26,6 +26,126 @@ public class StandardvalueResult implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
+    /**
+     * 组织机构ID
+     */
+    @TableField("hospital_id")
+    private Long hospitalId;
+
+    /**
+     * 病人住院序号
+     */
+    @TableField("behospital_code")
+    private String behospitalCode;
+
+    /**
+     * 医院数据编号
+     */
+    @TableField("hospital_data_code")
+    private String hospitalDataCode;
+
+    /**
+     * 医院病历文书模板编号/非文书模块编号
+     */
+    @TableField("hosptial_datatmp_code")
+    private String hosptialDatatmpCode;
+
+    /**
+     * 医院病历文书模板名称/非文书模块名称
+     */
+    @TableField("hosptial_datatmp_name")
+    private String hosptialDatatmpName;
+
+    /**
+     * 标准数据模块ID
+     */
+    @TableField("mode_id")
+    private Long modeId;
+
+    /**
+     * 标准数据模块名称
+     */
+    @TableField("mode_name")
+    private String modeName;
+
+    /**
+     * 数据库表中的列信息记录ID
+     */
+    @TableField("column_id")
+    private Long columnId;
+
+    /**
+     * 表中文名
+     */
+    @TableField("table_cname")
+    private String tableCname;
+
+    /**
+     * 表英文名
+     */
+    @TableField("table_ename")
+    private String tableEname;
+
+    /**
+     * 字段中文名
+     */
+    @TableField("column_cname")
+    private String columnCname;
+
+    /**
+     * 字段英文名
+     */
+    @TableField("column_ename")
+    private String columnEname;
+
+    /**
+     * 映射对汇总，逗号隔开，比如：标准A-医院A，标准B-医院B。医院未映射的采用标准A-无。
+     */
+    @TableField("mappings")
+    private String mappings;
+
+    /**
+     * 校验字段所在表的表记录ID
+     */
+    @TableField("table_id")
+    private Long tableId;
+
+    /**
+     * 表字段的值
+     */
+    @TableField("table_val")
+    private String tableVal;
+
+    /**
+     * 是否已解决,0:未解决，1:已解决。机器通过比对，若数据问题已解决，则更新为已解决。
+     */
+    @TableField("is_solved")
+    private String isSolved;
+
+    /**
+     * 最近一次机器比对时间
+     */
+    @TableField("solve_time")
+    private Date solveTime;
+
+    /**
+     * 是否通过了人工核查,0:未通过，1:已通过。对于未解决的问题数据，人工进行干预，确认其是否通过校验。
+     */
+    @TableField("is_audited")
+    private String isAudited;
+
+    /**
+     * 最近一次人工核查时间
+     */
+    @TableField("audit_time")
+    private Date auditTime;
+
+    /**
+     * 描述
+     */
+    @TableField("description")
+    private String description;
+
     /**
      * 是否删除,N:未删除，Y:删除
      */

daqe-center/src/main/java/com/lantone/daqe/facade/DiseaseManagementFacade.java

@@ -11,6 +11,7 @@ import com.lantone.common.util.ListUtil;
 import com.lantone.common.util.StringUtil;
 import com.lantone.daqe.dto.ExportImportDiseaseErrDTO;
 import com.lantone.daqe.dto.GetDiseasePageDTO;
+import com.lantone.daqe.dto.GetMatchingDiseasePageDTO;
 import com.lantone.daqe.entity.DiseaseInfo;
 import com.lantone.daqe.facade.base.DiseaseInfoFacade;
 import com.lantone.daqe.service.impl.DiseaseInfoServiceImpl;
@@ -18,6 +19,7 @@ import com.lantone.daqe.util.ExcelUtils;
 import com.lantone.daqe.vo.AddDiseaseVO;
 import com.lantone.daqe.vo.DelDiseaseByIdVO;
 import com.lantone.daqe.vo.GetDiseasePageVO;
+import com.lantone.daqe.vo.GetMatchingDiseasePageVO;
 import com.lantone.daqe.vo.ImportDiseaseVO;
 import com.lantone.daqe.vo.MatchingDiseaseVO;
 import com.lantone.daqe.vo.UpDiseaseByIdVO;
@@ -203,4 +205,8 @@ public class DiseaseManagementFacade {
                 .collect(Collectors.toMap(ImportDiseaseVO::getName, ImportDiseaseVO -> ImportDiseaseVO, (k1, k2) -> k1, LinkedHashMap::new));
         return tempMap.values().stream().collect(Collectors.toList());
     }
+
+    public IPage<GetMatchingDiseasePageDTO> getMatchingDiseasePage(GetMatchingDiseasePageVO getMatchingDiseasePageVO) {
+        return diseaseInfoFacade.getBaseMapper().getMatchingDiseasePage(getMatchingDiseasePageVO);
+    }
 }

daqe-center/src/main/java/com/lantone/daqe/facade/DrugManagementFacade.java

@@ -11,6 +11,7 @@ import com.lantone.common.util.ListUtil;
 import com.lantone.common.util.StringUtil;
 import com.lantone.daqe.dto.ExportImportDrugErrDTO;
 import com.lantone.daqe.dto.GetDrugPageDTO;
+import com.lantone.daqe.dto.GetMatchingDrugPageDTO;
 import com.lantone.daqe.entity.DrugInfo;
 import com.lantone.daqe.entity.OperationInfo;
 import com.lantone.daqe.facade.base.DrugInfoFacade;
@@ -19,6 +20,7 @@ import com.lantone.daqe.util.ExcelUtils;
 import com.lantone.daqe.vo.AddDrugVO;
 import com.lantone.daqe.vo.DelDrugByIdVO;
 import com.lantone.daqe.vo.GetDrugPageVO;
+import com.lantone.daqe.vo.GetMatchingDrugPageVO;
 import com.lantone.daqe.vo.ImportDrugVO;
 import com.lantone.daqe.vo.MatchingDrugVO;
 import com.lantone.daqe.vo.UpDrugByIdVO;
@@ -135,7 +137,15 @@ public class DrugManagementFacade {
         return drugInfoFacade.updateById(drugInfo);
     }
 
+    /**
+     *药品匹配信息导入
+     *
+     * @param response
+     * @param file
+     * @Return void
+     */
     public void importDrug(HttpServletResponse response, MultipartFile file) {
+
         List<ImportDrugVO> operationExcelVOS = ExcelUtils.importExcel(file, 0, 1, ImportDrugVO.class);
         if (ListUtil.isEmpty(operationExcelVOS)) {
             Asserts.fail("Excel文件为空");
@@ -201,10 +211,21 @@ public class DrugManagementFacade {
         return errorFlog.get();
     }
 
+    /**
+     * 去重
+     *
+     * @param importDrugVOS
+     * @Return java.util.List<com.lantone.daqe.vo.ImportDrugVO>
+     */
     private List<ImportDrugVO> delRepeat(List<ImportDrugVO> importDrugVOS) {
+
         //通过标准词去重
         LinkedHashMap<String, ImportDrugVO> tempMap = importDrugVOS.stream()
                 .collect(Collectors.toMap(ImportDrugVO::getName, ImportDrugVO -> ImportDrugVO, (k1, k2) -> k1, LinkedHashMap::new));
         return tempMap.values().stream().collect(Collectors.toList());
     }
+
+    public IPage<GetMatchingDrugPageDTO> getMatchingDrugPage(GetMatchingDrugPageVO getMatchingDrugPageVO) {
+        return drugInfoServiceImpl.getBaseMapper().getMatchingDrugPage(getMatchingDrugPageVO);
+    }
 }

daqe-center/src/main/java/com/lantone/daqe/facade/OperationManagementFacade.java

@@ -10,6 +10,7 @@ import com.lantone.common.util.BeanUtil;
 import com.lantone.common.util.ListUtil;
 import com.lantone.common.util.StringUtil;
 import com.lantone.daqe.dto.ExportImportOperationDTO;
+import com.lantone.daqe.dto.GetMatchingOperationPageDTO;
 import com.lantone.daqe.dto.GetOperationPageDTO;
 import com.lantone.daqe.entity.OperationInfo;
 import com.lantone.daqe.facade.base.OperationInfoFacade;
@@ -17,6 +18,7 @@ import com.lantone.daqe.service.impl.OperationInfoServiceImpl;
 import com.lantone.daqe.util.ExcelUtils;
 import com.lantone.daqe.vo.AddOperationVO;
 import com.lantone.daqe.vo.DelOperationByIdVO;
+import com.lantone.daqe.vo.GetMatchingOperationVO;
 import com.lantone.daqe.vo.GetOperationPageVO;
 import com.lantone.daqe.vo.ImportOperationVO;
 import com.lantone.daqe.vo.MatchingOperationVO;
@@ -130,7 +132,15 @@ public class OperationManagementFacade {
         return operationInfoFacade.updateById(operationInfo);
     }
 
+    /**
+     * 医院手术标准词匹配信息导入
+     *
+     * @param response
+     * @param file
+     * @Return void
+     */
     public void importOperation(HttpServletResponse response, MultipartFile file) {
+
         List<ImportOperationVO> operationExcelVOS = ExcelUtils.importExcel(file, 0, 1, ImportOperationVO.class);
         if (ListUtil.isEmpty(operationExcelVOS)) {
             Asserts.fail("Excel文件为空");
@@ -167,7 +177,7 @@ public class OperationManagementFacade {
      * 数据校验
      *
      * @param importOperationVOS 导入数据
-     * @param errExports 导出异常
+     * @param errExports         导出异常
      * @Return java.lang.Boolean
      */
     private Boolean checkData(List<ImportOperationVO> importOperationVOS, List<ExportImportOperationDTO> errExports) {
@@ -191,10 +201,28 @@ public class OperationManagementFacade {
         return errorFlog.get();
     }
 
+    /**
+     * 去重
+     *
+     * @param importOperationVOS
+     * @Return java.util.List<com.lantone.daqe.vo.ImportOperationVO>
+     */
     private List<ImportOperationVO> delRepeat(List<ImportOperationVO> importOperationVOS) {
+
         //通过标准词去重
         LinkedHashMap<String, ImportOperationVO> tempMap = importOperationVOS.stream()
                 .collect(Collectors.toMap(ImportOperationVO::getName, ImportOperationVO -> ImportOperationVO, (k1, k2) -> k1, LinkedHashMap::new));
         return tempMap.values().stream().collect(Collectors.toList());
     }
+
+    /**
+     * 获取手术匹配信息分页列表
+     *
+     * @param getMatchingOperationVO
+     * @Return com.baomidou.mybatisplus.core.metadata.IPage<com.lantone.daqe.dto.GetMatchingOperationPageDTO>
+     */
+    public IPage<GetMatchingOperationPageDTO> getMatchingOperationPage(GetMatchingOperationVO getMatchingOperationVO) {
+
+        return operationInfoFacade.getBaseMapper().getMatchingOperationPage(getMatchingOperationVO);
+    }
 }

daqe-center/src/main/java/com/lantone/daqe/facade/RegularManagementFacade.java

@@ -0,0 +1,160 @@
+package com.lantone.daqe.facade;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.lantone.common.api.CommonResult;
+import com.lantone.common.enums.IsDeleteEnum;
+import com.lantone.common.exception.Asserts;
+import com.lantone.common.util.BeanUtil;
+import com.lantone.common.util.ListUtil;
+import com.lantone.common.util.StringUtil;
+import com.lantone.daqe.dto.ExportImportDiseaseErrDTO;
+import com.lantone.daqe.dto.GetDiseasePageDTO;
+import com.lantone.daqe.dto.GetMatchingDiseasePageDTO;
+import com.lantone.daqe.dto.GetRegularPageDTO;
+import com.lantone.daqe.entity.DiseaseInfo;
+import com.lantone.daqe.entity.RegularInfo;
+import com.lantone.daqe.entity.RegularMapping;
+import com.lantone.daqe.entity.RegularResult;
+import com.lantone.daqe.facade.base.DiseaseInfoFacade;
+import com.lantone.daqe.facade.base.RegularInfoFacade;
+import com.lantone.daqe.facade.base.RegularMappingFacade;
+import com.lantone.daqe.facade.base.RegularResultFacade;
+import com.lantone.daqe.service.impl.DiseaseInfoServiceImpl;
+import com.lantone.daqe.util.ExcelUtils;
+import com.lantone.daqe.vo.AddDiseaseVO;
+import com.lantone.daqe.vo.AddRegularVO;
+import com.lantone.daqe.vo.DelDiseaseByIdVO;
+import com.lantone.daqe.vo.DelRegularByIdVO;
+import com.lantone.daqe.vo.GetDiseasePageVO;
+import com.lantone.daqe.vo.GetMatchingDiseasePageVO;
+import com.lantone.daqe.vo.GetRegularPageVO;
+import com.lantone.daqe.vo.ImportDiseaseVO;
+import com.lantone.daqe.vo.MatchingDiseaseVO;
+import com.lantone.daqe.vo.UpDiseaseByIdVO;
+import com.lantone.daqe.vo.UpRegularByIdVO;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.stream.Collectors;
+
+/**
+ * @Description: 正则式维护-业务处理类
+ * @author: songxl
+ * @time: 2022/3/4 10:39
+ */
+@Component
+public class RegularManagementFacade {
+
+    @Autowired
+    private RegularInfoFacade regularInfoFacade;
+
+    @Autowired
+    private RegularResultFacade regularResultFacade;
+
+    @Autowired
+    private RegularMappingFacade regularMappingFacade;
+
+    /**
+     * 获取正则式维护分页列表
+     *
+     * @param getRegularPageVO
+     * @Return com.baomidou.mybatisplus.core.metadata.IPage<com.lantone.daqe.dto.GetRegularPageDTO>
+     */
+    public IPage<GetRegularPageDTO> getRegularPage(GetRegularPageVO getRegularPageVO) {
+
+        Page<GetRegularPageDTO> getRegularPageDTOPage = new Page<>();
+        QueryWrapper<RegularInfo> regularInfoQueryWrapper = new QueryWrapper<>();
+        regularInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
+        regularInfoQueryWrapper.like(StringUtil.isNotBlank(getRegularPageVO.getName()), "name", getRegularPageVO.getName());
+        Page<RegularInfo> regularInfoPage = new Page<>(getRegularPageVO.getCurrent(), getRegularPageVO.getSize());
+        regularInfoFacade.page(regularInfoPage, regularInfoQueryWrapper);
+        BeanUtil.copyProperties(regularInfoPage, getRegularPageDTOPage);
+        List<GetRegularPageDTO> getRegularPageDTOList = BeanUtil.listCopyTo(regularInfoPage.getRecords(), GetRegularPageDTO.class);
+
+        getRegularPageDTOPage.setRecords(getRegularPageDTOList);
+        return getRegularPageDTOPage;
+    }
+
+    /**
+     * 新增正则式 业务处理
+     *
+     * @param addRegularVO
+     * @return 是否新增成功
+     */
+    public Boolean addRegular(AddRegularVO addRegularVO) {
+        RegularInfo regularInfo = new RegularInfo();
+        BeanUtils.copyProperties(addRegularVO, regularInfo);
+        if (regularInfoFacade.isExist(regularInfo)) {
+            Asserts.fail("该正则式已存在！");
+        }
+        return regularInfoFacade.save(regularInfo);
+    }
+
+    /**
+     * 通过id修改正则式
+     *
+     * @param upRegularByIdVO
+     * @return 是否修改成功
+     */
+    public Boolean upRegularById(UpRegularByIdVO upRegularByIdVO) {
+        if (regularInfoFacade.getById(upRegularByIdVO.getId()) == null) {
+            Asserts.fail("该正则式不存在！");
+        }
+        //修改正则式
+        RegularInfo regularInfo = new RegularInfo();
+        BeanUtil.copyProperties(upRegularByIdVO, regularInfo);
+        //修改表字段的正则式校验结果表中的正则式
+        if (regularInfoFacade.updateById(regularInfo)) {
+            return regularResultFacade.update(new UpdateWrapper<RegularResult>()
+                    .eq(upRegularByIdVO.getHospitalId() != null, "hospital_id", upRegularByIdVO.getHospitalId())
+                    .eq("regular_id", upRegularByIdVO.getId())
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .set("regular_name", upRegularByIdVO.getName())
+                    .set("regular_val", upRegularByIdVO.getVal())
+                    .set("regular_des", upRegularByIdVO.getDescription()));
+        }
+        return false;
+    }
+
+    /**
+     * 通过id删除正则式
+     *
+     * @param delRegularByIdVO
+     * @return 是否删除成功
+     */
+    public Boolean delRegularById(DelRegularByIdVO delRegularByIdVO) {
+        if (regularInfoFacade.getById(delRegularByIdVO.getId()) == null) {
+            Asserts.fail("该正则式不存在！");
+        }
+        if (regularInfoFacade.removeById(delRegularByIdVO.getId())) {
+            //删除表字段的实际值与正则式关联关系
+            if (regularMappingFacade.update(new UpdateWrapper<RegularMapping>()
+                    .eq("regular_id", delRegularByIdVO.getId())
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .set("is_deleted", IsDeleteEnum.Y.getKey()))) {
+                //删除表字段的正则式校验结果表中的正则式
+                return regularResultFacade.update(new UpdateWrapper<RegularResult>()
+                        .eq(delRegularByIdVO.getHospitalId() != null, "hospital_id", delRegularByIdVO.getHospitalId())
+                        .eq("regular_id", delRegularByIdVO.getId())
+                        .eq("is_deleted", IsDeleteEnum.N.getKey())
+                        .set("is_deleted", IsDeleteEnum.Y.getKey()));
+            }
+
+        }
+        return false;
+    }
+
+
+}

daqe-center/src/main/java/com/lantone/daqe/facade/base/ColumnInfoFacade.java

@@ -0,0 +1,14 @@
+package com.lantone.daqe.facade.base;
+
+import com.lantone.daqe.service.impl.ColumnInfoServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 表名：dc_column_info 业务类
+ * </p>
+ */
+@Component
+public class ColumnInfoFacade extends ColumnInfoServiceImpl {
+
+}

daqe-center/src/main/java/com/lantone/daqe/facade/base/ColumnResultFacade.java

@@ -0,0 +1,14 @@
+package com.lantone.daqe.facade.base;
+
+import com.lantone.daqe.service.impl.ColumnResultServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 表名：dc_column_result 业务类
+ * </p>
+ */
+@Component
+public class ColumnResultFacade extends ColumnResultServiceImpl {
+
+}

daqe-center/src/main/java/com/lantone/daqe/facade/base/ColumnVerifyFacade.java

@@ -0,0 +1,14 @@
+package com.lantone.daqe.facade.base;
+
+import com.lantone.daqe.service.impl.ColumnVerifyServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 表名：dc_column_verify 业务类
+ * </p>
+ */
+@Component
+public class ColumnVerifyFacade extends ColumnVerifyServiceImpl {
+
+}

daqe-center/src/main/java/com/lantone/daqe/facade/base/RegularInfoFacade.java

@@ -1,5 +1,7 @@
 package com.lantone.daqe.facade.base;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.lantone.daqe.entity.RegularInfo;
 import com.lantone.daqe.service.impl.RegularInfoServiceImpl;
 import org.springframework.stereotype.Component;
 
@@ -10,5 +12,13 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class RegularInfoFacade extends RegularInfoServiceImpl {
+    public boolean isExist(RegularInfo regularInfo) {
+        boolean flag = false;
+        RegularInfo regular = this.getOne(new QueryWrapper<RegularInfo>().eq("name", regularInfo.getName()));
+        if (regular != null) {
+            flag = true;
+        }
+        return flag;
+    }
 
 }

daqe-center/src/main/java/com/lantone/daqe/mapper/ColumnInfoMapper.java

@@ -0,0 +1,13 @@
+package com.lantone.daqe.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.daqe.entity.ColumnInfo;
+
+/**
+ * <p>
+ * 表名：dc_column_info Mapper接口
+ * </p>
+ */
+public interface ColumnInfoMapper extends BaseMapper<ColumnInfo> {
+
+}

daqe-center/src/main/java/com/lantone/daqe/mapper/ColumnResultMapper.java

@@ -0,0 +1,13 @@
+package com.lantone.daqe.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.daqe.entity.ColumnResult;
+
+/**
+ * <p>
+ * 表名：dc_column_result Mapper接口
+ * </p>
+ */
+public interface ColumnResultMapper extends BaseMapper<ColumnResult> {
+
+}

daqe-center/src/main/java/com/lantone/daqe/mapper/ColumnVerifyMapper.java

@@ -0,0 +1,13 @@
+package com.lantone.daqe.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.daqe.entity.ColumnVerify;
+
+/**
+ * <p>
+ * 表名：dc_column_verify Mapper接口
+ * </p>
+ */
+public interface ColumnVerifyMapper extends BaseMapper<ColumnVerify> {
+
+}

daqe-center/src/main/java/com/lantone/daqe/mapper/DiseaseInfoMapper.java

@@ -1,7 +1,12 @@
 package com.lantone.daqe.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.lantone.daqe.dto.GetDiseasePageDTO;
+import com.lantone.daqe.dto.GetMatchingDiseasePageDTO;
 import com.lantone.daqe.entity.DiseaseInfo;
+import com.lantone.daqe.vo.GetMatchingDiseasePageVO;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -10,4 +15,5 @@ import com.lantone.daqe.entity.DiseaseInfo;
  */
 public interface DiseaseInfoMapper extends BaseMapper<DiseaseInfo> {
 
+    IPage<GetMatchingDiseasePageDTO> getMatchingDiseasePage(@Param("getMatchingDiseasePageVO") GetMatchingDiseasePageVO getMatchingDiseasePageVO);
 }

daqe-center/src/main/java/com/lantone/daqe/mapper/DrugInfoMapper.java

@@ -1,7 +1,10 @@
 package com.lantone.daqe.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.lantone.daqe.dto.GetMatchingDrugPageDTO;
 import com.lantone.daqe.entity.DrugInfo;
+import com.lantone.daqe.vo.GetMatchingDrugPageVO;
 
 /**
  * <p>
@@ -10,4 +13,5 @@ import com.lantone.daqe.entity.DrugInfo;
  */
 public interface DrugInfoMapper extends BaseMapper<DrugInfo> {
 
+    IPage<GetMatchingDrugPageDTO> getMatchingDrugPage(GetMatchingDrugPageVO getMatchingDrugPageVO);
 }

daqe-center/src/main/java/com/lantone/daqe/mapper/OperationInfoMapper.java

@@ -1,7 +1,11 @@
 package com.lantone.daqe.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.lantone.daqe.dto.GetMatchingOperationPageDTO;
 import com.lantone.daqe.entity.OperationInfo;
+import com.lantone.daqe.vo.GetMatchingOperationVO;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -10,4 +14,5 @@ import com.lantone.daqe.entity.OperationInfo;
  */
 public interface OperationInfoMapper extends BaseMapper<OperationInfo> {
 
+    IPage<GetMatchingOperationPageDTO> getMatchingOperationPage(@Param("getMatchingOperationVO") GetMatchingOperationVO getMatchingOperationVO);
 }

daqe-center/src/main/java/com/lantone/daqe/service/ColumnInfoService.java

@@ -0,0 +1,13 @@
+package com.lantone.daqe.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.lantone.daqe.entity.ColumnInfo;
+
+/**
+ * <p>
+ * 数据库表中的列信息记录表 Service类
+ * </p>
+ */
+public interface ColumnInfoService extends IService<ColumnInfo> {
+
+}

daqe-center/src/main/java/com/lantone/daqe/service/ColumnResultService.java

@@ -0,0 +1,13 @@
+package com.lantone.daqe.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.lantone.daqe.entity.ColumnResult;
+
+/**
+ * <p>
+ * 表字段的实际值问题校验结果汇总表 Service类
+ * </p>
+ */
+public interface ColumnResultService extends IService<ColumnResult> {
+
+}

daqe-center/src/main/java/com/lantone/daqe/service/ColumnVerifyService.java

@@ -0,0 +1,13 @@
+package com.lantone.daqe.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.lantone.daqe.entity.ColumnVerify;
+
+/**
+ * <p>
+ * 表字段的实际值问题校验维护汇总表 Service类
+ * </p>
+ */
+public interface ColumnVerifyService extends IService<ColumnVerify> {
+
+}

daqe-center/src/main/java/com/lantone/daqe/service/impl/ColumnInfoServiceImpl.java

@@ -0,0 +1,17 @@
+package com.lantone.daqe.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.lantone.daqe.entity.ColumnInfo;
+import com.lantone.daqe.mapper.ColumnInfoMapper;
+import com.lantone.daqe.service.ColumnInfoService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 数据库表中的列信息记录表 Service实现类
+ * </p>
+ */
+@Service
+public class ColumnInfoServiceImpl extends ServiceImpl<ColumnInfoMapper, ColumnInfo> implements ColumnInfoService {
+
+}

daqe-center/src/main/java/com/lantone/daqe/service/impl/ColumnResultServiceImpl.java

@@ -0,0 +1,17 @@
+package com.lantone.daqe.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.lantone.daqe.entity.ColumnResult;
+import com.lantone.daqe.mapper.ColumnResultMapper;
+import com.lantone.daqe.service.ColumnResultService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 表字段的实际值问题校验结果汇总表 Service实现类
+ * </p>
+ */
+@Service
+public class ColumnResultServiceImpl extends ServiceImpl<ColumnResultMapper, ColumnResult> implements ColumnResultService {
+
+}

daqe-center/src/main/java/com/lantone/daqe/service/impl/ColumnVerifyServiceImpl.java

@@ -0,0 +1,17 @@
+package com.lantone.daqe.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.lantone.daqe.entity.ColumnVerify;
+import com.lantone.daqe.mapper.ColumnVerifyMapper;
+import com.lantone.daqe.service.ColumnVerifyService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 表字段的实际值问题校验维护汇总表 Service实现类
+ * </p>
+ */
+@Service
+public class ColumnVerifyServiceImpl extends ServiceImpl<ColumnVerifyMapper, ColumnVerify> implements ColumnVerifyService {
+
+}

daqe-center/src/main/java/com/lantone/daqe/vo/AddRegularVO.java

@@ -0,0 +1,35 @@
+package com.lantone.daqe.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @Description: 新增正则式-接口入参
+ * @author: songxl
+ * @time: 2022/2/28 11:15
+ */
+@ApiModel(value = "新增正则式-接口入参")
+@Getter
+@Setter
+public class AddRegularVO implements Serializable {
+
+    private static final long serialVersionUID = 5604429365497054795L;
+
+    @ApiModelProperty(value = "正则式名称", required = true)
+    @NotBlank(message = "正则式名称不能为空")
+    private String name;
+
+    @ApiModelProperty(value = "正则式值", required = true)
+    @NotBlank(message = "正则式值不能为空")
+    private String val;
+
+    @ApiModelProperty(value = "描述")
+    private String description;
+
+}

daqe-center/src/main/java/com/lantone/daqe/vo/DelRegularByIdVO.java

@@ -0,0 +1,31 @@
+package com.lantone.daqe.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @Description: 通过id删除正则式-接口入参
+ * @author: songxl
+ * @time: 2021/2/28 11:15
+ */
+@ApiModel(value = "通过id删除正则式-接口入参")
+@Getter
+@Setter
+public class DelRegularByIdVO implements Serializable {
+
+    private static final long serialVersionUID = -1295862612895001269L;
+
+    @ApiModelProperty(value = "组织机构ID")
+    private Long hospitalId;
+
+    @ApiModelProperty(value = "主键", required = true)
+    @NotNull(message = "主键不能为空")
+    private Long id;
+
+
+}

daqe-center/src/main/java/com/lantone/daqe/vo/GetMatchingDiseasePageVO.java

@@ -0,0 +1,35 @@
+package com.lantone.daqe.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+/**
+ * @Description: 获取诊断分页列表-接口入参
+ * @author: songxl
+ * @time: 2022/2/27 11:15
+ */
+@ApiModel(value = "获取诊断分页列表-接口入参")
+@Getter
+@Setter
+public class GetMatchingDiseasePageVO extends Page implements Serializable {
+
+    private static final long serialVersionUID = 7343651372186522146L;
+
+    @ApiModelProperty(value = "组织机构ID")
+    private Long hospitalId;
+
+    @ApiModelProperty(value = "医院诊断ID")
+    private Long id;
+
+    @ApiModelProperty(value = "医院诊断名称")
+    private String name;
+
+//    @ApiModelProperty(value = "是否匹配，1-已匹配，0-未匹配")
+//    private String isMapping;
+
+}

daqe-center/src/main/java/com/lantone/daqe/vo/GetMatchingDrugPageVO.java

@@ -0,0 +1,30 @@
+package com.lantone.daqe.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @author: songxl
+ * @time: 2022/3/3 16:46
+ */
+@ApiModel(value = "获取药品匹配分页列表-接口入参")
+@Getter
+@Setter
+public class GetMatchingDrugPageVO extends Page implements Serializable {
+    private static final long serialVersionUID = 7343651372186522146L;
+
+    @ApiModelProperty(value = "组织机构ID")
+    private Long hospitalId;
+
+    @ApiModelProperty(value = "医院药品ID")
+    private Long id;
+
+    @ApiModelProperty(value = "医院药品名称")
+    private String name;
+}

daqe-center/src/main/java/com/lantone/daqe/vo/GetMatchingOperationVO.java

@@ -0,0 +1,33 @@
+package com.lantone.daqe.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+/**
+ * @Description: 获取手术匹配信息分页列表-接口入参
+ * @author: songxl
+ * @time: 2022/2/28 11:15
+ */
+@ApiModel(value = "获取手术匹配信息分页列表-接口入参")
+@Getter
+@Setter
+public class GetMatchingOperationVO extends Page implements Serializable {
+
+    private static final long serialVersionUID = 3504974578827568208L;
+
+    @ApiModelProperty(value = "组织机构ID")
+    private Long hospitalId;
+
+    @ApiModelProperty(value = "医院手术/操作名称ID")
+    private Long id;
+
+    @ApiModelProperty(name = "医院手术/操作名称")
+    private String name;
+
+
+}

daqe-center/src/main/java/com/lantone/daqe/vo/GetRegularPageVO.java

@@ -0,0 +1,25 @@
+package com.lantone.daqe.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description: 获取正则式维护分页列表-接口入参
+ * @author: songxl
+ * @time: 2022/3/4 10:39
+ */
+@ApiModel(value = "获取正则式维护分页列表-接口入参")
+@Getter
+@Setter
+public class GetRegularPageVO extends Page {
+
+    private static final long serialVersionUID = -4818027140373758194L;
+
+    @ApiModelProperty(value = "正则式名称")
+    private String name;
+
+
+}

daqe-center/src/main/java/com/lantone/daqe/vo/UpRegularByIdVO.java

@@ -0,0 +1,42 @@
+package com.lantone.daqe.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @Description: 通过id修改正则式-接口入参
+ * @Author songxl
+ * @Date 2022/2/28
+ */
+@ApiModel(value = "通过id修改正则式-接口入参")
+@Getter
+@Setter
+public class UpRegularByIdVO implements Serializable {
+
+    private static final long serialVersionUID = -3965829133055502607L;
+
+    @ApiModelProperty(value = "组织机构ID")
+    private Long hospitalId;
+
+    @ApiModelProperty(value = "诊断ID", required = true)
+    @NotNull(message = "诊断ID不能为空")
+    private Long id;
+
+    @ApiModelProperty(value = "正则式名称", required = true)
+    @NotBlank(message = "正则式名称不能为空")
+    private String name;
+
+    @ApiModelProperty(value = "正则式值", required = true)
+    @NotBlank(message = "正则式值不能为空")
+    private String val;
+
+    @ApiModelProperty(value = "描述")
+    private String description;
+
+}

daqe-center/src/main/java/com/lantone/daqe/web/DiseaseManagementController.java

@@ -3,10 +3,12 @@ package com.lantone.daqe.web;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.lantone.common.api.CommonResult;
 import com.lantone.daqe.dto.GetDiseasePageDTO;
+import com.lantone.daqe.dto.GetMatchingDiseasePageDTO;
 import com.lantone.daqe.facade.DiseaseManagementFacade;
 import com.lantone.daqe.vo.AddDiseaseVO;
 import com.lantone.daqe.vo.DelDiseaseByIdVO;
 import com.lantone.daqe.vo.GetDiseasePageVO;
+import com.lantone.daqe.vo.GetMatchingDiseasePageVO;
 import com.lantone.daqe.vo.MatchingDiseaseVO;
 import com.lantone.daqe.vo.UpDiseaseByIdVO;
 import io.swagger.annotations.Api;
@@ -59,6 +61,12 @@ public class DiseaseManagementController {
         return CommonResult.success(diseaseManagementFacade.delDiseaseById(delDiseaseByIdVO));
     }
 
+    @ApiOperation(value = "匹配诊断信息列表 [by:songxl]", notes = "匹配诊断信息列表")
+    @PostMapping("/getMatchingDiseasePage")
+    public CommonResult<IPage<GetMatchingDiseasePageDTO>> getMatchingDiseasePage(@RequestBody GetMatchingDiseasePageVO getMatchingDiseasePageVO) {
+        return CommonResult.success(diseaseManagementFacade.getMatchingDiseasePage(getMatchingDiseasePageVO));
+    }
+
     @ApiOperation(value = "匹配诊断 [by:songxl]", notes = "匹配诊断")
     @PostMapping("/matchingDisease")
     public CommonResult<Boolean> matchingDisease(@RequestBody MatchingDiseaseVO matchingDiseaseVO) {

daqe-center/src/main/java/com/lantone/daqe/web/DrugManagementController.java

@@ -3,10 +3,12 @@ package com.lantone.daqe.web;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.lantone.common.api.CommonResult;
 import com.lantone.daqe.dto.GetDrugPageDTO;
+import com.lantone.daqe.dto.GetMatchingDrugPageDTO;
 import com.lantone.daqe.facade.DrugManagementFacade;
 import com.lantone.daqe.vo.AddDrugVO;
 import com.lantone.daqe.vo.DelDrugByIdVO;
 import com.lantone.daqe.vo.GetDrugPageVO;
+import com.lantone.daqe.vo.GetMatchingDrugPageVO;
 import com.lantone.daqe.vo.MatchingDrugVO;
 import com.lantone.daqe.vo.UpDrugByIdVO;
 import io.swagger.annotations.Api;
@@ -71,4 +73,10 @@ public class DrugManagementController {
         drugManagementFacade.importDrug(response, file);
     }
 
+    @ApiOperation(value = "获取药品匹配分页列表 [by:songxl]")
+    @PostMapping("/getMatchingDrugPage")
+    public CommonResult<IPage<GetMatchingDrugPageDTO>> getMatchingDrugPage(@RequestBody GetMatchingDrugPageVO getMatchingDrugPageVO) {
+        return CommonResult.success(drugManagementFacade.getMatchingDrugPage(getMatchingDrugPageVO));
+    }
+
 }

daqe-center/src/main/java/com/lantone/daqe/web/OperationManagementController.java

@@ -2,10 +2,12 @@ package com.lantone.daqe.web;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.lantone.common.api.CommonResult;
+import com.lantone.daqe.dto.GetMatchingOperationPageDTO;
 import com.lantone.daqe.dto.GetOperationPageDTO;
 import com.lantone.daqe.facade.OperationManagementFacade;
 import com.lantone.daqe.vo.AddOperationVO;
 import com.lantone.daqe.vo.DelOperationByIdVO;
+import com.lantone.daqe.vo.GetMatchingOperationVO;
 import com.lantone.daqe.vo.GetOperationPageVO;
 import com.lantone.daqe.vo.MatchingOperationVO;
 import com.lantone.daqe.vo.UpOperationByIdVO;
@@ -71,4 +73,10 @@ public class OperationManagementController {
         operationManagementFacade.importOperation(response, file);
     }
 
+    @ApiOperation(value = "获取手术匹配信息分页列表 [by:songxl]")
+    @PostMapping("/getMatchingOperationPage")
+    public CommonResult<IPage<GetMatchingOperationPageDTO>> getMatchingOperationPage(@RequestBody GetMatchingOperationVO getMatchingOperationVO) {
+        return CommonResult.success(operationManagementFacade.getMatchingOperationPage(getMatchingOperationVO));
+    }
+
 }

daqe-center/src/main/java/com/lantone/daqe/web/RegularManagementController.java

@@ -0,0 +1,70 @@
+package com.lantone.daqe.web;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.lantone.common.api.CommonResult;
+import com.lantone.daqe.dto.GetDiseasePageDTO;
+import com.lantone.daqe.dto.GetMatchingDiseasePageDTO;
+import com.lantone.daqe.dto.GetRegularPageDTO;
+import com.lantone.daqe.facade.DiseaseManagementFacade;
+import com.lantone.daqe.facade.RegularManagementFacade;
+import com.lantone.daqe.vo.AddDiseaseVO;
+import com.lantone.daqe.vo.AddRegularVO;
+import com.lantone.daqe.vo.DelDiseaseByIdVO;
+import com.lantone.daqe.vo.DelRegularByIdVO;
+import com.lantone.daqe.vo.GetDiseasePageVO;
+import com.lantone.daqe.vo.GetMatchingDiseasePageVO;
+import com.lantone.daqe.vo.GetRegularPageVO;
+import com.lantone.daqe.vo.MatchingDiseaseVO;
+import com.lantone.daqe.vo.UpDiseaseByIdVO;
+import com.lantone.daqe.vo.UpRegularByIdVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+
+/**
+ * @Description: 正则式维护API
+ * @author: songxl
+ * @time: 2022/3/4 10:39
+ */
+@RestController
+@Api(value = "正则式维护API", tags = { "正则式维护API" })
+@RequestMapping("/regularManage")
+public class RegularManagementController {
+
+    @Autowired
+    private RegularManagementFacade regularManagementFacade;
+
+    @ApiOperation(value = "获取正则式维护分页列表 [by:songxl]", notes = "获取正则式维护分页列表")
+    @PostMapping("/getRegularPage")
+    public CommonResult<IPage<GetRegularPageDTO>> getRegularPage(@RequestBody GetRegularPageVO getRegularPageVO) {
+        return CommonResult.success(regularManagementFacade.getRegularPage(getRegularPageVO));
+    }
+
+    @ApiOperation(value = "新增正则式 [by:songxl]", notes = "新增正则式")
+    @PostMapping("/addRegular")
+    public CommonResult<Boolean> addRegular(@RequestBody @Valid AddRegularVO addRegularVO) {
+        return CommonResult.success(regularManagementFacade.addRegular(addRegularVO));
+    }
+
+    @ApiOperation(value = "通过id修改正则式 [by:songxl]", notes = "通过id修改正则式")
+    @PostMapping("/upRegularById")
+    public CommonResult<Boolean> upRegularById(@RequestBody @Valid UpRegularByIdVO upRegularByIdVO) {
+        return CommonResult.success(regularManagementFacade.upRegularById(upRegularByIdVO));
+    }
+
+    @ApiOperation(value = "通过id删除正则式 [by:songxl]", notes = "通过id删除正则式")
+    @PostMapping("/delRegularById")
+    public CommonResult<Boolean> delRegularById(@RequestBody @Valid DelRegularByIdVO delRegularByIdVO) {
+        return CommonResult.success(regularManagementFacade.delRegularById(delRegularByIdVO));
+    }
+
+}

daqe-center/src/main/resources/mapper/ColumnInfoMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.lantone.daqe.mapper.ColumnInfoMapper">
+
+</mapper>

daqe-center/src/main/resources/mapper/ColumnResultMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.lantone.daqe.mapper.ColumnResultMapper">
+
+</mapper>

daqe-center/src/main/resources/mapper/ColumnVerifyMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.lantone.daqe.mapper.ColumnVerifyMapper">
+
+</mapper>

daqe-center/src/main/resources/mapper/DiseaseInfoMapper.xml

@@ -2,4 +2,29 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.lantone.daqe.mapper.DiseaseInfoMapper">
 
+    <select id="getMatchingDiseasePage" resultType="com.lantone.daqe.dto.GetMatchingDiseasePageDTO">
+        SELECT
+            icd10,
+            standard,
+            synonym,
+            CASE
+        WHEN ISNULL(standard) THEN
+            '0'
+        ELSE
+            '1'
+        END AS isMapping
+        FROM
+            `hos_disease_info`
+        WHERE
+        1=1
+        <if test="getMatchingDiseasePageVO.hospitalId != null">
+            hospital_id = #{getMatchingDiseasePageVO.hospitalId}
+        </if>
+        <if test="getMatchingDiseasePageVO.id != null">
+            AND id = #{getMatchingDiseasePageVO.id}
+        </if>
+        <if test="getMatchingDiseasePageVO.name != null and getMatchingDiseasePageVO.name != ''">
+            AND `name` LIKE like CONCAT('%',#{getMatchingDiseasePageVO.name},'%')
+        </if>
+    </select>
 </mapper>

daqe-center/src/main/resources/mapper/DrugInfoMapper.xml

@@ -2,4 +2,5 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.lantone.daqe.mapper.DrugInfoMapper">
 
+    <select id="getMatchingDrugPage" resultType="com.lantone.daqe.dto.GetMatchingDrugPageDTO"></select>
 </mapper>

daqe-center/src/main/resources/mapper/OperationInfoMapper.xml

@@ -2,4 +2,29 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.lantone.daqe.mapper.OperationInfoMapper">
 
+    <select id="getMatchingOperationPage" resultType="com.lantone.daqe.dto.GetMatchingOperationPageDTO">
+        SELECT
+            code,
+            standard,
+            synonym,
+            CASE
+            WHEN ISNULL(standard) THEN
+            '0'
+            ELSE
+            '1'
+            END AS isMapping
+        FROM
+        `hos_operation_info`
+        WHERE
+        1=1
+        <if test="getMatchingOperationVO.hospitalId != null">
+            hospital_id = #{getMatchingOperationVO.hospitalId}
+        </if>
+        <if test="getMatchingOperationVO.id != null">
+            AND id = #{getMatchingOperationVO.id}
+        </if>
+        <if test="getMatchingOperationVO.name != null and getMatchingOperationVO.name != ''">
+            AND `name` LIKE like CONCAT('%',#{getMatchingOperationVO.name},'%')
+        </if>
+    </select>
 </mapper>

daqe-center/src/main/resources/mapper/base/BaseColumnInfoMapper.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.lantone.daqe.mapper.ColumnInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.lantone.daqe.entity.ColumnInfo">
+        <id column="id" property="id"/>
+        <result column="table_cname" property="tableCname"/>
+        <result column="table_ename" property="tableEname"/>
+        <result column="column_cname" property="columnCname"/>
+        <result column="column_ename" property="columnEname"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="gmt_create" property="gmtCreate"/>
+        <result column="gmt_modified" property="gmtModified"/>
+        <result column="creator" property="creator"/>
+        <result column="modifier" property="modifier"/>
+        <result column="remark" property="remark"/>
+    </resultMap>
+
+</mapper>

daqe-center/src/main/resources/mapper/base/BaseColumnResultMapper.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.lantone.daqe.mapper.ColumnResultMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.lantone.daqe.entity.ColumnResult">
+        <id column="id" property="id"/>
+        <result column="hospital_id" property="hospitalId"/>
+        <result column="behospital_code" property="behospitalCode"/>
+        <result column="hospital_data_code" property="hospitalDataCode"/>
+        <result column="hosptial_datatmp_code" property="hosptialDatatmpCode"/>
+        <result column="hosptial_datatmp_name" property="hosptialDatatmpName"/>
+        <result column="mode_id" property="modeId"/>
+        <result column="mode_name" property="modeName"/>
+        <result column="column_id" property="columnId"/>
+        <result column="table_cname" property="tableCname"/>
+        <result column="table_ename" property="tableEname"/>
+        <result column="column_cname" property="columnCname"/>
+        <result column="column_ename" property="columnEname"/>
+        <result column="table_id" property="tableId"/>
+        <result column="table_val" property="tableVal"/>
+        <result column="type" property="type"/>
+        <result column="result_id" property="resultId"/>
+        <result column="is_solved" property="isSolved"/>
+        <result column="solve_time" property="solveTime"/>
+        <result column="is_audited" property="isAudited"/>
+        <result column="audit_time" property="auditTime"/>
+        <result column="description" property="description"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="gmt_create" property="gmtCreate"/>
+        <result column="gmt_modified" property="gmtModified"/>
+        <result column="creator" property="creator"/>
+        <result column="modifier" property="modifier"/>
+        <result column="remark" property="remark"/>
+    </resultMap>
+
+</mapper>

daqe-center/src/main/resources/mapper/base/BaseColumnVerifyMapper.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.lantone.daqe.mapper.ColumnVerifyMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.lantone.daqe.entity.ColumnVerify">
+        <id column="id" property="id"/>
+        <result column="column_id" property="columnId"/>
+        <result column="table_cname" property="tableCname"/>
+        <result column="table_ename" property="tableEname"/>
+        <result column="column_cname" property="columnCname"/>
+        <result column="column_ename" property="columnEname"/>
+        <result column="type" property="type"/>
+        <result column="verify_id" property="verifyId"/>
+        <result column="verify_val" property="verifyVal"/>
+        <result column="description" property="description"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="gmt_create" property="gmtCreate"/>
+        <result column="gmt_modified" property="gmtModified"/>
+        <result column="creator" property="creator"/>
+        <result column="modifier" property="modifier"/>
+        <result column="remark" property="remark"/>
+    </resultMap>
+
+</mapper>

daqe-center/src/main/resources/mapper/base/BaseNonnullInfoMapper.xml

@@ -5,6 +5,8 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.lantone.daqe.entity.NonnullInfo">
         <id column="id" property="id"/>
+        <result column="column_id" property="columnId"/>
+        <result column="is_required" property="isRequired"/>
         <result column="is_deleted" property="isDeleted"/>
         <result column="gmt_create" property="gmtCreate"/>
         <result column="gmt_modified" property="gmtModified"/>

daqe-center/src/main/resources/mapper/base/BaseNonnullResultMapper.xml

@@ -5,6 +5,24 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.lantone.daqe.entity.NonnullResult">
         <id column="id" property="id"/>
+        <result column="hospital_id" property="hospitalId"/>
+        <result column="behospital_code" property="behospitalCode"/>
+        <result column="hospital_data_code" property="hospitalDataCode"/>
+        <result column="hosptial_datatmp_code" property="hosptialDatatmpCode"/>
+        <result column="hosptial_datatmp_name" property="hosptialDatatmpName"/>
+        <result column="mode_id" property="modeId"/>
+        <result column="mode_name" property="modeName"/>
+        <result column="column_id" property="columnId"/>
+        <result column="table_cname" property="tableCname"/>
+        <result column="table_ename" property="tableEname"/>
+        <result column="column_cname" property="columnCname"/>
+        <result column="column_ename" property="columnEname"/>
+        <result column="table_id" property="tableId"/>
+        <result column="is_solved" property="isSolved"/>
+        <result column="solve_time" property="solveTime"/>
+        <result column="is_audited" property="isAudited"/>
+        <result column="audit_time" property="auditTime"/>
+        <result column="description" property="description"/>
         <result column="is_deleted" property="isDeleted"/>
         <result column="gmt_create" property="gmtCreate"/>
         <result column="gmt_modified" property="gmtModified"/>

daqe-center/src/main/resources/mapper/base/BaseRecordTemplateMapper.xml

@@ -9,7 +9,7 @@
         <result column="code" property="code"/>
         <result column="name" property="name"/>
         <result column="content" property="content"/>
-        <result column="content_type" property="contentType"/>
+        <result column="type" property="type"/>
         <result column="parent_code" property="parentCode"/>
         <result column="parent_name" property="parentName"/>
         <result column="is_deleted" property="isDeleted"/>

daqe-center/src/main/resources/mapper/base/BaseRegularInfoMapper.xml

@@ -5,6 +5,9 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.lantone.daqe.entity.RegularInfo">
         <id column="id" property="id"/>
+        <result column="name" property="name"/>
+        <result column="val" property="val"/>
+        <result column="description" property="description"/>
         <result column="is_deleted" property="isDeleted"/>
         <result column="gmt_create" property="gmtCreate"/>
         <result column="gmt_modified" property="gmtModified"/>

daqe-center/src/main/resources/mapper/base/BaseRegularMappingMapper.xml

@@ -5,6 +5,8 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.lantone.daqe.entity.RegularMapping">
         <id column="id" property="id"/>
+        <result column="column_id" property="columnId"/>
+        <result column="regular_id" property="regularId"/>
         <result column="is_deleted" property="isDeleted"/>
         <result column="gmt_create" property="gmtCreate"/>
         <result column="gmt_modified" property="gmtModified"/>

daqe-center/src/main/resources/mapper/base/BaseRegularResultMapper.xml

@@ -5,6 +5,29 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.lantone.daqe.entity.RegularResult">
         <id column="id" property="id"/>
+        <result column="hospital_id" property="hospitalId"/>
+        <result column="behospital_code" property="behospitalCode"/>
+        <result column="hospital_data_code" property="hospitalDataCode"/>
+        <result column="hosptial_datatmp_code" property="hosptialDatatmpCode"/>
+        <result column="hosptial_datatmp_name" property="hosptialDatatmpName"/>
+        <result column="mode_id" property="modeId"/>
+        <result column="mode_name" property="modeName"/>
+        <result column="column_id" property="columnId"/>
+        <result column="table_cname" property="tableCname"/>
+        <result column="table_ename" property="tableEname"/>
+        <result column="column_cname" property="columnCname"/>
+        <result column="column_ename" property="columnEname"/>
+        <result column="regular_id" property="regularId"/>
+        <result column="regular_name" property="regularName"/>
+        <result column="regular_val" property="regularVal"/>
+        <result column="regular_des" property="regularDes"/>
+        <result column="table_id" property="tableId"/>
+        <result column="table_val" property="tableVal"/>
+        <result column="is_solved" property="isSolved"/>
+        <result column="solve_time" property="solveTime"/>
+        <result column="is_audited" property="isAudited"/>
+        <result column="audit_time" property="auditTime"/>
+        <result column="description" property="description"/>
         <result column="is_deleted" property="isDeleted"/>
         <result column="gmt_create" property="gmtCreate"/>
         <result column="gmt_modified" property="gmtModified"/>

daqe-center/src/main/resources/mapper/base/BaseStandardvalueInfoMapper.xml

@@ -5,6 +5,8 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.lantone.daqe.entity.StandardvalueInfo">
         <id column="id" property="id"/>
+        <result column="column_id" property="columnId"/>
+        <result column="val" property="val"/>
         <result column="is_deleted" property="isDeleted"/>
         <result column="gmt_create" property="gmtCreate"/>
         <result column="gmt_modified" property="gmtModified"/>

daqe-center/src/main/resources/mapper/base/BaseStandardvalueMappingMapper.xml

@@ -5,6 +5,9 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.lantone.daqe.entity.StandardvalueMapping">
         <id column="id" property="id"/>
+        <result column="standardvalue_id" property="standardvalueId"/>
+        <result column="hospital_id" property="hospitalId"/>
+        <result column="hospital_val" property="hospitalVal"/>
         <result column="is_deleted" property="isDeleted"/>
         <result column="gmt_create" property="gmtCreate"/>
         <result column="gmt_modified" property="gmtModified"/>

daqe-center/src/main/resources/mapper/base/BaseStandardvalueResultMapper.xml

@@ -5,6 +5,26 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.lantone.daqe.entity.StandardvalueResult">
         <id column="id" property="id"/>
+        <result column="hospital_id" property="hospitalId"/>
+        <result column="behospital_code" property="behospitalCode"/>
+        <result column="hospital_data_code" property="hospitalDataCode"/>
+        <result column="hosptial_datatmp_code" property="hosptialDatatmpCode"/>
+        <result column="hosptial_datatmp_name" property="hosptialDatatmpName"/>
+        <result column="mode_id" property="modeId"/>
+        <result column="mode_name" property="modeName"/>
+        <result column="column_id" property="columnId"/>
+        <result column="table_cname" property="tableCname"/>
+        <result column="table_ename" property="tableEname"/>
+        <result column="column_cname" property="columnCname"/>
+        <result column="column_ename" property="columnEname"/>
+        <result column="mappings" property="mappings"/>
+        <result column="table_id" property="tableId"/>
+        <result column="table_val" property="tableVal"/>
+        <result column="is_solved" property="isSolved"/>
+        <result column="solve_time" property="solveTime"/>
+        <result column="is_audited" property="isAudited"/>
+        <result column="audit_time" property="auditTime"/>
+        <result column="description" property="description"/>
         <result column="is_deleted" property="isDeleted"/>
         <result column="gmt_create" property="gmtCreate"/>
         <result column="gmt_modified" property="gmtModified"/>

dblayer-mbg/src/test/java/com/lantone/dblayermbg/CodeAutoGenerator.java

@@ -103,6 +103,9 @@ public class CodeAutoGenerator {
                 "hos_official_capacity",
                 "hos_record_template",
                 "dc_blockloss_result",
+                "dc_column_info",
+                "dc_column_result",
+                "dc_column_verify",
                 "dc_nonnull_info",
                 "dc_nonnull_result",
                 "dc_regular_info",