根据ID获取字段校验规则明细数据接口修改

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

@@ -91,7 +91,7 @@ public class ColumnResultManagementFacade {
     public IPage<GetColumnResultPageDTO> getColumnResultPage(GetColumnResultPageVO getColumnResultPageVO) {
         Page<GetColumnResultPageDTO> getColumnResultPageDTOPage = new Page<>();
         Long currentHospitalId = SysUserUtils.getCurrentHospitalId();
-        getColumnResultPageVO.setHospitalId(currentHospitalId);
+        getColumnResultPageVO.setHospitalId(SysUserUtils.getCurrentHospitalId()==null?4:SysUserUtils.getCurrentHospitalId());
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         String startDate = null;
         String endDate = null;
@@ -129,6 +129,8 @@ public class ColumnResultManagementFacade {
      * @return: 字段校验问题明细数量
      */
     public GetColumnResultNumberDTO getColumnResultNumber(GetColumnResultNumberVO getColumnResultNumberVO) {
+        Long currentHospitalId = SysUserUtils.getCurrentHospitalId();
+        getColumnResultNumberVO.setHospitalId(SysUserUtils.getCurrentHospitalId()==null?4:SysUserUtils.getCurrentHospitalId());
         return columnResultFacade.getBaseMapper().getColumnResultNumber(getColumnResultNumberVO);
     }
 
@@ -232,6 +234,8 @@ public class ColumnResultManagementFacade {
      * @return: 是否成功
      */
     public Boolean dataCheck(DataCheckVO dataCheckVO) {
+        Long currentHospitalId = SysUserUtils.getCurrentHospitalId();
+        dataCheckVO.setHospitalId(SysUserUtils.getCurrentHospitalId()==null?4:SysUserUtils.getCurrentHospitalId());
         String behospitalCode = dataCheckVO.getBehospitalCode();
         //传入BehospitalCode 只针对单个病历进行校验
         if (StringUtil.isNotEmpty(behospitalCode)) {

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

@@ -38,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");

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

@@ -31,6 +31,6 @@ public class DataCheckVO implements Serializable {
     @ApiModelProperty(value = "住院序号")
     private String behospitalCode;
 
-    @ApiModelProperty(value = "组织机构ID")
+    @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)
+    @ApiModelProperty(value = "组织ID", required = true,hidden = true)
     private Long hospitalId;
 }

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

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

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