Browse Source

数据质量相关bean调整

rengb 3 years ago
parent
commit
8fea147d79
41 changed files with 1186 additions and 5 deletions
  1. 89 0
      daqe-center/src/main/java/com/lantone/daqe/entity/ColumnInfo.java
  2. 191 0
      daqe-center/src/main/java/com/lantone/daqe/entity/ColumnResult.java
  3. 119 0
      daqe-center/src/main/java/com/lantone/daqe/entity/ColumnVerify.java
  4. 12 0
      daqe-center/src/main/java/com/lantone/daqe/entity/NonnullInfo.java
  5. 108 0
      daqe-center/src/main/java/com/lantone/daqe/entity/NonnullResult.java
  6. 1 1
      daqe-center/src/main/java/com/lantone/daqe/entity/OfficialCapacity.java
  7. 3 3
      daqe-center/src/main/java/com/lantone/daqe/entity/RecordTemplate.java
  8. 18 0
      daqe-center/src/main/java/com/lantone/daqe/entity/RegularInfo.java
  9. 12 0
      daqe-center/src/main/java/com/lantone/daqe/entity/RegularMapping.java
  10. 138 0
      daqe-center/src/main/java/com/lantone/daqe/entity/RegularResult.java
  11. 12 0
      daqe-center/src/main/java/com/lantone/daqe/entity/StandardvalueInfo.java
  12. 18 0
      daqe-center/src/main/java/com/lantone/daqe/entity/StandardvalueMapping.java
  13. 120 0
      daqe-center/src/main/java/com/lantone/daqe/entity/StandardvalueResult.java
  14. 14 0
      daqe-center/src/main/java/com/lantone/daqe/facade/base/ColumnInfoFacade.java
  15. 14 0
      daqe-center/src/main/java/com/lantone/daqe/facade/base/ColumnResultFacade.java
  16. 14 0
      daqe-center/src/main/java/com/lantone/daqe/facade/base/ColumnVerifyFacade.java
  17. 13 0
      daqe-center/src/main/java/com/lantone/daqe/mapper/ColumnInfoMapper.java
  18. 13 0
      daqe-center/src/main/java/com/lantone/daqe/mapper/ColumnResultMapper.java
  19. 13 0
      daqe-center/src/main/java/com/lantone/daqe/mapper/ColumnVerifyMapper.java
  20. 13 0
      daqe-center/src/main/java/com/lantone/daqe/service/ColumnInfoService.java
  21. 13 0
      daqe-center/src/main/java/com/lantone/daqe/service/ColumnResultService.java
  22. 13 0
      daqe-center/src/main/java/com/lantone/daqe/service/ColumnVerifyService.java
  23. 17 0
      daqe-center/src/main/java/com/lantone/daqe/service/impl/ColumnInfoServiceImpl.java
  24. 17 0
      daqe-center/src/main/java/com/lantone/daqe/service/impl/ColumnResultServiceImpl.java
  25. 17 0
      daqe-center/src/main/java/com/lantone/daqe/service/impl/ColumnVerifyServiceImpl.java
  26. 5 0
      daqe-center/src/main/resources/mapper/ColumnInfoMapper.xml
  27. 5 0
      daqe-center/src/main/resources/mapper/ColumnResultMapper.xml
  28. 5 0
      daqe-center/src/main/resources/mapper/ColumnVerifyMapper.xml
  29. 20 0
      daqe-center/src/main/resources/mapper/base/BaseColumnInfoMapper.xml
  30. 37 0
      daqe-center/src/main/resources/mapper/base/BaseColumnResultMapper.xml
  31. 25 0
      daqe-center/src/main/resources/mapper/base/BaseColumnVerifyMapper.xml
  32. 2 0
      daqe-center/src/main/resources/mapper/base/BaseNonnullInfoMapper.xml
  33. 18 0
      daqe-center/src/main/resources/mapper/base/BaseNonnullResultMapper.xml
  34. 1 1
      daqe-center/src/main/resources/mapper/base/BaseRecordTemplateMapper.xml
  35. 3 0
      daqe-center/src/main/resources/mapper/base/BaseRegularInfoMapper.xml
  36. 2 0
      daqe-center/src/main/resources/mapper/base/BaseRegularMappingMapper.xml
  37. 23 0
      daqe-center/src/main/resources/mapper/base/BaseRegularResultMapper.xml
  38. 2 0
      daqe-center/src/main/resources/mapper/base/BaseStandardvalueInfoMapper.xml
  39. 3 0
      daqe-center/src/main/resources/mapper/base/BaseStandardvalueMappingMapper.xml
  40. 20 0
      daqe-center/src/main/resources/mapper/base/BaseStandardvalueResultMapper.xml
  41. 3 0
      dblayer-mbg/src/test/java/com/lantone/dblayermbg/CodeAutoGenerator.java

+ 89 - 0
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;
+
+}

+ 191 - 0
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;
+
+}

+ 119 - 0
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;
+
+}

+ 12 - 0
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)
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
     private Long id;
 
 
+    /**
+     * 数据库表中的列信息记录ID
+     */
+    @TableField("column_id")
+    private Long columnId;
+
+    /**
+     * 是否必填,0:否,1:是
+     */
+    @TableField("is_required")
+    private String isRequired;
+
     /**
     /**
      * 是否删除,N:未删除,Y:删除
      * 是否删除,N:未删除,Y:删除
      */
      */

