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

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

@@ -0,0 +1,53 @@
+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;
+import java.util.Date;
+
+/**
+ * @Description: 获取病历数据丢失明细分页列表-接口出参
+ * @author: songxl
+ * @time: 2022/3/4 10:39
+ */
+@ApiModel(value = "获取病历数据丢失明细分页列表-接口出参")
+@Getter
+@Setter
+public class GetBlockLossPageDTO implements Serializable {
+
+    private static final long serialVersionUID = -9157314435696856131L;
+
+    @ApiModelProperty(value = "编号")
+    private Long id;
+
+    @ApiModelProperty(value = "住院序号")
+    private String behospitalCode;
+
+    @ApiModelProperty(value = "文书编号")
+    private String recId;
+
+    @ApiModelProperty(value = "文书标题")
+    private String recTitle;
+
+    @ApiModelProperty(value = "丢失原因")
+    private String lossCause;
+
+    @ApiModelProperty(value = "丢失类型: 0:文书丢失 1:病案首页丢失 2:患者信息丢失")
+    private String lossType;
+
+    @ApiModelProperty(value = "丢失途径: 0:外部丢失 1:内部丢失")
+    private String lossWay;
+
+    @ApiModelProperty(value = "更新时间")
+    private Date auditTime;
+
+    @ApiModelProperty(value = "状态: 0:已丢失,1:已恢复")
+    private String status;
+
+    @ApiModelProperty(value = "核查结果 0:未通过，1:已通过，2:未核查")
+    private String isAudited;
+
+}

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

@@ -26,6 +26,84 @@ public class BlocklossResult 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("rec_id")
+    private String recId;
+
+    /**
+     * 文书标题
+     */
+    @TableField("rec_title")
+    private String recTitle;
+
+    /**
+     * 模块id
+     */
+    @TableField("mode_id")
+    private Long modeId;
+
+    /**
+     * 丢失原因
+     */
+    @TableField("loss_cause")
+    private String lossCause;
+
+    /**
+     * 丢失类型: 0:文书丢失 1:病案首页丢失 2:患者信息丢失
+     */
+    @TableField("loss_type")
+    private String lossType;
+
+    /**
+     * 丢失途径: 0:外部丢失 1:内部丢失
+     */
+    @TableField("loss_way")
+    private String lossWay;
+
+    /**
+     * 是否通过了人工核查,0:未通过，1:已通过，2:未核查。对于未解决的问题数据，人工进行干预，确认其是否通过校验。
+     */
+    @TableField("is_audited")
+    private String isAudited;
+
+    /**
+     * 最近一次人工核查时间
+     */
+    @TableField("audit_time")
+    private Date auditTime;
+
+    /**
+     * 状态: 0:已丢失,1:已恢复
+     */
+    @TableField("status")
+    private String status;
+
+    /**
+     * 最近一次机器比对时间
+     */
+    @TableField("solve_time")
+    private Date solveTime;
+
+    /**
+     * 最近一次数据补录时间
+     */
+    @TableField("repair_time")
+    private Date repairTime;
+
     /**
      * 是否删除,N:未删除，Y:删除
      */

daqe-center/src/main/java/com/lantone/daqe/enums/ColumnVerifyTypeEnum.java

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

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

@@ -0,0 +1,25 @@
+package com.lantone.daqe.facade;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.lantone.daqe.dto.GetBlockLossPageDTO;
+import com.lantone.daqe.facade.base.BlocklossResultFacade;
+import com.lantone.daqe.vo.GetBlockLossPageVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description: 病历数据丢失明细-业务处理类
+ * @author: songxl
+ * @time: 2022/3/4 10:39
+ */
+@Component
+public class BlockLossManagementFacade {
+    @Autowired
+    private BlocklossResultFacade blocklossResultFacade;
+
+
+    public IPage<GetBlockLossPageDTO> getBlockLossPage(GetBlockLossPageVO getBlockLossPageVO) {
+        return blocklossResultFacade.getBaseMapper().getBlockLossPage(getBlockLossPageVO);
+    }
+}

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

@@ -1,30 +1,38 @@
 package com.lantone.daqe.facade;
 
 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.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.GetColumnDTO;
 import com.lantone.daqe.dto.GetColumnNameDTO;
 import com.lantone.daqe.dto.GetColumnVerifyPageDTO;
 import com.lantone.daqe.dto.GetRegularDTO;
 import com.lantone.daqe.dto.GetTableNameDTO;
 import com.lantone.daqe.entity.ColumnInfo;
+import com.lantone.daqe.entity.ColumnVerify;
+import com.lantone.daqe.entity.NonnullInfo;
 import com.lantone.daqe.entity.RegularInfo;
 import com.lantone.daqe.entity.RegularMapping;
+import com.lantone.daqe.entity.StandardvalueInfo;
+import com.lantone.daqe.enums.ColumnVerifyTypeEnum;
 import com.lantone.daqe.facade.base.ColumnInfoFacade;
 import com.lantone.daqe.facade.base.ColumnVerifyFacade;
+import com.lantone.daqe.facade.base.NonnullInfoFacade;
 import com.lantone.daqe.facade.base.RegularInfoFacade;
 import com.lantone.daqe.facade.base.RegularMappingFacade;
