소스 검색

数据校验接口

zhanghang 3 년 전
부모
커밋
59bb3bd725
26개의 변경된 파일1559개의 추가작업 그리고 9개의 파일을 삭제
  1. 35 0
      daqe-center/src/main/java/com/lantone/daqe/dto/GetRegular.java
  2. 26 0
      daqe-center/src/main/java/com/lantone/daqe/dto/GetStandardvalueInfoDTO.java
  3. 46 0
      daqe-center/src/main/java/com/lantone/daqe/dto/GetTableColumnInfoDTO.java
  4. 6 0
      daqe-center/src/main/java/com/lantone/daqe/entity/ColumnInfo.java
  5. 41 0
      daqe-center/src/main/java/com/lantone/daqe/enums/AuditStatusEnum.java
  6. 43 0
      daqe-center/src/main/java/com/lantone/daqe/enums/ColumnResultTypeEnum.java
  7. 41 0
      daqe-center/src/main/java/com/lantone/daqe/enums/ColumnTypeEnum.java
  8. 41 0
      daqe-center/src/main/java/com/lantone/daqe/enums/ModeEnum.java
  9. 41 0
      daqe-center/src/main/java/com/lantone/daqe/enums/NonnullStatusEnum.java
  10. 41 0
      daqe-center/src/main/java/com/lantone/daqe/enums/SolvedStatusEnum.java
  11. 976 6
      daqe-center/src/main/java/com/lantone/daqe/facade/ColumnResultManagementFacade.java
  12. 3 0
      daqe-center/src/main/java/com/lantone/daqe/facade/OfficialCapacityManagementFacade.java
  13. 5 0
      daqe-center/src/main/java/com/lantone/daqe/mapper/ColumnResultMapper.java
  14. 6 1
      daqe-center/src/main/java/com/lantone/daqe/mapper/RegularMappingMapper.java
  15. 6 0
      daqe-center/src/main/java/com/lantone/daqe/mapper/StandardvalueInfoMapper.java
  16. 36 0
      daqe-center/src/main/java/com/lantone/daqe/vo/DataCheckVO.java
  17. 1 1
      daqe-center/src/main/java/com/lantone/daqe/vo/GetColumnResultNumberVO.java
  18. 1 1
      daqe-center/src/main/java/com/lantone/daqe/vo/GetColumnResultPageVO.java
  19. 24 0
      daqe-center/src/main/java/com/lantone/daqe/vo/GetRegularMappingVO.java
  20. 25 0
      daqe-center/src/main/java/com/lantone/daqe/vo/GetStandardvalueInfoVO.java
  21. 48 0
      daqe-center/src/main/java/com/lantone/daqe/vo/GetTableColumnInfoVO.java
  22. 10 0
      daqe-center/src/main/java/com/lantone/daqe/web/ColumnResultManagmentController.java
  23. 26 0
      daqe-center/src/main/resources/mapper/ColumnResultMapper.xml
  24. 19 0
      daqe-center/src/main/resources/mapper/RegularMappingMapper.xml
  25. 11 0
      daqe-center/src/main/resources/mapper/StandardvalueInfoMapper.xml
  26. 1 0
      daqe-center/src/main/resources/mapper/base/BaseColumnInfoMapper.xml

+ 35 - 0
daqe-center/src/main/java/com/lantone/daqe/dto/GetRegular.java

@@ -0,0 +1,35 @@
+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: zhanghang
+ * @time: 2022/3/10 17:27
+ */
+@ApiModel(value = "获取正则信息")
+@Getter
+@Setter
+public class GetRegular implements Serializable {
+
+    private static final long serialVersionUID = -9062028442550751083L;
+    @ApiModelProperty(value = "列信息ID")
+    private Long columnId;
+
+    @ApiModelProperty(value = "正则ID")
+    private Long id;
+
+    @ApiModelProperty(value = "正则名称")
+    private String name;
+
+    @ApiModelProperty(value = "正则式值")
+    private String val;
+
+    @ApiModelProperty(value = "正则式描述")
+    private String des;
+}

