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

config-center/src/main/resources/shared/report-service-debug.yml

@@ -1,6 +1,6 @@
 spring:
   redis:
-    database: 8
+    database: 12
     host: 192.168.2.237 # Redis服务器地址
     port: 63791 # Redis服务器连接端口
     password: emrais # Redis服务器连接密码（默认为空）

config-center/src/main/resources/shared/report-service-inner.yml

@@ -1,9 +1,9 @@
 spring:
   redis:
-    database: 8
-    host: 192.168.2.125 # Redis服务器地址
-    port: 6379 # Redis服务器连接端口
-    password: lantone # Redis服务器连接密码（默认为空）
+    database: 12
+    host: 192.168.2.237 # Redis服务器地址
+    port: 63791 # Redis服务器连接端口
+    password: emrais # Redis服务器连接密码（默认为空）
   datasource:
     druid:
       url: jdbc:mysql://192.168.2.125:3307/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true

config-center/src/main/resources/shared/report-service-local.yml

@@ -1,6 +1,6 @@
 spring:
   redis:
-    database: 8
+    database: 12
     host: 192.168.2.237 # Redis服务器地址
     port: 63791 # Redis服务器连接端口
     password: emrais # Redis服务器连接密码（默认为空）

config-center/src/main/resources/shared/report-service-outer.yml

@@ -1,9 +1,9 @@
 spring:
   redis:
-    database: 8
-    host: 192.168.2.129 # Redis服务器地址
-    port: 6379 # Redis服务器连接端口
-    password: lantone # Redis服务器连接密码（默认为空）
+    database: 12
+    host: 192.168.2.237 # Redis服务器地址
+    port: 63791 # Redis服务器连接端口
+    password: emrais # Redis服务器连接密码（默认为空）
   datasource:
     druid:
       url: jdbc:mysql://192.168.2.129:3307/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true

config-center/src/main/resources/shared/report-service-test.yml

@@ -1,9 +1,9 @@
 spring:
   redis:
-    database: 8
-    host: 192.168.2.126 # Redis服务器地址
-    port: 6379 # Redis服务器连接端口
-    password: lantone # Redis服务器连接密码（默认为空）
+    database: 12
+    host: 192.168.2.237 # Redis服务器地址
+    port: 63791 # Redis服务器连接端口
+    password: emrais # Redis服务器连接密码（默认为空）
   datasource:
     druid:
       url: jdbc:mysql://192.168.2.126:3307/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true

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

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

@@ -30,4 +30,7 @@ public class GetRegularPageDTO implements Serializable {
     @ApiModelProperty(value = "描述")
     private String description;
 
+    @ApiModelProperty(value = "1-已关联|0-未关联")
+    private String relation;
+
 }

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

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

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:删除
      */

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

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

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

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

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

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

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

@@ -4,6 +4,7 @@ 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.google.common.collect.Lists;
 import com.lantone.common.enums.IsDeleteEnum;
 import com.lantone.common.util.BeanUtil;
 import com.lantone.common.util.DateUtil;