+ 108 - 0
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)
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
     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:删除
      * 是否删除,N:未删除,Y:删除
      */
      */

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

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

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

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

+ 18 - 0
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)
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
     private Long id;
 
 
+    /**
+     * 正则式名称
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 正则式值
+     */
+    @TableField("val")
+    private String val;
+
+    /**
+     * 描述
+     */
+    @TableField("description")
+    private String description;
+
     /**
     /**
      * 是否删除,N:未删除,Y:删除
      * 是否删除,N:未删除,Y:删除
      */
      */

+ 12 - 0
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)
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
     private Long id;
 
 
+    /**
+     * 数据库表中的列信息记录ID
+     */
+    @TableField("column_id")
+    private Long columnId;
+
+    /**
+     * 正则式ID
+     */
+    @TableField("regular_id")
+    private Long regularId;
+
     /**
     /**
      * 是否删除,N:未删除,Y:删除
      * 是否删除,N:未删除,Y:删除
      */
      */

+ 138 - 0
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)
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
     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:删除
      * 是否删除,N:未删除,Y:删除
      */
      */

+ 12 - 0
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)
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
     private Long id;
 
 
+    /**
+     * 数据库表中的列信息记录ID
+     */
+    @TableField("column_id")
+    private Long columnId;
+
+    /**
+     * 表字段的标准值
+     */
+    @TableField("val")
+    private String val;
+
     /**
     /**
      * 是否删除,N:未删除,Y:删除
      * 是否删除,N:未删除,Y:删除
      */
      */

+ 18 - 0
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)
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
     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:删除
      * 是否删除,N:未删除,Y:删除
      */
      */

+ 120 - 0
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)
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
     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:删除
      * 是否删除,N:未删除,Y:删除
      */
      */

+ 14 - 0
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 {
+
+}

+ 14 - 0
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 {
+
+}

+ 14 - 0
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 {
+
+}

+ 13 - 0
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> {
+
+}

+ 13 - 0
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> {
+
+}

+ 13 - 0
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> {
+
+}

+ 13 - 0
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> {
+
+}

+ 13 - 0
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> {
+
+}

+ 13 - 0
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> {
+
+}

+ 17 - 0
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 {
+
+}

+ 17 - 0
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 {
+
+}

+ 17 - 0
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 {
+
+}

+ 5 - 0
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>

+ 5 - 0
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>

+ 5 - 0
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>

+ 20 - 0
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>

+ 37 - 0
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>

+ 25 - 0
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>

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

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

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

@@ -5,6 +5,24 @@
     <!-- 通用查询映射结果 -->
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.lantone.daqe.entity.NonnullResult">
     <resultMap id="BaseResultMap" type="com.lantone.daqe.entity.NonnullResult">
         <id column="id" property="id"/>
         <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="is_deleted" property="isDeleted"/>
         <result column="gmt_create" property="gmtCreate"/>
         <result column="gmt_create" property="gmtCreate"/>
         <result column="gmt_modified" property="gmtModified"/>
         <result column="gmt_modified" property="gmtModified"/>

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

@@ -9,7 +9,7 @@
         <result column="code" property="code"/>
         <result column="code" property="code"/>
         <result column="name" property="name"/>
         <result column="name" property="name"/>
         <result column="content" property="content"/>
         <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_code" property="parentCode"/>
         <result column="parent_name" property="parentName"/>
         <result column="parent_name" property="parentName"/>
         <result column="is_deleted" property="isDeleted"/>
         <result column="is_deleted" property="isDeleted"/>

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

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

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

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

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

@@ -5,6 +5,29 @@
     <!-- 通用查询映射结果 -->
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.lantone.daqe.entity.RegularResult">
     <resultMap id="BaseResultMap" type="com.lantone.daqe.entity.RegularResult">
         <id column="id" property="id"/>
         <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="is_deleted" property="isDeleted"/>
         <result column="gmt_create" property="gmtCreate"/>
         <result column="gmt_create" property="gmtCreate"/>
         <result column="gmt_modified" property="gmtModified"/>
         <result column="gmt_modified" property="gmtModified"/>

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

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

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

@@ -5,6 +5,9 @@
     <!-- 通用查询映射结果 -->
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.lantone.daqe.entity.StandardvalueMapping">
     <resultMap id="BaseResultMap" type="com.lantone.daqe.entity.StandardvalueMapping">
         <id column="id" property="id"/>
         <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="is_deleted" property="isDeleted"/>
         <result column="gmt_create" property="gmtCreate"/>
         <result column="gmt_create" property="gmtCreate"/>
         <result column="gmt_modified" property="gmtModified"/>
         <result column="gmt_modified" property="gmtModified"/>

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

@@ -5,6 +5,26 @@
     <!-- 通用查询映射结果 -->
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.lantone.daqe.entity.StandardvalueResult">
     <resultMap id="BaseResultMap" type="com.lantone.daqe.entity.StandardvalueResult">
         <id column="id" property="id"/>
         <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="is_deleted" property="isDeleted"/>
         <result column="gmt_create" property="gmtCreate"/>
         <result column="gmt_create" property="gmtCreate"/>
         <result column="gmt_modified" property="gmtModified"/>
         <result column="gmt_modified" property="gmtModified"/>

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

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