+ 26 - 0
daqe-center/src/main/java/com/lantone/daqe/dto/GetStandardvalueInfoDTO.java

@@ -0,0 +1,26 @@
+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: zhanghang
+ * @time: 2022/3/11 13:31
+ */
+@ApiModel(value = "列信息标准值信息")
+@Getter
+@Setter
+public class GetStandardvalueInfoDTO implements Serializable {
+    private static final long serialVersionUID = -374537826999751004L;
+
+    @ApiModelProperty(value = "表的列信息ID")
+    private Long columnId;
+
+    @ApiModelProperty(value = "标准值")
+    private String standardvalue;
+}

+ 46 - 0
daqe-center/src/main/java/com/lantone/daqe/dto/GetTableColumnInfoDTO.java

@@ -0,0 +1,46 @@
+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: zhanghang
+ * @time: 2022/3/7 10:13
+ */
+
+@ApiModel(value = "表字段名称表名称信息")
+@Getter
+@Setter
+public class GetTableColumnInfoDTO implements Serializable {
+
+
+    private static final long serialVersionUID = 2455122692146578248L;
+
+    @ApiModelProperty(value = "表id")
+    private Long tableId;
+
+    @ApiModelProperty(value = "编号Id")
+    private String numberId;
+
+    @ApiModelProperty(value = "组织ID")
+    private Long hospitalId;
+
+    @ApiModelProperty(value = "住院序号")
+    private String behospitalCode;
+
+    @ApiModelProperty(value = "值")
+    private String val;
+
+    @ApiModelProperty(value = "模块ID")
+    private Long modeId;
+
+    @ApiModelProperty(value = "模块名称")
+    private String modeName;
+
+
+}

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