+import com.lantone.daqe.facade.base.StandardvalueInfoFacade;
 import com.lantone.daqe.vo.AddColumnVerifyVO;
 import com.lantone.daqe.vo.ColumnInfoVO;
+import com.lantone.daqe.vo.DelColumnVerifyVO;
 import com.lantone.daqe.vo.GetColumnNameVO;
 import com.lantone.daqe.vo.GetColumnVerifyPageVO;
 import com.lantone.daqe.vo.GetRegularVO;
 import com.lantone.daqe.vo.GetTableNameVO;
+import com.lantone.daqe.vo.UpdateColumnVerifyVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -44,13 +52,16 @@ public class ColumnVerifyManagementFacade {
 
     @Autowired
     ColumnVerifyFacade columnVerifyFacade;
-
     @Autowired
     ColumnInfoFacade columnInfoFacade;
     @Autowired
     RegularInfoFacade regularInfoFacade;
     @Autowired
     RegularMappingFacade regularMappingFacade;
+    @Autowired
+    NonnullInfoFacade nonnullInfoFacade;
+    @Autowired
+    StandardvalueInfoFacade standardvalueInfoFacade;
 
     /**
      * 获取字段校验规则分页列表数据
@@ -65,7 +76,7 @@ public class ColumnVerifyManagementFacade {
     /**
      * 下拉框获取数据库表中列数据表名称信息
      *
-     * @param
+     * @param getTableNameVO
      * @return: 数据库表中列数据表名称信息
      */
     public List<GetTableNameDTO> getTableName(GetTableNameVO getTableNameVO) {
@@ -73,7 +84,7 @@ public class ColumnVerifyManagementFacade {
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .like(StringUtil.isNotBlank(getTableNameVO.getTableCname()), "table_cname", getTableNameVO.getTableCname())
                 .like(StringUtil.isNotBlank(getTableNameVO.getTableEname()), "table_ename", getTableNameVO.getTableEname())
-                .groupBy("table_cname","table_ename")
+                .groupBy("table_cname", "table_ename")
         );
         List<GetTableNameDTO> getColumnDTOList = BeanUtil.listCopyTo(columnInfoList, GetTableNameDTO.class);
         return getColumnDTOList;
@@ -82,7 +93,7 @@ public class ColumnVerifyManagementFacade {
     /**
      * 下拉框获取数据库表中列数据字段名称信息
      *
-     * @param
+     * @param getColumnNameVO
      * @return: 数据库表中列数据字段名称信息
      */
     public List<GetColumnNameDTO> getColumnName(GetColumnNameVO getColumnNameVO) {
@@ -90,7 +101,7 @@ public class ColumnVerifyManagementFacade {
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .like(StringUtil.isNotBlank(getColumnNameVO.getColumnCname()), "column_cname", getColumnNameVO.getColumnCname())
                 .like(StringUtil.isNotBlank(getColumnNameVO.getColumnEname()), "column_ename", getColumnNameVO.getColumnEname())
-                .groupBy("column_cname","column_ename")
+                .groupBy("column_cname", "column_ename")
         );
         List<GetColumnNameDTO> getColumnDTOList = BeanUtil.listCopyTo(columnInfoList, GetColumnNameDTO.class);
         return getColumnDTOList;
@@ -99,7 +110,7 @@ public class ColumnVerifyManagementFacade {
     /**
      * 下拉框获取正则式名称
      *
-     * @param
+     * @param getRegularVO
      * @return: 正则式名称
      */
     public List<GetRegularDTO> getRegular(GetRegularVO getRegularVO) {
@@ -114,12 +125,11 @@ public class ColumnVerifyManagementFacade {
     /**
      * 新增字段校验规则
      *
-     * @param
+     * @param addColumnVerifyVO
      * @return: 是否成功
      */
     public Boolean addColumnVerify(AddColumnVerifyVO addColumnVerifyVO) {
         List<ColumnInfoVO> columnList = addColumnVerifyVO.getColumnList();
-        List<Long> columnIdList = new ArrayList<>();
         //查出表列信息ID
         for (ColumnInfoVO columnInfoVO : columnList) {
             ColumnInfo columnInfo = columnInfoFacade.getBaseMapper().selectOne(new QueryWrapper<ColumnInfo>()
@@ -129,33 +139,379 @@ public class ColumnVerifyManagementFacade {
                     .eq(StringUtil.isNotBlank(columnInfoVO.getColumnCname()), "column_cname", columnInfoVO.getColumnCname())
                     .eq(StringUtil.isNotBlank(columnInfoVO.getColumnEname()), "column_ename", columnInfoVO.getColumnEname())
             );
-            columnIdList.add(columnInfo.getId());
-        }
-        //插入正则维护表
-        if(ListUtil.isNotEmpty(columnIdList)){
-            for (Long columnId : columnIdList) {
-                //先判断是否该字段信息是否已关联该正则
+            Long columnId = columnInfo.getId();
+            if (columnId == null) {
+                Asserts.fail("不存在该字段信息！");
+            }
+            ColumnVerify columnVerify = new ColumnVerify();
+            columnVerify.setColumnId(columnId);
+            columnVerify.setColumnCname(columnInfoVO.getColumnCname());
+            columnVerify.setColumnEname(columnInfoVO.getColumnEname());
+            columnVerify.setTableCname(columnInfoVO.getTableCname());
+            columnVerify.setTableEname(columnInfoVO.getTableEname());
+            if (addColumnVerifyVO.getRegularId() != null) {
+                //插入正则维护表
+                //先判断是否该字段信息是否已关联正则
                 RegularMapping selectOneMapping = regularMappingFacade.getBaseMapper().selectOne(new QueryWrapper<RegularMapping>()
                         .eq("column_id", columnId)
-                        .eq("regular_id", addColumnVerifyVO.getRegularId())
                         .eq("is_deleted", IsDeleteEnum.N.getKey())
                 );
-                if(selectOneMapping!=null){
-                    Asserts.fail("所选字段已关联该正则,请重新选择正则！");
+                if (selectOneMapping != null) {
+                    Asserts.fail("所选字段已关联正则！");
                 }
                 RegularMapping regularMapping = new RegularMapping();
                 regularMapping.setColumnId(columnId);
                 regularMapping.setGmtCreate(new Date());
                 regularMapping.setRegularId(addColumnVerifyVO.getRegularId());
-                int insert = regularMappingFacade.getBaseMapper().insert(regularMapping);
-                if(insert!=1){
+                try {
+                    regularMappingFacade.getBaseMapper().insert(regularMapping);
+                } catch (Exception e) {
                     Asserts.fail("关联正则失败,请重试！");
                 }
+                Long regularMappingId = regularMapping.getId();
+                //插入总表
+                columnVerify.setType(ColumnVerifyTypeEnum.REGULAR_TYPE.getKey());
+                columnVerify.setVerifyId(regularMappingId);
+                columnVerify.setVerifyVal(addColumnVerifyVO.getRegularName());
+                columnVerify.setDescription(addColumnVerifyVO.getDescription());
+                columnVerify.setGmtCreate(new Date());
+                try {
+                    columnVerifyFacade.getBaseMapper().insert(columnVerify);
+                } catch (Exception e) {
+                    Asserts.fail("保存失败");
+                }
+            }
+            if (addColumnVerifyVO.getIsRequired() != null) {
+                //插入表字段的非空校验维护表
+                //先判断是否该字段信息是否已存在非空规则
+                NonnullInfo selectOneInfo = nonnullInfoFacade.getBaseMapper().selectOne(new QueryWrapper<NonnullInfo>()
+                        .eq("column_id", columnId)
+                        .eq("is_deleted", IsDeleteEnum.N.getKey())
+                );
+                if (selectOneInfo != null) {
+                    Asserts.fail("所选字段已存在是否非空维护规则");
+                }
+                NonnullInfo nonnullInfo = new NonnullInfo();
+                nonnullInfo.setColumnId(columnId);
+                nonnullInfo.setGmtCreate(new Date());
+                nonnullInfo.setIsRequired(addColumnVerifyVO.getIsRequired());
+                try {
+                    nonnullInfoFacade.getBaseMapper().insert(nonnullInfo);
+                } catch (Exception e) {
+                    Asserts.fail("关联是否非空失败,请重试！");
+                }
+                Long nonnullInfoId = nonnullInfo.getId();
+                //插入总表
+                columnVerify.setType(ColumnVerifyTypeEnum.NONNULL_TYPE.getKey());
+                columnVerify.setVerifyId(nonnullInfoId);
+                columnVerify.setVerifyVal(addColumnVerifyVO.getIsRequired());
+                columnVerify.setDescription(addColumnVerifyVO.getDescription());
+                columnVerify.setGmtCreate(new Date());
+                try {
+                    columnVerifyFacade.getBaseMapper().insert(columnVerify);
+                } catch (Exception e) {
+                    Asserts.fail("保存失败");
+                }
+            }
+            if (ListUtil.isNotEmpty(addColumnVerifyVO.getStandardValueList())) {
+                //插入关键字信息维护表
+                List<String> standardValueList = addColumnVerifyVO.getStandardValueList();
+                for (String standardValue : standardValueList) {
+                    StandardvalueInfo standardvalueInfo = new StandardvalueInfo();
+                    standardvalueInfo.setColumnId(columnId);
+                    standardvalueInfo.setGmtCreate(new Date());
+                    standardvalueInfo.setVal(standardValue);
+                    try {
+                        standardvalueInfoFacade.getBaseMapper().insert(standardvalueInfo);
+                    } catch (Exception e) {
+                        Asserts.fail("关联关键字失败,请重试！");
+                    }
+                    Long standardvalueInfoId = standardvalueInfo.getId();
+                    //插入总表
+                    columnVerify.setType(ColumnVerifyTypeEnum.STANDARD_TYPE.getKey());
+                    columnVerify.setVerifyId(standardvalueInfoId);
+                    columnVerify.setVerifyVal(standardValue);
+                    columnVerify.setDescription(addColumnVerifyVO.getDescription());
+                    columnVerify.setGmtCreate(new Date());
+                    try {
+                        columnVerifyFacade.getBaseMapper().insert(columnVerify);
+                    } catch (Exception e) {
+                        Asserts.fail("保存失败");
+                    }
+                }
+            }
+        }
+        return true;
+    }
+
+    /**
+     * 删除字段校验规则
+     *
+     * @param delColumnVerifyVO
+     * @return: 是否成功
+     */
+    public Boolean delColumnVerify(DelColumnVerifyVO delColumnVerifyVO) {
+        Boolean nonnullInfo = true;
+        Boolean tandardvalueInfo = true;
+        Boolean regular = true;
+        List<Long> ids = delColumnVerifyVO.getIds();
+        List<ColumnVerify> columnVerifyList = columnVerifyFacade.getBaseMapper().selectList(new QueryWrapper<ColumnVerify>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .in("column_id", ids)
+        );
+        if (ListUtil.isEmpty(columnVerifyList)) {
+            Asserts.fail("删除失败，不存在所需删除数据！");
+        }
+        //所删正则ID
+        List<Long> regularId = new ArrayList<>();
+        //非空判断ID
+        List<Long> nonnullId = new ArrayList<>();
+        //关键值ID
+        List<Long> standardValueId = new ArrayList<>();
+        for (ColumnVerify columnVerify : columnVerifyList) {
+            String type = columnVerify.getType();
+            //非空
+            if (ColumnVerifyTypeEnum.NONNULL_TYPE.getKey().equals(type)) {
+                nonnullId.add(columnVerify.getVerifyId());
+            }
+            //关键值
+            if (ColumnVerifyTypeEnum.STANDARD_TYPE.getKey().equals(type)) {
+                standardValueId.add(columnVerify.getVerifyId());
+            }
+            //正则
+            if (ColumnVerifyTypeEnum.REGULAR_TYPE.getKey().equals(type)) {
+                regularId.add(columnVerify.getVerifyId());
+            }
+        }
+        //非空
+        if (ListUtil.isNotEmpty(nonnullId)) {
+            nonnullInfo = nonnullInfoFacade.update(new UpdateWrapper<NonnullInfo>()
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .in("id", nonnullId)
+                    .set("is_deleted", IsDeleteEnum.Y.getKey())
+                    .set("gmt_modified", new Date())
+            );
+        }
+        //关键值
+        if (ListUtil.isNotEmpty(standardValueId)) {
+            tandardvalueInfo = standardvalueInfoFacade.update(new UpdateWrapper<StandardvalueInfo>()
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .in("id", standardValueId)
+                    .set("is_deleted", IsDeleteEnum.Y.getKey())
+                    .set("gmt_modified", new Date())
+            );
+        }
+        //正则
+        if (ListUtil.isNotEmpty(regularId)) {
+            regular = regularMappingFacade.update(new UpdateWrapper<RegularMapping>()
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .in("id", regularId)
+                    .set("is_deleted", IsDeleteEnum.Y.getKey())
+                    .set("gmt_modified", new Date())
+            );
+        }
+        if (nonnullInfo && tandardvalueInfo && regular) {
+            boolean update = columnVerifyFacade.update(new UpdateWrapper<ColumnVerify>()
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .in("column_id", ids)
+                    .set("is_deleted", IsDeleteEnum.Y.getKey())
+                    .set("gmt_modified", new Date())
+            );
+            if (update) {
+                return true;
+            }
+        }
+        Asserts.fail("删除失败");
+        return false;
+    }
+
+    /**
+     * 修改字段校验规则
+     *
+     * @param updateColumnVerifyVO
+     * @return: 是否成功
+     */
+    public Boolean updateColumnVerify(UpdateColumnVerifyVO updateColumnVerifyVO) {
+        List<ColumnInfoVO> columnList = updateColumnVerifyVO.getColumnList();
+        AddColumnVerifyVO addColumnVerifyVO = new AddColumnVerifyVO();
+        ArrayList<ColumnInfoVO> columnInfoAdd = new ArrayList<>();
+        ArrayList<ColumnInfoVO> columnInfoUpdate = new ArrayList<>();
+        //查出表列信息ID
+        List<Long> columnInfoIdAdd = new ArrayList<>();
+        List<Long> columnInfoIdUpdate = new ArrayList<>();
+        for (ColumnInfoVO columnInfoVO : columnList) {
+            ColumnInfo columnInfo = columnInfoFacade.getBaseMapper().selectOne(new QueryWrapper<ColumnInfo>()
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .eq(StringUtil.isNotBlank(columnInfoVO.getTableCname()), "table_cname", columnInfoVO.getTableCname())
+                    .eq(StringUtil.isNotBlank(columnInfoVO.getTableEname()), "table_ename", columnInfoVO.getTableEname())
+                    .eq(StringUtil.isNotBlank(columnInfoVO.getColumnCname()), "column_cname", columnInfoVO.getColumnCname())
+                    .eq(StringUtil.isNotBlank(columnInfoVO.getColumnEname()), "column_ename", columnInfoVO.getColumnEname())
+            );
+            Long columnId = columnInfo.getId();
+            ColumnVerify columnVerify = columnVerifyFacade.getById(columnId);
+            if (columnVerify != null) {
+                //库中已有维护
+                columnInfoIdUpdate.add(columnId);
+                columnInfoUpdate.add(columnInfoVO);
+            } else {
+                //库中暂无维护
+                columnInfoIdAdd.add(columnId);
+                columnInfoAdd.add(columnInfoVO);
+            }
+        }
+        if (ListUtil.isNotEmpty(columnInfoAdd)) {
+            addColumnVerifyVO.setHospitalId(updateColumnVerifyVO.getHospitalId());
+            addColumnVerifyVO.setColumnList(updateColumnVerifyVO.getColumnList());
+            addColumnVerifyVO.setIsRequired(updateColumnVerifyVO.getIsRequired());
+            addColumnVerifyVO.setRegularId(updateColumnVerifyVO.getRegularId());
+            addColumnVerifyVO.setRegularName(updateColumnVerifyVO.getRegularName());
+            addColumnVerifyVO.setStandardValueList(updateColumnVerifyVO.getStandardValueList());
+            addColumnVerifyVO.setDescription(updateColumnVerifyVO.getDescription());
+            //库中暂无走新增流程
+            addColumnVerify(addColumnVerifyVO);
+        }
+        //库中已有走修改流程
+        if (ListUtil.isNotEmpty(columnInfoIdUpdate)) {
+            for (Long columnId : columnInfoIdUpdate) {
+                ColumnInfo columnInfo = columnInfoFacade.getById(columnId);
+                ColumnVerify columnVerify = new ColumnVerify();
+                columnVerify.setColumnId(columnId);
+                columnVerify.setColumnCname(columnInfo.getColumnCname());
+                columnVerify.setColumnEname(columnInfo.getColumnEname());
+                columnVerify.setTableCname(columnInfo.getTableCname());
+                columnVerify.setTableEname(columnInfo.getTableEname());
+                if (updateColumnVerifyVO.getRegularId() != null) {
+                    //插入正则维护表
+                    //先判断是否该字段信息是否已关联正则
+                    RegularMapping selectOneMapping = regularMappingFacade.getBaseMapper().selectOne(new QueryWrapper<RegularMapping>()
+                            .eq("column_id", columnId)
+                            .eq("is_deleted", IsDeleteEnum.N.getKey())
+                    );
+                    if (selectOneMapping != null) {
+                        //已关联正则走修改
+                        regularMappingFacade.update(new UpdateWrapper<RegularMapping>()
+                                .eq("column_id", columnId)
+                                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                                .set("regular_id", updateColumnVerifyVO.getRegularId())
+                                .set("gmt_modified", new Date())
+                        );
+                        Long mappingId = selectOneMapping.getId();
+                        //修改总表
+                        columnVerifyFacade.update(new UpdateWrapper<ColumnVerify>()
+                                .eq("column_id", columnId)
+                                .eq("type", ColumnVerifyTypeEnum.REGULAR_TYPE.getKey())
+                                .eq("verify_id", mappingId)
+                                .set("verify_val", updateColumnVerifyVO.getRegularName())
+                        );
+                    } else {
+                        //未关联正则走新增
+                        RegularMapping regularMapping = new RegularMapping();
+                        regularMapping.setColumnId(columnId);
+                        regularMapping.setGmtCreate(new Date());
+                        regularMapping.setRegularId(updateColumnVerifyVO.getRegularId());
+                        try {
+                            regularMappingFacade.getBaseMapper().insert(regularMapping);
+                        } catch (Exception e) {
+                            Asserts.fail("关联正则失败,请重试！");
+                        }
+                        Long regularMappingId = regularMapping.getId();
+                        //插入总表
+                        columnVerify.setType(ColumnVerifyTypeEnum.REGULAR_TYPE.getKey());
+                        columnVerify.setVerifyId(regularMappingId);
+                        columnVerify.setVerifyVal(updateColumnVerifyVO.getRegularName());
+                        columnVerify.setDescription(updateColumnVerifyVO.getDescription());
+                        columnVerify.setGmtCreate(new Date());
+                        try {
+                            columnVerifyFacade.getBaseMapper().insert(columnVerify);
+                        } catch (Exception e) {
+                            Asserts.fail("保存失败");
+                        }
+                    }
+                }
+                if (updateColumnVerifyVO.getIsRequired() != null) {
+                    //插入表字段的非空校验维护表
+                    //先判断是否该字段信息是否已存在非空规则
+                    NonnullInfo selectOneInfo = nonnullInfoFacade.getBaseMapper().selectOne(new QueryWrapper<NonnullInfo>()
+                            .eq("column_id", columnId)
+                            .eq("is_deleted", IsDeleteEnum.N.getKey())
+                    );
+                    if (selectOneInfo != null) {
+                        //已关联非空校验走修改
+                        nonnullInfoFacade.update(new UpdateWrapper<NonnullInfo>()
+                                .eq("column_id", columnId)
+                                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                                .set("is_required", updateColumnVerifyVO.getIsRequired())
+                                .set("gmt_modified", new Date())
+                        );
+                        Long mappingId = selectOneInfo.getId();
+                        //修改总表
+                        columnVerifyFacade.update(new UpdateWrapper<ColumnVerify>()
+                                .eq("column_id", columnId)
+                                .eq("type", ColumnVerifyTypeEnum.NONNULL_TYPE.getKey())
+                                .eq("verify_id", mappingId)
+                                .set("verify_val", updateColumnVerifyVO.getIsRequired())
+                        );
+                    } else {
+                        NonnullInfo nonnullInfo = new NonnullInfo();
+                        nonnullInfo.setColumnId(columnId);
+                        nonnullInfo.setGmtCreate(new Date());
+                        nonnullInfo.setIsRequired(updateColumnVerifyVO.getIsRequired());
+                        try {
+                            nonnullInfoFacade.getBaseMapper().insert(nonnullInfo);
+                        } catch (Exception e) {
+                            Asserts.fail("关联是否非空失败,请重试！");
+                        }
+                        Long nonnullInfoId = nonnullInfo.getId();
+                        //插入总表
+                        columnVerify.setType(ColumnVerifyTypeEnum.NONNULL_TYPE.getKey());
+                        columnVerify.setVerifyId(nonnullInfoId);
+                        columnVerify.setVerifyVal(updateColumnVerifyVO.getIsRequired());
+                        columnVerify.setDescription(updateColumnVerifyVO.getDescription());
+                        columnVerify.setGmtCreate(new Date());
+                        try {
+                            columnVerifyFacade.getBaseMapper().insert(columnVerify);
+                        } catch (Exception e) {
+                            Asserts.fail("保存失败");
+                        }
+                    }
+                }
+                if (ListUtil.isNotEmpty(updateColumnVerifyVO.getStandardValueList())) {
+                    //插入关键字信息维护表
+                    List<String> standardValueList = updateColumnVerifyVO.getStandardValueList();
+                    //先删除之前的关联然后直接插入
+                    standardvalueInfoFacade.remove(new QueryWrapper<StandardvalueInfo>()
+                            .eq("column_id", columnId)
+                    );
+                    columnVerifyFacade.remove(new QueryWrapper<ColumnVerify>()
+                            .eq("column_id", columnId)
+                            .eq("type", ColumnVerifyTypeEnum.STANDARD_TYPE.getKey())
+                    );
+                    for (String standardValue : standardValueList) {
+                        StandardvalueInfo standardvalueInfo = new StandardvalueInfo();
+                        standardvalueInfo.setColumnId(columnId);
+                        standardvalueInfo.setGmtCreate(new Date());
+                        standardvalueInfo.setVal(standardValue);
+                        try {
+                            standardvalueInfoFacade.getBaseMapper().insert(standardvalueInfo);
+                        } catch (Exception e) {
+                            Asserts.fail("关联关键字失败,请重试！");
+                        }
+                        Long standardvalueInfoId = standardvalueInfo.getId();
+                        //插入总表
+                        columnVerify.setType(ColumnVerifyTypeEnum.STANDARD_TYPE.getKey());
+                        columnVerify.setVerifyId(standardvalueInfoId);
+                        columnVerify.setVerifyVal(standardValue);
+                        columnVerify.setDescription(updateColumnVerifyVO.getDescription());
+                        columnVerify.setGmtCreate(new Date());
+                        try {
+                            columnVerifyFacade.getBaseMapper().insert(columnVerify);
+                        } catch (Exception e) {
+                            Asserts.fail("保存失败");
+                        }
+                    }
+                }
             }
         }
-        //插入表字段的非空校验维护表
-        //插入关键字信息维护表
-        //插入总表
-        return null;
+        return true;
     }
 }

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

@@ -1,53 +1,30 @@
 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: 正则式维护-业务处理类

daqe-center/src/main/java/com/lantone/daqe/mapper/BlocklossResultMapper.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.GetBlockLossPageDTO;
 import com.lantone.daqe.entity.BlocklossResult;
+import com.lantone.daqe.vo.GetBlockLossPageVO;
 
 /**
  * <p>
@@ -10,4 +13,5 @@ import com.lantone.daqe.entity.BlocklossResult;
  */
 public interface BlocklossResultMapper extends BaseMapper<BlocklossResult> {
 
+    IPage<GetBlockLossPageDTO> getBlockLossPage(GetBlockLossPageVO getBlockLossPageVO);
 }

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

@@ -1,6 +1,6 @@
 package com.lantone.daqe.vo;
 
-import com.lantone.daqe.entity.ColumnInfo;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
@@ -21,7 +21,10 @@ import java.util.List;
 public class AddColumnVerifyVO implements Serializable {
 
 
-    private static final long serialVersionUID = 7391387152361022696L;
+    private static final long serialVersionUID = 9022047248318049371L;
+    @ApiModelProperty(value = "组织机构ID", required = true)
+    @NotNull(message = "组织机构ID不能为空")
+    private Long hospitalId;
 
     @ApiModelProperty(value = "表字段信息", required = true)
     @NotNull(message = "表信息不能为空")
@@ -36,6 +39,9 @@ public class AddColumnVerifyVO implements Serializable {
     @ApiModelProperty(value = "正则式名称")
     String regularName;
 
+    @ApiModelProperty(value = "标准值")
+    List<String> standardValueList;
+
     @ApiModelProperty(value = "说明")
     String description;
 

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

@@ -19,15 +19,15 @@ import java.io.Serializable;
 public class ColumnInfoVO implements Serializable {
     private static final long serialVersionUID = -4822420650132733065L;
 
-    @ApiModelProperty(value = "表名称(中文)")
+    @ApiModelProperty(value = "表名称(中文)", required = true)
     private String tableCname;
 
-    @ApiModelProperty(value = "表名称(英文)")
+    @ApiModelProperty(value = "表名称(英文)", required = true)
     private String tableEname;
 
-    @ApiModelProperty(value = "字段名称(中文)")
+    @ApiModelProperty(value = "字段名称(中文)", required = true)
     private String columnCname;
 
-    @ApiModelProperty(value = "字段名称(英文)")
+    @ApiModelProperty(value = "字段名称(英文)", required = true)
     private String columnEname;
 }

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

@@ -0,0 +1,27 @@
+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.NotEmpty;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description:
+ * @author： zhanghang
+ * @time: 2022/3/7 16:19
+ */
+@ApiModel(value = "通过id删除字段校验规则-接口入参")
+@Getter
+@Setter
+public class DelColumnVerifyVO implements Serializable {
+
+    private static final long serialVersionUID = -1062780829648593735L;
+
+    @ApiModelProperty(value = "校验规则字段id", required = true)
+    @NotEmpty(message = "校验规则字段id不能为空")
+    private List<Long> ids;
+}

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

@@ -0,0 +1,51 @@
+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.util.Date;
+
+/**
+ * @Description: 获取病历数据丢失明细分页列表-接口入参
+ * @author: songxl
+ * @time: 2022/3/4 10:39
+ */
+@ApiModel(value = "获取病历数据丢失明细分页列表-接口入参")
+@Getter
+@Setter
+public class GetBlockLossPageVO extends Page {
+
+    private static final long serialVersionUID = -7490180392492391778L;
+
+    @ApiModelProperty(value = "开始日期")
+    private Date startDate;
+
+    @ApiModelProperty(value = "截止日期")
+    private Date endDate;
+
+    @ApiModelProperty(value = "住院序号")
+    private String behospitalCode;
+
+    @ApiModelProperty(value = "文书编号")
+    private String recId;
+
+    @ApiModelProperty(value = "文书标题")
+    private String recTitle;
+
+    @ApiModelProperty(value = "丢失类型: 0:文书丢失 1:病案首页丢失 2:患者信息丢失")
+    private String lossType;
+
+    @ApiModelProperty(value = "丢失途径: 0:外部丢失 1:内部丢失")
+    private String lossWay;
+
+    @ApiModelProperty(value = "状态: 0:已丢失,1:已恢复")
+    private String status;
+
+    @ApiModelProperty(value = "核查结果 0:未通过，1:已通过，2:未核查")
+    private String isAudited;
+
+
+}

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

@@ -0,0 +1,49 @@
+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;
+import java.util.List;
+
+/**
+ * @Description: 修改字段校验规则-接口入参
+ * @author： zhanghang
+ * @time: 2022/3/4 16:03
+ */
+@ApiModel(value = "修改字段校验规则-接口入参")
+@Getter
+@Setter
+public class UpdateColumnVerifyVO implements Serializable {
+
+
+    private static final long serialVersionUID = 9022047248318049371L;
+    @ApiModelProperty(value = "组织机构ID", required = true)
+    @NotNull(message = "组织机构ID不能为空")
+    private Long hospitalId;
+
+    @ApiModelProperty(value = "表字段信息", required = true)
+    @NotNull(message = "表信息不能为空")
+    List<ColumnInfoVO> columnList;
+
+    @ApiModelProperty(value = "是否必填,0:否，1:是")
+    String isRequired;
+
+    @ApiModelProperty(value = "正则式ID")
+    Long regularId;
+
+    @ApiModelProperty(value = "正则式名称")
+    String regularName;
+
+    @ApiModelProperty(value = "标准值")
+    List<String> standardValueList;
+
+    @ApiModelProperty(value = "说明")
+    String description;
+
+
+}

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

@@ -0,0 +1,35 @@
+package com.lantone.daqe.web;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.lantone.common.api.CommonResult;
+import com.lantone.daqe.dto.GetBlockLossPageDTO;
+import com.lantone.daqe.facade.BlockLossManagementFacade;
+import com.lantone.daqe.vo.GetBlockLossPageVO;
+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.RestController;
+
+/**
+ * @Description: 病历数据丢失明细API
+ * @author: songxl
+ * @time: 2022/3/4 10:39
+ */
+@RestController
+@Api(value = "病历数据丢失明细API", tags = { "病历数据丢失明细API" })
+@RequestMapping("/blockLossManage")
+public class BlockLossManagementController {
+
+    @Autowired
+    private BlockLossManagementFacade blockLossManagementFacade;
+
+    @ApiOperation(value = "获取病历数据丢失明细分页列表 [by:songxl]", notes = "获取病历数据丢失明细分页列表")
+    @PostMapping("/getBlockLossPage")
+    public CommonResult<IPage<GetBlockLossPageDTO>> getBlockLossPage(@RequestBody GetBlockLossPageVO getBlockLossPageVO) {
+        return CommonResult.success(blockLossManagementFacade.getBlockLossPage(getBlockLossPageVO));
+    }
+
+}

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

@@ -2,17 +2,18 @@ package com.lantone.daqe.web;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.lantone.common.api.CommonResult;
-import com.lantone.daqe.dto.GetColumnDTO;
 import com.lantone.daqe.dto.GetColumnNameDTO;
 import com.lantone.daqe.dto.GetColumnVerifyPageDTO;
 import com.lantone.daqe.dto.GetRegularDTO;
 import com.lantone.daqe.dto.GetTableNameDTO;
 import com.lantone.daqe.facade.ColumnVerifyManagementFacade;
 import com.lantone.daqe.vo.AddColumnVerifyVO;
+import com.lantone.daqe.vo.DelColumnVerifyVO;
 import com.lantone.daqe.vo.GetColumnNameVO;
 import com.lantone.daqe.vo.GetColumnVerifyPageVO;
 import com.lantone.daqe.vo.GetRegularVO;
 import com.lantone.daqe.vo.GetTableNameVO;
+import com.lantone.daqe.vo.UpdateColumnVerifyVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -50,6 +51,7 @@ public class ColumnVerifyManagementController {
     public CommonResult<List<GetTableNameDTO>> getTableName(@RequestBody GetTableNameVO getTableNameVO) {
         return CommonResult.success(columnVerifyManagementFacade.getTableName(getTableNameVO));
     }
+
     @ApiOperation(value = "下拉框获取数据库表中列数据字段名称信息 [by:zhanghang]")
     @PostMapping("/getColumnName")
     public CommonResult<List<GetColumnNameDTO>> getColumnName(@RequestBody GetColumnNameVO getColumnNameVO) {
@@ -69,4 +71,18 @@ public class ColumnVerifyManagementController {
     public CommonResult<Boolean> addColumnVerify(@RequestBody AddColumnVerifyVO addColumnVerifyVO) {
         return CommonResult.success(columnVerifyManagementFacade.addColumnVerify(addColumnVerifyVO));
     }
+
+    @ApiOperation(value = "删除字段校验规则 [by:zhanghang]")
+    @PostMapping("/delColumnVerify")
+    @Transactional
+    public CommonResult<Boolean> delColumnVerify(@RequestBody DelColumnVerifyVO delColumnVerifyVO) {
+        return CommonResult.success(columnVerifyManagementFacade.delColumnVerify(delColumnVerifyVO));
+    }
+
+    @ApiOperation(value = "修改字段校验规则 [by:zhanghang]")
+    @PostMapping("/updateColumnVerify")
+    @Transactional
+    public CommonResult<Boolean> updateColumnVerify(@RequestBody UpdateColumnVerifyVO updateColumnVerifyVO) {
+        return CommonResult.success(columnVerifyManagementFacade.updateColumnVerify(updateColumnVerifyVO));
+    }
 }

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

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.lantone.common.api.CommonResult;
 import com.lantone.daqe.dto.GetRecordTemplateManageDTO;
 import com.lantone.daqe.dto.GetRecordTemplatePageDTO;
-import com.lantone.daqe.entity.RecordTemplate;
 import com.lantone.daqe.facade.RecordTemplateManagementFacade;
 import com.lantone.daqe.vo.GetRecordTemplateByIdVO;
 import com.lantone.daqe.vo.GetRecordTemplatePageVO;

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

@@ -1,21 +1,13 @@
 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;
@@ -23,11 +15,8 @@ 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;
 
 /**

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

@@ -2,4 +2,30 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.lantone.daqe.mapper.BlocklossResultMapper">
 
+    <select id="getBlockLossPage" resultType="com.lantone.daqe.dto.GetBlockLossPageDTO">
+        SELECT
+        id,
+        behospital_code,
+        rec_id,
+        rec_title,
+        loss_cause,
+        loss_type,
+        loss_way,
+        gmt_modified,
+        `status`,
+        is_audited
+        FROM
+        `dc_blockloss_result`
+        WHERE
+        is_deleted = "N"
+<!--        AND gmt_create >= ""-->
+<!--        AND gmt_create < ""-->
+        AND behospital_code = ""
+        AND rec_id = ""
+        AND rec_title LIKE "%%"
+        AND loss_type = ""
+        AND loss_way = ""
+        AND is_audited = ""
+        AND `status` = ""
+    </select>
 </mapper>

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

@@ -5,6 +5,19 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.lantone.daqe.entity.BlocklossResult">
         <id column="id" property="id"/>
+        <result column="hospital_id" property="hospitalId"/>
+        <result column="behospital_code" property="behospitalCode"/>
+        <result column="rec_id" property="recId"/>
+        <result column="rec_title" property="recTitle"/>
+        <result column="mode_id" property="modeId"/>
+        <result column="loss_cause" property="lossCause"/>
+        <result column="loss_type" property="lossType"/>
+        <result column="loss_way" property="lossWay"/>
+        <result column="is_audited" property="isAudited"/>
+        <result column="audit_time" property="auditTime"/>
+        <result column="status" property="status"/>
+        <result column="solve_time" property="solveTime"/>
+        <result column="repair_time" property="repairTime"/>
         <result column="is_deleted" property="isDeleted"/>
         <result column="gmt_create" property="gmtCreate"/>
         <result column="gmt_modified" property="gmtModified"/>