@@ -102,7 +103,7 @@ public class BlockLossManagementFacade {
         //====1.获取已丢失状态记录，去数据库中对比判断是否补录
         List<BlocklossResult> lossResults = blocklossResultFacade.list(new QueryWrapper<BlocklossResult>()
                 .ge(dataCompareVO.getStartDate() != null, "gmt_create", dataCompareVO.getStartDate())
-                .le(dataCompareVO.getStartDate() != null, "gmt_create", dataCompareVO.getStartDate())
+                .le(dataCompareVO.getStartDate() != null, "gmt_create", dataCompareVO.getEndDate())
                 .eq("status", LossStatusEnum.IS_LOSS.getKey())
                 .eq("is_deleted", IsDeleteEnum.N.getKey()));
         Map<String, List<BlocklossResult>> lossResultMap = null;
@@ -134,7 +135,7 @@ public class BlockLossManagementFacade {
         List<String> dataBaseBehospitalCodes = behospitalInfoFacade.list(new QueryWrapper<BehospitalInfo>()
                 .select("behospital_code")
                 .ge(dataCompareVO.getStartDate() != null, "gmt_create", dataCompareVO.getStartDate())
-                .le(dataCompareVO.getStartDate() != null, "gmt_create", dataCompareVO.getStartDate())
+                .le(dataCompareVO.getStartDate() != null, "gmt_create", dataCompareVO.getEndDate())
                 .eq("hospital_id", SysUserUtils.getCurrentHospitalId())
                 .eq("is_deleted", IsDeleteEnum.N.getKey()))
                 .stream().map(BehospitalInfo::getBehospitalCode).collect(Collectors.toList());
@@ -142,7 +143,7 @@ public class BlockLossManagementFacade {
         List<String> dataBaseHomePageIds = homePageFacade.list(new QueryWrapper<HomePage>()
                 .select("home_page_id")
                 .ge(dataCompareVO.getStartDate() != null, "gmt_create", dataCompareVO.getStartDate())
-                .le(dataCompareVO.getStartDate() != null, "gmt_create", dataCompareVO.getStartDate())
+                .le(dataCompareVO.getStartDate() != null, "gmt_create", dataCompareVO.getEndDate())
                 .eq("hospital_id", SysUserUtils.getCurrentHospitalId())
                 .eq("is_deleted", IsDeleteEnum.N.getKey()))
                 .stream().map(HomePage::getHomePageId).collect(Collectors.toList());
@@ -151,7 +152,7 @@ public class BlockLossManagementFacade {
         List<String> dataBaseRecIds = medicalRecordFacade.list(new QueryWrapper<MedicalRecord>()
                 .select("rec_id")
                 .ge(dataCompareVO.getStartDate() != null, "gmt_create", dataCompareVO.getStartDate())
-                .le(dataCompareVO.getStartDate() != null, "gmt_create", dataCompareVO.getStartDate())
+                .le(dataCompareVO.getStartDate() != null, "gmt_create", dataCompareVO.getEndDate())
                 .eq("hospital_id", SysUserUtils.getCurrentHospitalId())
                 .eq("is_deleted", IsDeleteEnum.N.getKey()))
                 .stream().map(MedicalRecord::getRecId).collect(Collectors.toList());
@@ -535,6 +536,10 @@ public class BlockLossManagementFacade {
      * @Return com.lantone.daqe.dto.BlockLossTypeGatherDTO
      */
     public BlockLossTypeGatherDTO blockLossTypeGather(BlockLossTypeGatherVO blockLossTypeGatherVO) {
+        blockLossTypeGatherVO.setOperationUrls(Lists.newArrayList("save/saveBehospitalCode",
+                "save/saveHomePages",
+                "save/saveRecs"));
+
         BlockLossTypeGatherDTO blockLossTypeGatherDTO = new BlockLossTypeGatherDTO();
         //获取该时间段的日志数量
         Integer logNum = operationLogService.getOperationLogNum(blockLossTypeGatherVO).getData();
@@ -543,22 +548,22 @@ public class BlockLossManagementFacade {
         Integer codeNum = behospitalInfoFacade.count(new QueryWrapper<BehospitalInfo>()
                 .eq("hospital_id", SysUserUtils.getCurrentHospitalId())
                 .ge(blockLossTypeGatherVO.getStartDate() != null, "gmt_create", blockLossTypeGatherVO.getStartDate())
-                .le(blockLossTypeGatherVO.getStartDate() != null, "gmt_create", blockLossTypeGatherVO.getStartDate()));
+                .le(blockLossTypeGatherVO.getStartDate() != null, "gmt_create", blockLossTypeGatherVO.getEndDate()));
         Integer homePageNum = homePageFacade.count(new QueryWrapper<HomePage>()
                 .eq("hospital_id", SysUserUtils.getCurrentHospitalId())
                 .ge(blockLossTypeGatherVO.getStartDate() != null, "gmt_create", blockLossTypeGatherVO.getStartDate())
-                .le(blockLossTypeGatherVO.getStartDate() != null, "gmt_create", blockLossTypeGatherVO.getStartDate()));
+                .le(blockLossTypeGatherVO.getStartDate() != null, "gmt_create", blockLossTypeGatherVO.getEndDate()));
         Integer recNum = medicalRecordFacade.count(new QueryWrapper<MedicalRecord>()
                 .eq("hospital_id", SysUserUtils.getCurrentHospitalId())
                 .ge(blockLossTypeGatherVO.getStartDate() != null, "gmt_create", blockLossTypeGatherVO.getStartDate())
-                .le(blockLossTypeGatherVO.getStartDate() != null, "gmt_create", blockLossTypeGatherVO.getStartDate()));
+                .le(blockLossTypeGatherVO.getStartDate() != null, "gmt_create", blockLossTypeGatherVO.getEndDate()));
         blockLossTypeGatherDTO.setRealNum(codeNum + homePageNum + recNum);
         //获取该时间段的丢失数量
         List<BlocklossResult> blocklossResults = blocklossResultFacade.list(new QueryWrapper<BlocklossResult>()
                 .eq("hospital_id", SysUserUtils.getCurrentHospitalId())
                 .eq("status", LossStatusEnum.IS_LOSS.getKey())
                 .ge(blockLossTypeGatherVO.getStartDate() != null, "gmt_create", blockLossTypeGatherVO.getStartDate())
-                .le(blockLossTypeGatherVO.getStartDate() != null, "gmt_create", blockLossTypeGatherVO.getStartDate()));
+                .le(blockLossTypeGatherVO.getStartDate() != null, "gmt_create", blockLossTypeGatherVO.getEndDate()));
         Integer allLossNum = blocklossResults.size();
         blockLossTypeGatherDTO.setAllLossNum(allLossNum);
         blockLossTypeGatherDTO.setHisNum(logNum + allLossNum);

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

@@ -8,6 +8,7 @@ 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.common.util.SysUserUtils;
 import com.lantone.daqe.dto.GetByIdColumnVerifyDTO;
 import com.lantone.daqe.dto.GetColumnInfoDTO;
 import com.lantone.daqe.dto.GetColumnNameDTO;
@@ -74,6 +75,8 @@ public class ColumnVerifyManagementFacade {
      * @return: 字段校验规则分页数据
      */
     public IPage<GetColumnVerifyPageDTO> getColumnVerifyPage(GetColumnVerifyPageVO getColumnVerifyPageVO) {
+        Long currentHospitalId = SysUserUtils.getCurrentHospitalId();
+        getColumnVerifyPageVO.setHospitalId(SysUserUtils.getCurrentHospitalId()==null?4:SysUserUtils.getCurrentHospitalId());
         return columnVerifyFacade.getBaseMapper().getColumnVerifyPage(getColumnVerifyPageVO);
     }
 
@@ -89,7 +92,14 @@ public class ColumnVerifyManagementFacade {
                 .eq("column_id", getByIdColumnVerifyVO.getColumnId())
         );
         GetByIdColumnVerifyDTO byIdColumnVerify = columnVerifyFacade.getBaseMapper().getByIdColumnVerify(getByIdColumnVerifyVO);
-        byIdColumnVerify.setRegularId(mappingFacadeOne.getRegularId());
+        if(mappingFacadeOne!=null) {
+            RegularInfo one = regularInfoFacade.getOne(new QueryWrapper<RegularInfo>()
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .eq("id", mappingFacadeOne.getRegularId())
+            );
+            byIdColumnVerify.setRegularId(mappingFacadeOne.getRegularId());
+            byIdColumnVerify.setRegular(one.getName());
+        }
         return byIdColumnVerify;
     }
 
@@ -185,6 +195,8 @@ public class ColumnVerifyManagementFacade {
      * @return: 是否成功
      */
     public Boolean addColumnVerify(AddColumnVerifyVO addColumnVerifyVO) {
+        Long currentHospitalId = SysUserUtils.getCurrentHospitalId();
+        addColumnVerifyVO.setHospitalId(SysUserUtils.getCurrentHospitalId()==null?4:SysUserUtils.getCurrentHospitalId());
         List<ColumnInfoVO> columnList = addColumnVerifyVO.getColumnList();
         //查出表列信息ID
         for (ColumnInfoVO columnInfoVO : columnList) {
@@ -381,6 +393,8 @@ public class ColumnVerifyManagementFacade {
      * @return: 是否成功
      */
     public Boolean updateColumnVerify(UpdateColumnVerifyVO updateColumnVerifyVO) {
+        Long currentHospitalId = SysUserUtils.getCurrentHospitalId();
+        updateColumnVerifyVO.setHospitalId(SysUserUtils.getCurrentHospitalId()==null?4:SysUserUtils.getCurrentHospitalId());
         List<ColumnInfoVO> columnList = updateColumnVerifyVO.getColumnList();
         AddColumnVerifyVO addColumnVerifyVO = new AddColumnVerifyVO();
         List<ColumnInfoVO> columnInfoAdd = new ArrayList<>();

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;
@@ -37,6 +38,8 @@ public class OfficialCapacityManagementFacade {
      * @return: 职务职称变更记录
      */
     public IPage<GetOfficialCapacityPageDTO> getOfficialCapacityPage(GetOfficialCapacityPageVO getOfficialCapacityPageVO) {
+        Long currentHospitalId = SysUserUtils.getCurrentHospitalId();
+        getOfficialCapacityPageVO.setHospitalId(SysUserUtils.getCurrentHospitalId()==null?4:SysUserUtils.getCurrentHospitalId());
         Page<GetOfficialCapacityPageDTO> getOfficialCapacityPageDTOPage = new Page<>();
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -78,6 +81,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())

daqe-center/src/main/java/com/lantone/daqe/facade/RecordTemplateManagementFacade.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.GetRecordTemplateManageDTO;
 import com.lantone.daqe.dto.GetRecordTemplatePageDTO;
 import com.lantone.daqe.entity.RecordTemplate;
@@ -35,6 +36,8 @@ public class RecordTemplateManagementFacade {
      * @return: 文书模板信息分页数据
      */
     public IPage<GetRecordTemplatePageDTO> getRecordTemplatePage(GetRecordTemplatePageVO getRecordTemplatePageVO) {
+        Long currentHospitalId = SysUserUtils.getCurrentHospitalId();
+        getRecordTemplatePageVO.setHospitalId(SysUserUtils.getCurrentHospitalId()==null?4:SysUserUtils.getCurrentHospitalId());
         Page<GetRecordTemplatePageDTO> getRecordTemplatePageDTOPage = new Page<>();
 
         QueryWrapper<RecordTemplate> recordTemplateQueryWrapper = new QueryWrapper<>();

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

@@ -1,15 +1,12 @@
 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.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.lantone.common.enums.IsDeleteEnum;
 import com.lantone.common.exception.Asserts;
 import com.lantone.common.util.BeanUtil;
 import com.lantone.common.util.DateUtil;
-import com.lantone.common.util.StringUtil;
 import com.lantone.common.util.SysUserUtils;
 import com.lantone.daqe.dto.GetRegularPageDTO;
 import com.lantone.daqe.entity.RegularInfo;
@@ -26,8 +23,6 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-
 /**
  * @Description: 正则式维护-业务处理类
  * @author: songxl
@@ -52,18 +47,7 @@ public class RegularManagementFacade {
      * @Return com.baomidou.mybatisplus.core.metadata.IPage<com.lantone.daqe.dto.GetRegularPageDTO>
      */
     public IPage<GetRegularPageDTO> getRegularPage(GetRegularPageVO getRegularPageVO) {
-
-        Page<GetRegularPageDTO> getRegularPageDTOPage = new Page<>();
-        QueryWrapper<RegularInfo> regularInfoQueryWrapper = new QueryWrapper<>();
-        regularInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
-        regularInfoQueryWrapper.like(StringUtil.isNotBlank(getRegularPageVO.getName()), "name", getRegularPageVO.getName());
-        Page<RegularInfo> regularInfoPage = new Page<>(getRegularPageVO.getCurrent(), getRegularPageVO.getSize());
-        regularInfoFacade.page(regularInfoPage, regularInfoQueryWrapper);
-        BeanUtil.copyProperties(regularInfoPage, getRegularPageDTOPage);
-        List<GetRegularPageDTO> getRegularPageDTOList = BeanUtil.listCopyTo(regularInfoPage.getRecords(), GetRegularPageDTO.class);
-
-        getRegularPageDTOPage.setRecords(getRegularPageDTOList);
-        return getRegularPageDTOPage;
+        return  regularInfoFacade.getBaseMapper().getRegularPage(getRegularPageVO);
     }
 
     /**

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);
 }

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

@@ -1,7 +1,11 @@
 package com.lantone.daqe.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.lantone.daqe.dto.GetRegularPageDTO;
 import com.lantone.daqe.entity.RegularInfo;
+import com.lantone.daqe.vo.GetRegularPageVO;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -10,4 +14,5 @@ import com.lantone.daqe.entity.RegularInfo;
  */
 public interface RegularInfoMapper extends BaseMapper<RegularInfo> {
 
+    IPage<GetRegularPageDTO> getRegularPage(@Param("getRegularPageVO") GetRegularPageVO getRegularPageVO);
 }

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);
 }

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);
 
 }

daqe-center/src/main/java/com/lantone/daqe/task/ColumnResultDataCompareTask.java

@@ -0,0 +1,54 @@
+package com.lantone.daqe.task;
+
+import com.lantone.common.util.DateUtil;
+import com.lantone.daqe.facade.ColumnResultManagementFacade;
+import com.lantone.daqe.vo.DataCheckVO;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.Trigger;
+import org.springframework.scheduling.TriggerContext;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.SchedulingConfigurer;
+import org.springframework.scheduling.config.ScheduledTaskRegistrar;
+import org.springframework.scheduling.support.CronTrigger;
+
+import java.util.Date;
+
+@Configuration      //1.主要用于标记配置类，兼备Component的效果。
+@EnableScheduling   // 2.开启定时任务
+@Slf4j
+public class ColumnResultDataCompareTask implements SchedulingConfigurer {
+
+    @Autowired
+    private ColumnResultManagementFacade columnResultManagementFacade;
+    @Value("${columnResult.compare.cron}")
+    private String cron = "0 0 1 * * ?";
+    @Value("${columnResult.compare.use}")
+    private String isUsed = "false";
+
+    /**
+     * 执行定时任务.
+     */
+    @Override
+    public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
+        taskRegistrar.addTriggerTask(new Runnable() {
+            @Override
+            public void run() {
+                if(Boolean.parseBoolean(isUsed)){
+                    DataCheckVO dataCheckVO = new DataCheckVO();
+                    dataCheckVO.setDateStart(DateUtil.addDate(DateUtil.now(),-1));
+                    dataCheckVO.setDateEnd(DateUtil.now());
+                    columnResultManagementFacade.dataCheck(dataCheckVO);
+                }
+            }
+        }, new Trigger() {
+            @Override
+            public Date nextExecutionTime(TriggerContext triggerContext) {
+                CronTrigger trigger = new CronTrigger(cron);
+                return trigger.nextExecutionTime(triggerContext);
+            }
+        });
+    }
+}

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

@@ -22,7 +22,7 @@ public class AddColumnVerifyVO implements Serializable {
 
 
     private static final long serialVersionUID = 9022047248318049371L;
-    @ApiModelProperty(value = "组织机构ID", required = true)
+    @ApiModelProperty(value = "组织机构ID", required = true,hidden = true)
     @NotNull(message = "组织机构ID不能为空")
     private Long hospitalId;
 

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",hidden = true)
+    private Long hospitalId;
+}

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

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

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

@@ -29,8 +29,8 @@ public class GetColumnResultPageVO extends Page {
     @ApiModelProperty(value = "结束时间", required = true)
     private Date solveTimeEnd;
 
-    @ApiModelProperty(value = "组织ID", required = true)
-    private String hospitalId;
+    @ApiModelProperty(value = "组织ID", required = true,hidden = true)
+    private Long hospitalId;
 
     @ApiModelProperty(value = "住院序号")
     private String behospitalCode;

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

@@ -17,7 +17,7 @@ import lombok.Setter;
 public class GetColumnVerifyPageVO extends Page {
     private static final long serialVersionUID = 3787530642894987524L;
 
-    @ApiModelProperty(value = "组织机构ID")
+    @ApiModelProperty(value = "组织机构ID" , hidden = true)
     private Long hospitalId;
 
     @ApiModelProperty(value = "表名称（中文）")

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

@@ -21,7 +21,7 @@ public class GetOfficialCapacityPageVO extends Page {
 
 
     private static final long serialVersionUID = -8083355835387307637L;
-    @ApiModelProperty(value = "组织机构ID")
+    @ApiModelProperty(value = "组织机构ID",hidden = true)
     private Long hospitalId;
 
     @ApiModelProperty(value = "职务/职称名称")

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

@@ -18,7 +18,7 @@ public class GetRecordTemplatePageVO extends Page {
 
 
     private static final long serialVersionUID = -1132470088350385050L;
-    @ApiModelProperty(value = "组织机构ID")
+    @ApiModelProperty(value = "组织机构ID",hidden = true)
     private Long hospitalId;
 
     @ApiModelProperty(value = "医院模板ID")

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

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

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

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

@@ -22,7 +22,7 @@ public class UpdateColumnVerifyVO implements Serializable {
 
 
     private static final long serialVersionUID = 9022047248318049371L;
-    @ApiModelProperty(value = "组织机构ID", required = true)
+    @ApiModelProperty(value = "组织机构ID", required = true,hidden = true)
     @NotNull(message = "组织机构ID不能为空")
     private Long hospitalId;
 

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));
+    }
 }

daqe-center/src/main/resources/bootstrap.yml

@@ -58,6 +58,11 @@ swagger.version: 0.0.1-SNAPSHOT
 
 #数据比对定时器
 blockloss:
+  compare:
+    cron: 0 0 1 * * ?
+    use: true
+#数据校验定时器
+columnResult:
   compare:
     cron: 0 0 1 * * ?
     use: true

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>

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

@@ -2,4 +2,20 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.lantone.daqe.mapper.RegularInfoMapper">
 
+    <select id="getRegularPage" resultType="com.lantone.daqe.dto.GetRegularPageDTO">
+        SELECT DISTINCT
+            dri.id,
+            dri.`name`,
+            dri.val,
+            dri.description,
+        CASE WHEN drm.id is NULL THEN 0
+            ELSE 1 END AS relation
+        FROM
+            `dc_regular_info` dri
+        LEFT JOIN dc_regular_mapping drm ON dri.id = drm.regular_id
+        WHERE drm.is_deleted = 'N'
+        <if test="getRegularPageVO.name != null and getRegularPageVO.name != ''">
+            AND dri.`name` LIKE CONCAT('%',#{getRegularPageVO.name},'%')
+        </if>
+    </select>
 </mapper>

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>

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>

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"/>

security-center/src/main/java/com/lantone/security/aop/LogAspect.java

@@ -41,8 +41,8 @@ public class LogAspect {
      "||execution(public * com.lantone.security.web.FuncManagementController.*(..))"+
      "||execution(public * com.lantone.security.web.HospitalManagementController.*(..))"+
      "||execution(public * com.lantone.security.web.HospitalSetManagementController.*(..))"+
-     "||execution(public * com.lantone.security.web.LogManagementController.*(..))" +
-     "&& !execution(public * com.lantone.security.web.LogManagementController.getOperationLog(..))"+
+//     "||execution(public * com.lantone.security.web.LogManagementController.*(..))" +
+//     "&& !execution(public * com.lantone.security.web.LogManagementController.getOperationLog(..))"+
      "||execution(public * com.lantone.security.web.RegionManagementController.*(..))"+
      "||execution(public * com.lantone.security.web.RoleManagementController.*(..))"+
      "||execution(public * com.lantone.security.web.UserManagementController.*(..))"+

security-center/src/main/java/com/lantone/security/facade/LogManagementFacade.java

@@ -139,7 +139,7 @@ public class LogManagementFacade {
         List<String> operationParams = operationLogFacade.list(new QueryWrapper<OperationLog>()
                 .select("operation_param")
                 .ge(dataCompareVO.getStartDate() != null, "gmt_create", dataCompareVO.getStartDate())
-                .le(dataCompareVO.getStartDate() != null, "gmt_create", dataCompareVO.getStartDate())
+                .le(dataCompareVO.getStartDate() != null, "gmt_create", dataCompareVO.getEndDate())
                 .eq("operation_url", dataCompareVO.getOperationUrl()))
                 .stream().map(OperationLog::getOperationParam).collect(Collectors.toList());
         if (ListUtil.isNotEmpty(operationParams)) {
@@ -166,7 +166,7 @@ public class LogManagementFacade {
     public Integer getOperationLogNum(BlockLossTypeGatherVO blockLossTypeGatherVO) {
         return operationLogFacade.count(new QueryWrapper<OperationLog>()
                 .ge(blockLossTypeGatherVO.getStartDate() != null, "gmt_create", blockLossTypeGatherVO.getStartDate())
-                .le(blockLossTypeGatherVO.getStartDate() != null, "gmt_create", blockLossTypeGatherVO.getStartDate())
+                .le(blockLossTypeGatherVO.getStartDate() != null, "gmt_create", blockLossTypeGatherVO.getEndDate())
                 .in("operation_url", blockLossTypeGatherVO.getOperationUrls()));
     }
 }