@@ -50,6 +50,12 @@ public class ColumnInfo implements Serializable {
     @TableField("column_ename")
     private String columnEname;
 
+    /**
+     * 字段类型说明,1-普通字段,2-编号字段
+     */
+    @TableField("type")
+    private String type;
+
     /**
      * 是否删除,N:未删除,Y:删除
      */

+ 41 - 0
daqe-center/src/main/java/com/lantone/daqe/enums/AuditStatusEnum.java

@@ -0,0 +1,41 @@
+package com.lantone.daqe.enums;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description: 是否必填注解
+ * @author: zhanghang
+ * @time: 2022/3/11 16:03
+ */
+public enum AuditStatusEnum {
+    NOT_AUDIT("0", "未通过"),
+    IS_AUDIT("1", "已通过");
+
+    @Getter
+    @Setter
+    private String key;
+
+    @Getter
+    @Setter
+    private String name;
+
+    AuditStatusEnum(String key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static AuditStatusEnum getEnum(String key) {
+        for (AuditStatusEnum item : AuditStatusEnum.values()) {
+            if (item.key.equals(key)) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(String key) {
+        AuditStatusEnum item = getEnum(key);
+        return item != null ? item.name : null;
+    }
+}

+ 43 - 0
daqe-center/src/main/java/com/lantone/daqe/enums/ColumnResultTypeEnum.java

@@ -0,0 +1,43 @@
+package com.lantone.daqe.enums;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description: 字段问题类型
+ * @author: zhanghang
+ * @time: 2022/3/4 16:03
+ */
+public enum ColumnResultTypeEnum {
+
+    NONNULL_TYPE("1", "数据缺失"),
+    STANDARD_TYPE("2", "非标准值"),
+    REGULAR_TYPE("3", "正则校验失败");
+
+    @Getter
+    @Setter
+    private String key;
+
+    @Getter
+    @Setter
+    private String name;
+
+    ColumnResultTypeEnum(String key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static ColumnResultTypeEnum getEnum(String key) {
+        for (ColumnResultTypeEnum item : ColumnResultTypeEnum.values()) {
+            if (item.key.equals(key)) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(String key) {
+        ColumnResultTypeEnum item = getEnum(key);
+        return item != null ? item.name : null;
+    }
+}

+ 41 - 0
daqe-center/src/main/java/com/lantone/daqe/enums/ColumnTypeEnum.java

@@ -0,0 +1,41 @@
+package com.lantone.daqe.enums;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description: 是否必填注解
+ * @author: zhanghang
+ * @time: 2022/3/11 16:03
+ */
+public enum ColumnTypeEnum {
+    FIELD_ORDINARY("1", "普通字段"),
+    FIELD_NUMBER("2", "编号字段");
+
+    @Getter
+    @Setter
+    private String key;
+
+    @Getter
+    @Setter
+    private String name;
+
+    ColumnTypeEnum(String key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static ColumnTypeEnum getEnum(String key) {
+        for (ColumnTypeEnum item : ColumnTypeEnum.values()) {
+            if (item.key.equals(key)) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(String key) {
+        ColumnTypeEnum item = getEnum(key);
+        return item != null ? item.name : null;
+    }
+}

+ 41 - 0
daqe-center/src/main/java/com/lantone/daqe/enums/ModeEnum.java

@@ -0,0 +1,41 @@
+package com.lantone.daqe.enums;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description: 表对应的mode信息
+ * @author: zhanghang
+ * @time: 2022/3/11 16:03
+ */
+public enum ModeEnum {
+    med_home_page("6", "病案首页");
+
+
+    @Getter
+    @Setter
+    private String key;
+
+    @Getter
+    @Setter
+    private String name;
+
+    ModeEnum(String key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static ModeEnum getEnum(String key) {
+        for (ModeEnum item : ModeEnum.values()) {
+            if (item.key.equals(key)) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(String key) {
+        ModeEnum item = getEnum(key);
+        return item != null ? item.name : null;
+    }
+}

+ 41 - 0
daqe-center/src/main/java/com/lantone/daqe/enums/NonnullStatusEnum.java

@@ -0,0 +1,41 @@
+package com.lantone.daqe.enums;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description: 是否必填注解
+ * @author: zhanghang
+ * @time: 2022/3/11 16:03
+ */
+public enum NonnullStatusEnum {
+    NOT_NONNULL("0", "否"),
+    IS_NONNULL("1", "是");
+
+    @Getter
+    @Setter
+    private String key;
+
+    @Getter
+    @Setter
+    private String name;
+
+    NonnullStatusEnum(String key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static NonnullStatusEnum getEnum(String key) {
+        for (NonnullStatusEnum item : NonnullStatusEnum.values()) {
+            if (item.key.equals(key)) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(String key) {
+        NonnullStatusEnum item = getEnum(key);
+        return item != null ? item.name : null;
+    }
+}

+ 41 - 0
daqe-center/src/main/java/com/lantone/daqe/enums/SolvedStatusEnum.java

@@ -0,0 +1,41 @@
+package com.lantone.daqe.enums;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description: 是否必填注解
+ * @author: zhanghang
+ * @time: 2022/3/11 16:03
+ */
+public enum SolvedStatusEnum {
+    NOT_SOLVED("0", "未解决"),
+    IS_SOLVED("1", "已解决");
+
+    @Getter
+    @Setter
+    private String key;
+
+    @Getter
+    @Setter
+    private String name;
+
+    SolvedStatusEnum(String key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static SolvedStatusEnum getEnum(String key) {
+        for (SolvedStatusEnum item : SolvedStatusEnum.values()) {
+            if (item.key.equals(key)) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(String key) {
+        SolvedStatusEnum item = getEnum(key);
+        return item != null ? item.name : null;
+    }
+}

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 976 - 6
daqe-center/src/main/java/com/lantone/daqe/facade/ColumnResultManagementFacade.java


+ 3 - 0
daqe-center/src/main/java/com/lantone/daqe/facade/OfficialCapacityManagementFacade.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.lantone.common.enums.IsDeleteEnum;
 import com.lantone.common.util.BeanUtil;
 import com.lantone.common.util.StringUtil;
+import com.lantone.common.util.SysUserUtils;
 import com.lantone.daqe.dto.GetOfficialCapacityPageDTO;
 import com.lantone.daqe.entity.OfficialCapacity;
 import com.lantone.daqe.facade.base.OfficialCapacityFacade;
@@ -78,6 +79,8 @@ public class OfficialCapacityManagementFacade {
         OfficialCapacity officialCapacity = new OfficialCapacity();
         officialCapacity.setIsDeleted(IsDeleteEnum.Y.getKey());
         officialCapacity.setGmtModified(new Date());
+        String currentUserId = SysUserUtils.getCurrentPrincipleIdStr();
+        officialCapacity.setCreator(currentUserId);
         Long[] id = delOfficialCapacityByIdVO.getId();
         return officialCapacityFacade.update(officialCapacity, new QueryWrapper<OfficialCapacity>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())

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

@@ -2,10 +2,14 @@ package com.lantone.daqe.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.lantone.daqe.dto.GetColumnResultNumberDTO;
+import com.lantone.daqe.dto.GetTableColumnInfoDTO;
 import com.lantone.daqe.entity.ColumnResult;
 import com.lantone.daqe.vo.GetColumnResultNumberVO;
+import com.lantone.daqe.vo.GetTableColumnInfoVO;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 表名:dc_column_result Mapper接口
@@ -14,4 +18,5 @@ import org.apache.ibatis.annotations.Param;
 public interface ColumnResultMapper extends BaseMapper<ColumnResult> {
     GetColumnResultNumberDTO getColumnResultNumber(@Param("getColumnResultNumberVO") GetColumnResultNumberVO getColumnResultNumberVO);
 
+    List<GetTableColumnInfoDTO> getTableColumnVal(@Param("getTableColumnInfoVO") GetTableColumnInfoVO getTableColumnInfoVO);
 }

+ 6 - 1
daqe-center/src/main/java/com/lantone/daqe/mapper/RegularMappingMapper.java

@@ -1,7 +1,12 @@
 package com.lantone.daqe.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.daqe.dto.GetRegular;
 import com.lantone.daqe.entity.RegularMapping;
+import com.lantone.daqe.vo.GetRegularMappingVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -9,5 +14,5 @@ import com.lantone.daqe.entity.RegularMapping;
  * </p>
  */
 public interface RegularMappingMapper extends BaseMapper<RegularMapping> {
-
+    List<GetRegular> getRegularMapping(@Param("getRegularMappingVO") GetRegularMappingVO getRegularMappingVO);
 }

+ 6 - 0
daqe-center/src/main/java/com/lantone/daqe/mapper/StandardvalueInfoMapper.java

@@ -1,7 +1,12 @@
 package com.lantone.daqe.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lantone.daqe.dto.GetStandardvalueInfoDTO;
 import com.lantone.daqe.entity.StandardvalueInfo;
+import com.lantone.daqe.vo.GetStandardvalueInfoVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -9,5 +14,6 @@ import com.lantone.daqe.entity.StandardvalueInfo;
  * </p>
  */
 public interface StandardvalueInfoMapper extends BaseMapper<StandardvalueInfo> {
+    List<GetStandardvalueInfoDTO> getStandardvalueInfo(@Param("getStandardvalueInfoVO") GetStandardvalueInfoVO getStandardvalueInfoVO);
 
 }

+ 36 - 0
daqe-center/src/main/java/com/lantone/daqe/vo/DataCheckVO.java

@@ -0,0 +1,36 @@
+package com.lantone.daqe.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description: 数据校验-接口入参
+ * @author: zhanghang
+ * @time: 2022/3/10 13:26
+ */
+@ApiModel(value = "数据校验-接口入参")
+@Getter
+@Setter
+public class DataCheckVO implements Serializable {
+    private static final long serialVersionUID = -1055431771065850478L;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "开始时间", required = true)
+    private Date dateStart;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "结束时间", required = true)
+    private Date dateEnd;
+
+    @ApiModelProperty(value = "住院序号")
+    private String behospitalCode;
+
+    @ApiModelProperty(value = "组织机构ID")
+    private Long hospitalId;
+}

+ 1 - 1
daqe-center/src/main/java/com/lantone/daqe/vo/GetColumnResultNumberVO.java

@@ -20,5 +20,5 @@ public class GetColumnResultNumberVO implements Serializable {
     private static final long serialVersionUID = 6969154935606282123L;
 
     @ApiModelProperty(value = "组织ID", required = true)
-    private String hospitalId;
+    private Long hospitalId;
 }

+ 1 - 1
daqe-center/src/main/java/com/lantone/daqe/vo/GetColumnResultPageVO.java

@@ -30,7 +30,7 @@ public class GetColumnResultPageVO extends Page {
     private Date solveTimeEnd;
 
     @ApiModelProperty(value = "组织ID", required = true)
-    private String hospitalId;
+    private Long hospitalId;
 
     @ApiModelProperty(value = "住院序号")
     private String behospitalCode;

+ 24 - 0
daqe-center/src/main/java/com/lantone/daqe/vo/GetRegularMappingVO.java

@@ -0,0 +1,24 @@
+package com.lantone.daqe.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+/**
+ * @Description: 获取正则信息
+ * @author: zhanghang
+ * @time: 2022/3/11 16:20
+ */
+
+@ApiModel(value = "获取正则信息")
+@Getter
+@Setter
+public class GetRegularMappingVO implements Serializable {
+    private static final long serialVersionUID = -3391245698936661811L;
+
+    @ApiModelProperty(value = "列信息ID")
+    private Long columnId;
+}

+ 25 - 0
daqe-center/src/main/java/com/lantone/daqe/vo/GetStandardvalueInfoVO.java

@@ -0,0 +1,25 @@
+package com.lantone.daqe.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+/**
+ * @Description: 获取关键值信息
+ * @author: zhanghang
+ * @time: 2022/3/11 16:28
+ */
+
+@ApiModel(value = "获取关键值信息")
+@Getter
+@Setter
+public class GetStandardvalueInfoVO implements Serializable {
+
+    private static final long serialVersionUID = -5391338536121412823L;
+
+    @ApiModelProperty(value = "列信息ID")
+    private Long columnId;
+}

+ 48 - 0
daqe-center/src/main/java/com/lantone/daqe/vo/GetTableColumnInfoVO.java

@@ -0,0 +1,48 @@
+package com.lantone.daqe.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+/**
+ * @Description: 表字段名称表名称信息
+ * @author: zhanghang
+ * @time: 2022/3/7 10:13
+ */
+
+@ApiModel(value = "表字段名称表名称信息")
+@Getter
+@Setter
+public class GetTableColumnInfoVO implements Serializable {
+
+
+    private static final long serialVersionUID = -61657650991061514L;
+    @ApiModelProperty(value = "主键")
+    private Long id;
+
+    @ApiModelProperty(value = "编号字段", required = true)
+    private String numberColumnCname;
+
+    @ApiModelProperty(value = "组织ID", required = true)
+    private Long hospitalId;
+
+    @ApiModelProperty(value = "表名称(中文)", required = true)
+    private String tableCname;
+
+    @ApiModelProperty(value = "表名称(英文)", required = true)
+    private String tableEname;
+
+    @ApiModelProperty(value = "字段名称(中文)", required = true)
+    private String columnCname;
+
+    @ApiModelProperty(value = "字段名称(英文)", required = true)
+    private String columnEname;
+
+    @ApiModelProperty(value = "住院序号")
+    private String behospitalCode;
+
+
+}

+ 10 - 0
daqe-center/src/main/java/com/lantone/daqe/web/ColumnResultManagmentController.java

@@ -7,6 +7,7 @@ import com.lantone.daqe.dto.GetByIdColumnResultDTO;
 import com.lantone.daqe.dto.GetColumnResultNumberDTO;
 import com.lantone.daqe.dto.GetColumnResultPageDTO;
 import com.lantone.daqe.facade.ColumnResultManagementFacade;
+import com.lantone.daqe.vo.DataCheckVO;
 import com.lantone.daqe.vo.GetColumnResultNumberVO;
 import com.lantone.daqe.vo.GetColumnResultPageVO;
 import com.lantone.daqe.vo.UpdateColumnResultVO;
@@ -14,6 +15,7 @@ import com.lantone.daqe.vo.GetByIdColumnResultVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -47,6 +49,7 @@ public class ColumnResultManagmentController {
 
     @ApiOperation(value = "修改字段校验问题明细 [by:zhanghang]")
     @PostMapping("/updateColumnResult")
+    @Transactional
     public CommonResult<Boolean> updateColumnResult(@RequestBody UpdateColumnResultVO updateColumnResultVO) {
         return CommonResult.success(columnResultManagementFacade.updateColumnResult(updateColumnResultVO));
     }
@@ -56,4 +59,11 @@ public class ColumnResultManagmentController {
     public CommonResult<GetByIdColumnResultDTO> getByIdColumnResult(@RequestBody GetByIdColumnResultVO getByIdColumnResultVO) {
         return CommonResult.success(columnResultManagementFacade.getByIdColumnResult(getByIdColumnResultVO));
     }
+
+    @ApiOperation(value = "数据校验接口 [by:zhanghang]")
+    @PostMapping("/dataCheck")
+    @Transactional
+    public CommonResult<Boolean> dataCheck(@RequestBody DataCheckVO dataCheckVO) {
+        return CommonResult.success(columnResultManagementFacade.dataCheck(dataCheckVO));
+    }
 }

+ 26 - 0
daqe-center/src/main/resources/mapper/ColumnResultMapper.xml

@@ -19,4 +19,30 @@
 	and hospital_id=#{getColumnResultNumberVO.hospitalId}
 
     </select>
+
+
+    <select id="getTableColumnVal" resultType="com.lantone.daqe.dto.GetTableColumnInfoDTO">
+		SELECT
+			a.behospital_code,
+			a.hospital_id,
+			sdd.id tableId,
+			sdd.${getTableColumnInfoVO.columnEname} val,
+			sdd.${getTableColumnInfoVO.numberColumnCname} numberId
+		FROM
+			(
+				SELECT
+					behospital_code,
+					hospital_id
+				FROM
+					med_behospital_info
+				WHERE
+					behospital_code = #{getTableColumnInfoVO.behospitalCode}
+				AND is_deleted = 'N'
+				AND hospital_id = #{getTableColumnInfoVO.hospitalId}
+				AND is_placefile = 1
+			) a
+		LEFT JOIN ${getTableColumnInfoVO.tableEname} sdd ON sdd.behospital_code = a.behospital_code
+		AND sdd.is_deleted = 'N'
+		AND a.hospital_id = sdd.hospital_id
+    </select>
 </mapper>

+ 19 - 0
daqe-center/src/main/resources/mapper/RegularMappingMapper.xml

@@ -2,4 +2,23 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.lantone.daqe.mapper.RegularMappingMapper">
 
+
+    <select id="getRegularMapping" resultType="com.lantone.daqe.dto.GetRegular">
+        SELECT
+        a.column_id,
+        a.regular_id id,
+        b.`name`,
+        b.val,
+        b.description des
+        FROM
+        dc_regular_mapping a,
+        dc_regular_info b
+        where
+        a.regular_id=b.id
+        AND a.is_deleted='N'
+        AND b.is_deleted='N'
+        <if test="getRegularMappingVO.columnId != null and getRegularMappingVO.columnId != ''">
+            AND a.column_id = #{getRegularMappingVO.columnId}
+        </if>
+    </select>
 </mapper>

+ 11 - 0
daqe-center/src/main/resources/mapper/StandardvalueInfoMapper.xml

@@ -2,4 +2,15 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.lantone.daqe.mapper.StandardvalueInfoMapper">
 
+    <select id="getStandardvalueInfo" resultType="com.lantone.daqe.dto.GetStandardvalueInfoDTO">
+        SELECT
+            a.column_id,
+            GROUP_CONCAT(a.val SEPARATOR ';') standardvalue
+        FROM
+            dc_standardvalue_info a
+        WHERE
+            a.is_deleted = 'N'
+        GROUP BY
+            a.column_id
+    </select>
 </mapper>

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

@@ -9,6 +9,7 @@
         <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="is_deleted" property="isDeleted"/>
         <result column="gmt_create" property="gmtCreate"/>
         <result column="gmt_modified" property="gmtModified"/>