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

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

@@ -6,6 +6,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @Description: 获取字段校验规则维护数据-接口出参
@@ -45,4 +46,7 @@ public class GetColumnVerifyPageDTO implements Serializable {
 
     @ApiModelProperty(value = "说明")
     private String description;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date gmtCreate;
 }

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

@@ -104,17 +104,26 @@ public class BlockLossManagementFacade {
      */
     public Boolean dataCompare(DataCompareVO dataCompareVO) {
         Boolean flag = false;
+        Long hospitalId = null;
+        Long principleId = null;
+        //定时任务SysUserUtils取不到医院，操作人
+        if (dataCompareVO.getHospitalId() == null) {
+            hospitalId = SysUserUtils.getCurrentHospitalId();
+            principleId = SysUserUtils.getCurrentPrincipleId();
+        }
+
+
         //====1.获取已丢失状态记录，去数据库中对比判断是否补录
         List<BlocklossResult> lossResults = blocklossResultFacade.list(new QueryWrapper<BlocklossResult>()
                 .select("id,behospital_code,rec_id,loss_type,loss_way")
-                .eq(SysUserUtils.getCurrentHospitalId() != null, "hospital_id", SysUserUtils.getCurrentHospitalId())
+                .eq(hospitalId != null, "hospital_id", hospitalId)
                 .eq("status", LossStatusEnum.IS_LOSS.getKey())
                 .eq("is_deleted", IsDeleteEnum.N.getKey()));
         Map<String, List<BlocklossResult>> lossResultMap = null;
         if (ListUtil.isNotEmpty(lossResults)) {
             lossResultMap = EntityUtil.makeEntityListMap(lossResults, "lossType");
             //更新以缺失数据的状态
-            flag = upBlockLossStatus(lossResultMap);
+            flag = upBlockLossStatus(lossResultMap, hospitalId, principleId);
         }
 
         //====2.某时间的数据对比
@@ -155,7 +164,7 @@ public class BlockLossManagementFacade {
                 .ge(dataCompareVO.getStartDate() != null && StringUtil.isBlank(dataCompareVO.getBehospitalCode()), "gmt_create", dataCompareVO.getStartDate())
                 .le(dataCompareVO.getEndDate() != null && StringUtil.isBlank(dataCompareVO.getBehospitalCode()), "gmt_create", dataCompareVO.getEndDate())
                 .eq(StringUtil.isNotBlank(dataCompareVO.getBehospitalCode()), "behospital_code", dataCompareVO.getBehospitalCode())
-                .eq(SysUserUtils.getCurrentHospitalId() != null, "hospital_id", SysUserUtils.getCurrentHospitalId())
+                .eq(hospitalId != null, "hospital_id", hospitalId)
                 .eq("is_deleted", IsDeleteEnum.N.getKey()))
                 .stream().map(BehospitalInfo::getBehospitalCode).collect(Collectors.toList());
         //病案首页数据
@@ -166,13 +175,13 @@ public class BlockLossManagementFacade {
             dataBaseHomePageIds = homePageFacade.list(new QueryWrapper<HomePage>()
                     .select("home_page_id")
                     .in("behospital_code", dataBaseBehospitalCodes)
-                    .eq(SysUserUtils.getCurrentHospitalId() != null, "hospital_id", SysUserUtils.getCurrentHospitalId())
+                    .eq(hospitalId != null, "hospital_id", hospitalId)
                     .eq("is_deleted", IsDeleteEnum.N.getKey()))
                     .stream().map(HomePage::getHomePageId).collect(Collectors.toList());
             dataBaseRecIds = medicalRecordFacade.list(new QueryWrapper<MedicalRecord>()
                     .select("rec_id")
                     .in("behospital_code", dataBaseBehospitalCodes)
-                    .eq(SysUserUtils.getCurrentHospitalId() != null, "hospital_id", SysUserUtils.getCurrentHospitalId())
+                    .eq(hospitalId != null, "hospital_id", hospitalId)
                     .eq("is_deleted", IsDeleteEnum.N.getKey()))
                     .stream().map(MedicalRecord::getRecId).collect(Collectors.toList());
         }
@@ -238,11 +247,11 @@ public class BlockLossManagementFacade {
             //外部丢失数据集合
             List<BlocklossResult> outInserts = new ArrayList<>();
             //文书数据对比
-            compareHisWithLog(recs, recLogs, LossTypeEnum.REC_LOSS.getKey(), outInserts, outLossRecs, hisMedicalRecordMap);
+            compareHisWithLog(recs, recLogs, LossTypeEnum.REC_LOSS.getKey(), outInserts, outLossRecs, hisMedicalRecordMap, hospitalId, principleId);
             //病案首页数据对比
-            compareHisWithLog(medicalRecords, homePageLogs, LossTypeEnum.HOMEPAGE_LOSS.getKey(), outInserts, outLossHomepages, hisMedicalRecordMap);
+            compareHisWithLog(medicalRecords, homePageLogs, LossTypeEnum.HOMEPAGE_LOSS.getKey(), outInserts, outLossHomepages, hisMedicalRecordMap, hospitalId, principleId);
             //病历数据对比
-            compareHisWithLog(medicalRecords, behospitalCodeLogs, LossTypeEnum.CODE_LOSS.getKey(), outInserts, outLossCodes, hisMedicalRecordMap);
+            compareHisWithLog(medicalRecords, behospitalCodeLogs, LossTypeEnum.CODE_LOSS.getKey(), outInserts, outLossCodes, hisMedicalRecordMap, hospitalId, principleId);
 
             flag = blocklossResultServiceImpl.saveBatch(outInserts);
         }
@@ -251,13 +260,13 @@ public class BlockLossManagementFacade {
         //内部丢失数据集合
         List<BlocklossResult> inInserts = new ArrayList<>();
         if (ListUtil.isNotEmpty(recLogs)) {
-            compareLogWithLocal(recLogs, dataBaseRecIds, LossTypeEnum.REC_LOSS.getKey(), inInserts, inLossRecs, hisMedicalRecordMap);
+            compareLogWithLocal(recLogs, dataBaseRecIds, LossTypeEnum.REC_LOSS.getKey(), inInserts, inLossRecs, hisMedicalRecordMap, hospitalId, principleId);
         }
         if (ListUtil.isNotEmpty(homePageLogs)) {
-            compareLogWithLocal(homePageLogs, dataBaseHomePageIds, LossTypeEnum.HOMEPAGE_LOSS.getKey(), inInserts, inLossHomepages, hisMedicalRecordMap);
+            compareLogWithLocal(homePageLogs, dataBaseHomePageIds, LossTypeEnum.HOMEPAGE_LOSS.getKey(), inInserts, inLossHomepages, hisMedicalRecordMap, hospitalId, principleId);
         }
         if (ListUtil.isNotEmpty(behospitalCodeLogs)) {
-            compareLogWithLocal(behospitalCodeLogs, dataBaseBehospitalCodes, LossTypeEnum.CODE_LOSS.getKey(), inInserts, inLossCodes, hisMedicalRecordMap);
+            compareLogWithLocal(behospitalCodeLogs, dataBaseBehospitalCodes, LossTypeEnum.CODE_LOSS.getKey(), inInserts, inLossCodes, hisMedicalRecordMap, hospitalId, principleId);
         }
         if (ListUtil.isNotEmpty(inInserts)) {
             flag = blocklossResultServiceImpl.saveBatch(inInserts);
@@ -290,11 +299,13 @@ public class BlockLossManagementFacade {
      * @param inInserts           内部丢失插入集合
      * @param havingLossIds       已经插入的id集合
      * @param hisMedicalRecordMap his病历数据map（key-住院序号：value-人的his数据）
+     * @param hospitalId          医院id
+     * @param principleId         操作人id
      * @Return void
      */
     private void compareLogWithLocal(List<GetOperationLogDTO> logs, List<String> dataBases, String type,
                                      List<BlocklossResult> inInserts, List<String> havingLossIds,
-                                     Map<String, HisMedicalRecordDTO> hisMedicalRecordMap) {
+                                     Map<String, HisMedicalRecordDTO> hisMedicalRecordMap, Long hospitalId, Long principleId) {
         switch (type) {
             case "0":
                 //文书丢失
@@ -312,7 +323,7 @@ public class BlockLossManagementFacade {
                                 blocklossResult.setBehospitalDate(hisMedicalRecordMap.get(rec.getBehospitalCode()).getBehospitalDate());
                             }
                             //拼装病历数据块丢失明细其他信息
-                            assembleOtherBlocklossResult(blocklossResult);
+                            assembleOtherBlocklossResult(blocklossResult, hospitalId, principleId);
                             inInserts.add(blocklossResult);
                         }
                     }
@@ -342,7 +353,7 @@ public class BlockLossManagementFacade {
                                 blocklossResult.setBehospitalDate(hisMedicalRecordMap.get(recMap.get(recId).getBehospitalCode()).getBehospitalDate());
                             }
                             //拼装病历数据块丢失明细其他信息
-                            assembleOtherBlocklossResult(blocklossResult);
+                            assembleOtherBlocklossResult(blocklossResult, hospitalId, principleId);
                             inInserts.add(blocklossResult);
                         }
                     });
@@ -365,7 +376,7 @@ public class BlockLossManagementFacade {
                                 blocklossResult.setBehospitalDate(hisMedicalRecordMap.get(homePages.getBehospitalCode()).getBehospitalDate());
                             }
                             //拼装病历数据块丢失明细其他信息
-                            assembleOtherBlocklossResult(blocklossResult);
+                            assembleOtherBlocklossResult(blocklossResult, hospitalId, principleId);
                             inInserts.add(blocklossResult);
                         }
                     }
@@ -385,7 +396,7 @@ public class BlockLossManagementFacade {
                                 blocklossResult.setBehospitalDate(hisMedicalRecordMap.get(beHehospitalInfo.getBehospitalCode()).getBehospitalDate());
                             }
                             //拼装病历数据块丢失明细其他信息
-                            assembleOtherBlocklossResult(blocklossResult);
+                            assembleOtherBlocklossResult(blocklossResult, hospitalId, principleId);
                             inInserts.add(blocklossResult);
                         }
                     }
@@ -403,7 +414,7 @@ public class BlockLossManagementFacade {
      * @param lossResultMap
      * @Return void
      */
-    private Boolean upBlockLossStatus(Map<String, List<BlocklossResult>> lossResultMap) {
+    private Boolean upBlockLossStatus(Map<String, List<BlocklossResult>> lossResultMap, Long hospitalId, Long principleId) {
         AtomicReference<Boolean> flag = new AtomicReference<>(false);
         lossResultMap.keySet().stream().forEach(lossType -> {
             //0:文书丢失 1:病案首页丢失 2:患者信息丢失
@@ -411,7 +422,7 @@ public class BlockLossManagementFacade {
                 case "0":
                     //文书丢失
                     List<String> redIds = medicalRecordFacade.list(new QueryWrapper<MedicalRecord>()
-                            .eq("hospital_id", SysUserUtils.getCurrentHospitalId() != null ? SysUserUtils.getCurrentHospitalId() : 0)
+                            .eq("hospital_id", hospitalId != null ? hospitalId : 0)
                             .in("rec_id", lossResultMap.get(lossType).stream().map(BlocklossResult::getRecId).collect(Collectors.toList()))
                             .in("behospital_code", lossResultMap.get(lossType).stream().map(BlocklossResult::getBehospitalCode).collect(Collectors.toList()))
                             .eq("is_deleted", IsDeleteEnum.N.getKey()))
@@ -422,18 +433,18 @@ public class BlockLossManagementFacade {
                                 .set("solve_time", DateUtil.now())
                                 .set("gmt_modified", DateUtil.now())
                                 .set("status", LossStatusEnum.NOT_LOSS.getKey())
-                                .set("modifier", SysUserUtils.getCurrentPrincipleId() != null ? SysUserUtils.getCurrentPrincipleId() + "" : "0")
+                                .set("modifier", principleId != null ? principleId + "" : "0")
                                 .eq("status", LossStatusEnum.IS_LOSS.getKey())
                                 .eq("loss_type", lossType)
                                 .eq("is_deleted", IsDeleteEnum.N.getKey())
-                                .eq("hospital_id", SysUserUtils.getCurrentHospitalId() != null ? SysUserUtils.getCurrentHospitalId() : 0)
+                                .eq("hospital_id", hospitalId != null ? hospitalId : 0)
                                 .in("rec_id", redIds)));
                     }
                     break;
                 case "1":
                     //病案首页丢失
                     List<String> homePages = homePageFacade.list(new QueryWrapper<HomePage>()
-                            .eq("hospital_id", SysUserUtils.getCurrentHospitalId() != null ? SysUserUtils.getCurrentHospitalId() : 0)
+                            .eq("hospital_id", hospitalId != null ? hospitalId : 0)
                             .in("home_page_id", lossResultMap.get(lossType).stream().map(BlocklossResult::getRecId).collect(Collectors.toList()))
                             .in("behospital_code", lossResultMap.get(lossType).stream().map(BlocklossResult::getBehospitalCode).collect(Collectors.toList()))
                             .eq("is_deleted", IsDeleteEnum.N.getKey()))
@@ -445,10 +456,10 @@ public class BlockLossManagementFacade {
                                 .set("solve_time", DateUtil.now())
                                 .set("gmt_modified", DateUtil.now())
                                 .set("status", LossStatusEnum.NOT_LOSS.getKey())
-                                .set("modifier", SysUserUtils.getCurrentPrincipleId() != null ? SysUserUtils.getCurrentPrincipleId() + "" : "0")
+                                .set("modifier", principleId != null ? principleId + "" : "0")
                                 .eq("status", LossStatusEnum.IS_LOSS.getKey())
                                 .eq("loss_type", lossType)
-                                .eq("hospital_id", SysUserUtils.getCurrentHospitalId() != null ? SysUserUtils.getCurrentHospitalId() : 0)
+                                .eq("hospital_id", hospitalId != null ? hospitalId : 0)
                                 .in("rec_id", homePages)
                                 .eq("is_deleted", IsDeleteEnum.N.getKey())));
                     }
@@ -456,7 +467,7 @@ public class BlockLossManagementFacade {
                 case "2":
                     //患者信息丢失
                     List<String> behospitalCodes = behospitalInfoFacade.list(new QueryWrapper<BehospitalInfo>()
-                            .eq("hospital_id", SysUserUtils.getCurrentHospitalId() != null ? SysUserUtils.getCurrentHospitalId() : 0)
+                            .eq("hospital_id", hospitalId != null ? hospitalId : 0)
                             .in("behospital_code", lossResultMap.get(lossType).stream().map(BlocklossResult::getBehospitalCode).collect(Collectors.toList()))
                             .eq("is_deleted", IsDeleteEnum.N.getKey()))
                             .stream().map(BehospitalInfo::getBehospitalCode).collect(Collectors.toList());
@@ -466,11 +477,11 @@ public class BlockLossManagementFacade {
                                 .set("solve_time", DateUtil.now())
                                 .set("gmt_modified", DateUtil.now())
                                 .set("status", LossStatusEnum.NOT_LOSS.getKey())
-                                .set("modifier", SysUserUtils.getCurrentPrincipleId() != null ? SysUserUtils.getCurrentPrincipleId() + "" : "0")
+                                .set("modifier", principleId != null ? principleId + "" : "0")
                                 .eq("status", LossStatusEnum.IS_LOSS.getKey())
                                 .eq("loss_type", lossType)
                                 .eq("is_deleted", IsDeleteEnum.N.getKey())
-                                .eq("hospital_id", SysUserUtils.getCurrentHospitalId() != null ? SysUserUtils.getCurrentHospitalId() : 0)
+                                .eq("hospital_id", hospitalId != null ? hospitalId : 0)
                                 .in("behospital_code", behospitalCodes)));
                     }
                     break;
@@ -488,11 +499,13 @@ public class BlockLossManagementFacade {
      * @param outInserts          外部丢失插入集合
      * @param havingLossIds       已经插入的id集合
      * @param hisMedicalRecordMap his病历数据map（key-住院序号：value-人的his数据）
+     * @param hospitalId          医院id
+     * @param principleId         操作人id
      * @Return void
      */
     private void compareHisWithLog(List<GetOperationLogDTO> medicalRecords, List<GetOperationLogDTO> logs,
                                    String type, List<BlocklossResult> outInserts, List<String> havingLossIds,
-                                   Map<String, HisMedicalRecordDTO> hisMedicalRecordMap) {
+                                   Map<String, HisMedicalRecordDTO> hisMedicalRecordMap, Long hospitalId, Long principleId) {
         //his数据为空直接返回
         if (ListUtil.isEmpty(medicalRecords)) {
             return;
@@ -514,7 +527,7 @@ public class BlockLossManagementFacade {
                                 blocklossResult.setLossType(LossTypeEnum.REC_LOSS.getKey());
                                 blocklossResult.setBehospitalDate(hisMedicalRecordMap.get(medicalRecord.getBehospitalCode()).getBehospitalDate());
                                 //拼装病历数据块丢失明细其他信息
-                                assembleOtherBlocklossResult(blocklossResult);
+                                assembleOtherBlocklossResult(blocklossResult, hospitalId, principleId);
                                 outInserts.add(blocklossResult);
                             }
                         }
@@ -535,7 +548,7 @@ public class BlockLossManagementFacade {
                             blocklossResult.setLossType(LossTypeEnum.HOMEPAGE_LOSS.getKey());
                             blocklossResult.setBehospitalDate(hisMedicalRecordMap.get(medicalRecord.getBehospitalCode()).getBehospitalDate());
                             //拼装病历数据块丢失明细其他信息
-                            assembleOtherBlocklossResult(blocklossResult);
+                            assembleOtherBlocklossResult(blocklossResult, hospitalId, principleId);
                             outInserts.add(blocklossResult);
                         }
                     }
@@ -553,7 +566,7 @@ public class BlockLossManagementFacade {
                             blocklossResult.setLossType(LossTypeEnum.CODE_LOSS.getKey());
                             blocklossResult.setBehospitalDate(hisMedicalRecordMap.get(medicalRecord.getBehospitalCode()).getBehospitalDate());
                             //拼装病历数据块丢失明细其他信息
-                            assembleOtherBlocklossResult(blocklossResult);
+                            assembleOtherBlocklossResult(blocklossResult, hospitalId, principleId);
                             outInserts.add(blocklossResult);
                         }
                     }
@@ -568,13 +581,15 @@ public class BlockLossManagementFacade {
      * 拼装病历数据块丢失明细其他信息
      *
      * @param blocklossResult
+     * @param hospitalId
+     * @param principleId
      * @Return void
      */
-    private void assembleOtherBlocklossResult(BlocklossResult blocklossResult) {
+    private void assembleOtherBlocklossResult(BlocklossResult blocklossResult, Long hospitalId, Long principleId) {
         blocklossResult.setStatus(LossStatusEnum.IS_LOSS.getKey());
-        blocklossResult.setHospitalId(SysUserUtils.getCurrentHospitalId() != null ? SysUserUtils.getCurrentHospitalId() : 0);
+        blocklossResult.setHospitalId(hospitalId != null ? hospitalId : 0);
         blocklossResult.setGmtCreate(DateUtil.now());
-        blocklossResult.setCreator(SysUserUtils.getCurrentPrincipleId() != null ? SysUserUtils.getCurrentPrincipleId() + "" : "0");
+        blocklossResult.setCreator(principleId != null ? principleId + "" : "0");
         blocklossResult.setGmtModified(DateUtil.now());
     }
 

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

@@ -143,6 +143,7 @@ public class ColumnResultManagementFacade {
      * @return: 是否成功
      */
     public Boolean updateColumnResult(UpdateColumnResultVO updateColumnResultVO) {
+        Long principleId = SysUserUtils.getCurrentPrincipleId();
         ColumnResult columnResultFacadeById = columnResultFacade.getById(updateColumnResultVO.getId());
         //先修改副表
         //非空校验结果表
@@ -154,6 +155,7 @@ public class ColumnResultManagementFacade {
                     .eq("id", resultId)
                     .set("description", updateColumnResultVO.getDescription())
                     .set("gmt_modified", new Date())
+                    .set("modifier", principleId)
             );
         }
         //正则校验结果表
@@ -163,6 +165,7 @@ public class ColumnResultManagementFacade {
                     .eq("id", resultId)
                     .set("description", updateColumnResultVO.getDescription())
                     .set("gmt_modified", new Date())
+                    .set("modifier", principleId)
             );
         }
         //关键字校验结果表
@@ -172,6 +175,7 @@ public class ColumnResultManagementFacade {
                     .eq("id", resultId)
                     .set("description", updateColumnResultVO.getDescription())
                     .set("gmt_modified", new Date())
+                    .set("modifier", principleId)
             );
         }
 
@@ -180,6 +184,7 @@ public class ColumnResultManagementFacade {
                 .eq("id", updateColumnResultVO.getId())
                 .set("description", updateColumnResultVO.getDescription())
                 .set("gmt_modified", new Date())
+                .set("modifier", principleId)
         );
     }
 
@@ -251,27 +256,32 @@ public class ColumnResultManagementFacade {
      */
     public Boolean dataCheck(DataCheckVO dataCheckVO) {
         List<String> behospitalCodeList = new ArrayList<>();
-        Long currentHospitalId = SysUserUtils.getCurrentHospitalId();
-        dataCheckVO.setHospitalId(currentHospitalId);
+        Long hospitalId = null;
+        Long principleId = null;
+        if(dataCheckVO.getHospitalId()==null){
+            hospitalId=SysUserUtils.getCurrentHospitalId();
+            principleId=SysUserUtils.getCurrentPrincipleId();
+        }
+        dataCheckVO.setHospitalId(hospitalId);
         String behospitalCode = dataCheckVO.getBehospitalCode();
         //传入BehospitalCode 只针对单个病历进行校验
         if (StringUtil.isNotEmpty(behospitalCode)) {
             List<BehospitalInfo> behospitalInfos = behospitalInfoFacade.getBaseMapper().selectList(new QueryWrapper<BehospitalInfo>()
                     .eq("is_deleted", IsDeleteEnum.N.getKey())
                     .eq("behospital_code", dataCheckVO.getBehospitalCode())
-                    .eq("hospital_id", dataCheckVO.getHospitalId())
+                    .eq(hospitalId!=null,"hospital_id", hospitalId)
             );
             if (ListUtil.isEmpty(behospitalInfos)) {
                 Asserts.fail("该患者信息未查询到！");
             }
             behospitalCodeList.add(behospitalCode);
             //对于集合病历所有校验规则校验其表信息字段
-            checkTableColumnVal(behospitalCodeList);
+            checkTableColumnVal(behospitalCodeList,hospitalId,principleId);
         }
         //对于只传时间不传病历的情况
         //创建一个病历集合
         if (StringUtil.isEmpty(behospitalCode)) {
-            List<BehospitalInfo> behospitalInfos = getBehospitalInfos(dataCheckVO.getDateStart(), dataCheckVO.getDateEnd(), dataCheckVO.getHospitalId());
+            List<BehospitalInfo> behospitalInfos = getBehospitalInfos(dataCheckVO.getDateStart(), dataCheckVO.getDateEnd(), hospitalId);
             if (ListUtil.isEmpty(behospitalInfos)) {
                 Asserts.fail("该时间段无病历信息！");
             }
@@ -280,7 +290,7 @@ public class ColumnResultManagementFacade {
                 behospitalCodeList.add(behospitalInfo.getBehospitalCode());
             }
             //对于集合病历所有校验规则校验其表信息字段
-            checkTableColumnVal(behospitalCodeList);
+            checkTableColumnVal(behospitalCodeList,hospitalId,principleId);
         }
         return true;
     }
@@ -292,24 +302,23 @@ public class ColumnResultManagementFacade {
      * @param behospitalCodeList
      * @return: 具体数据
      */
-    public void checkTableColumnVal(List<String> behospitalCodeList) {
+    public void checkTableColumnVal(List<String> behospitalCodeList,Long hospitalId,Long principleId) {
         //先获取非空的所有字段校验规则
         List<NonnullInfo> nonnullInfos = getNonnullInfo();
-        Long hospitalId = SysUserUtils.getCurrentHospitalId();
         if (ListUtil.isNotEmpty(nonnullInfos)) {
             //调用校验非空规则方法
-            checkNonnull(nonnullInfos, behospitalCodeList, hospitalId);
+            checkNonnull(nonnullInfos, behospitalCodeList, hospitalId,principleId);
         }
         //获取正则所有字段校验规则
         List<GetRegular> regularMappings = getRegularMapping();
         if (ListUtil.isNotEmpty(regularMappings)) {
             //调用校验正则规则
-            checkRegular(regularMappings, behospitalCodeList, hospitalId);
+            checkRegular(regularMappings, behospitalCodeList, hospitalId,principleId);
         }
         //获取字段校验的标准值规则
         List<GetStandardvalueInfoDTO> standardvalueInfo = getStandardvalueInfo();
         if (ListUtil.isNotEmpty(standardvalueInfo)) {
-            checkStandardvalue(standardvalueInfo, behospitalCodeList, hospitalId);
+            checkStandardvalue(standardvalueInfo, behospitalCodeList, hospitalId,principleId);
         }
     }
 
@@ -319,8 +328,8 @@ public class ColumnResultManagementFacade {
      * @param
      * @return: 具体数据
      */
-    public void taskCheckTableColumnVal() {
-        Long hospitalId = SysUserUtils.getCurrentHospitalId();
+    public void taskCheckTableColumnVal(Long hospitalId) {
+        Long principleId = null;
         List<NonnullInfo> nonnullInfoList = new ArrayList<>();
         List<GetRegular> regularList = new ArrayList<>();
         List<GetStandardvalueInfoDTO> standardvalueList = new ArrayList<>();
@@ -381,17 +390,17 @@ public class ColumnResultManagementFacade {
         //非空校验规则今天有修改
         if (ListUtil.isNotEmpty(nonnullInfoList)) {
             //调用校验非空规则方法
-            checkNonnull(nonnullInfos, behospitalCodeList, hospitalId);
+            checkNonnull(nonnullInfos, behospitalCodeList, hospitalId,principleId);
         }
         //正则校验规则今天有修改
         if (ListUtil.isNotEmpty(regularList)) {
             //调用校验正则规则
-            checkRegular(regularMappings, behospitalCodeList, hospitalId);
+            checkRegular(regularMappings, behospitalCodeList, hospitalId,principleId);
         }
         //标准值校验规则今天有修改
         if (ListUtil.isNotEmpty(standardvalueList)) {
             //调用校验正则规则
-            checkStandardvalue(standardvalueInfo, behospitalCodeList, hospitalId);
+            checkStandardvalue(standardvalueInfo, behospitalCodeList, hospitalId,principleId);
         }
     }
 
@@ -453,7 +462,7 @@ public class ColumnResultManagementFacade {
      * @param hospitalId
      * @return:
      */
-    public void checkNonnull(List<NonnullInfo> nonnullInfos, List<String> behospitalCodeList, Long hospitalId) {
+    public void checkNonnull(List<NonnullInfo> nonnullInfos, List<String> behospitalCodeList, Long hospitalId,Long principleId) {
         for (NonnullInfo nonnullInfo : nonnullInfos) {
             Long columnId = nonnullInfo.getColumnId();
             ColumnInfo columnInfo = columnInfoFacade.getBaseMapper().selectById(columnId);
@@ -503,6 +512,9 @@ public class ColumnResultManagementFacade {
                     nonnullResult.setTableEname(columnInfo.getTableEname());
                     nonnullResult.setColumnCname(columnInfo.getColumnCname());
                     nonnullResult.setColumnEname(columnInfo.getColumnEname());
+                    if(principleId!=null) {
+                        nonnullResult.setCreator(principleId.toString());
+                    }
                     nonnullResult.setTableId(getTableColumnInfoDTO.getTableId());
                     nonnullResult.setIsSolved(SolvedStatusEnum.NOT_SOLVED.getKey());
                     nonnullResult.setSolveTime(new Date());
@@ -512,7 +524,7 @@ public class ColumnResultManagementFacade {
                     nonnullResultFacade.getBaseMapper().insert(nonnullResult);
                     Long id = nonnullResult.getId();
                     //加入总结果表
-                    addColumnResult(getTableColumnInfoDTO, columnInfo, columnId, id, ColumnResultTypeEnum.NONNULL_TYPE.getKey());
+                    addColumnResult(getTableColumnInfoDTO, columnInfo, columnId, id, ColumnResultTypeEnum.NONNULL_TYPE.getKey(),principleId);
                 }
             }
         }
@@ -526,7 +538,7 @@ public class ColumnResultManagementFacade {
      * @param hospitalId
      * @return:
      */
-    public void checkRegular(List<GetRegular> regularMappings, List<String> behospitalCodeList, Long hospitalId) {
+    public void checkRegular(List<GetRegular> regularMappings, List<String> behospitalCodeList, Long hospitalId,Long principleId) {
         for (GetRegular getRegular : regularMappings) {
             Long columnId = getRegular.getColumnId();
             ColumnInfo columnInfo = columnInfoFacade.getBaseMapper().selectById(columnId);
@@ -573,12 +585,14 @@ public class ColumnResultManagementFacade {
                     regularResult.setBehospitalDate(getTableColumnInfoDTO.getBehospitalDate());
                     regularResult.setHospitalDataCode(getTableColumnInfoDTO.getNumberId());
                     regularResult.setRegularId(getRegular.getId());
+                    if(principleId!=null) {
+                        regularResult.setCreator(principleId.toString());
+                    }
                     regularResult.setRegularName(getRegular.getName());
                     regularResult.setBehospitalDate(getTableColumnInfoDTO.getBehospitalDate());
                     regularResult.setRegularVal(getRegular.getVal());
                     regularResult.setRegularDes(getRegular.getDes());
                     regularResult.setTableId(getTableColumnInfoDTO.getTableId());
-                    regularResult.setTableVal(getTableColumnInfoDTO.getVal());
                     regularResult.setIsSolved(SolvedStatusEnum.NOT_SOLVED.getKey());
                     regularResult.setSolveTime(new Date());
                     regularResult.setIsAudited(AuditStatusEnum.NOT_AUDIT.getKey());
@@ -587,7 +601,7 @@ public class ColumnResultManagementFacade {
                     regularResultFacade.getBaseMapper().insert(regularResult);
                     Long id = regularResult.getId();
                     //加入总结果表
-                    addColumnResult(getTableColumnInfoDTO, columnInfo, columnId, id, ColumnResultTypeEnum.REGULAR_TYPE.getKey());
+                    addColumnResult(getTableColumnInfoDTO, columnInfo, columnId, id, ColumnResultTypeEnum.REGULAR_TYPE.getKey(),principleId);
                 }
             }
         }
@@ -601,7 +615,7 @@ public class ColumnResultManagementFacade {
      * @param hospitalId
      * @return:
      */
-    public void checkStandardvalue(List<GetStandardvalueInfoDTO> standardvalueInfos, List<String> behospitalCodeList, Long hospitalId) {
+    public void checkStandardvalue(List<GetStandardvalueInfoDTO> standardvalueInfos, List<String> behospitalCodeList, Long hospitalId,Long principleId) {
         for (GetStandardvalueInfoDTO standardvalueInfo : standardvalueInfos) {
             Long columnId = standardvalueInfo.getColumnId();
             ColumnInfo columnInfo = columnInfoFacade.getBaseMapper().selectById(columnId);
@@ -651,8 +665,10 @@ public class ColumnResultManagementFacade {
                     standardvalueResult.setColumnCname(columnInfo.getColumnCname());
                     standardvalueResult.setColumnEname(columnInfo.getColumnEname());
                     standardvalueResult.setHospitalDataCode(getTableColumnInfoDTO.getNumberId());
+                    if(principleId!=null) {
+                        standardvalueResult.setCreator(principleId.toString());
+                    }
                     standardvalueResult.setTableId(getTableColumnInfoDTO.getTableId());
-                    standardvalueResult.setTableVal(getTableColumnInfoDTO.getVal());
                     standardvalueResult.setIsSolved(SolvedStatusEnum.NOT_SOLVED.getKey());
                     standardvalueResult.setSolveTime(new Date());
                     standardvalueResult.setIsAudited(AuditStatusEnum.NOT_AUDIT.getKey());
@@ -661,7 +677,7 @@ public class ColumnResultManagementFacade {
                     standardvalueResultFacade.getBaseMapper().insert(standardvalueResult);
                     Long id = standardvalueResult.getId();
                     //加入总结果表
-                    addColumnResult(getTableColumnInfoDTO, columnInfo, columnId, id, ColumnResultTypeEnum.STANDARD_TYPE.getKey());
+                    addColumnResult(getTableColumnInfoDTO, columnInfo, columnId, id, ColumnResultTypeEnum.STANDARD_TYPE.getKey(),principleId);
                 }
             }
         }
@@ -795,7 +811,7 @@ public class ColumnResultManagementFacade {
      * @param type
      * @return:
      */
-    public void addColumnResult(GetTableColumnInfoDTO getTableColumnInfoDTO, ColumnInfo columnInfo, Long columnId, Long id, String type) {
+    public void addColumnResult(GetTableColumnInfoDTO getTableColumnInfoDTO, ColumnInfo columnInfo, Long columnId, Long id, String type,Long principleId) {
         ColumnResult columnResult = new ColumnResult();
         columnResult.setHospitalId(getTableColumnInfoDTO.getHospitalId());
         columnResult.setBehospitalCode(getTableColumnInfoDTO.getBehospitalCode());
@@ -805,13 +821,15 @@ public class ColumnResultManagementFacade {
         columnResult.setHosptialDatatmpName(getTableColumnInfoDTO.getModeName());
         columnResult.setHospitalDataCode(getTableColumnInfoDTO.getNumberId());
         columnResult.setColumnId(columnId);
+        if(principleId!=null) {
+            columnResult.setCreator(principleId.toString());
+        }
         columnResult.setBehospitalDate(getTableColumnInfoDTO.getBehospitalDate());
         columnResult.setTableCname(columnInfo.getTableCname());
         columnResult.setTableEname(columnInfo.getTableEname());
         columnResult.setColumnCname(columnInfo.getColumnCname());
         columnResult.setColumnEname(columnInfo.getColumnEname());
         columnResult.setTableId(getTableColumnInfoDTO.getTableId());
-        columnResult.setTableVal(getTableColumnInfoDTO.getVal());
         //数据缺失
         if (ColumnResultTypeEnum.NONNULL_TYPE.getKey().equals(type)) {
             columnResult.setType(ColumnResultTypeEnum.NONNULL_TYPE.getKey());

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

@@ -193,6 +193,7 @@ public class ColumnVerifyManagementFacade {
      */
     public Boolean addColumnVerify(AddColumnVerifyVO addColumnVerifyVO) {
         Long currentHospitalId = SysUserUtils.getCurrentHospitalId();
+        Long principleId = SysUserUtils.getCurrentPrincipleId();
         addColumnVerifyVO.setHospitalId(currentHospitalId);
         List<ColumnInfoVO> columnList = addColumnVerifyVO.getColumnList();
         //判断是否有重复
@@ -226,6 +227,7 @@ public class ColumnVerifyManagementFacade {
                 regularMapping.setColumnId(columnId);
                 regularMapping.setGmtCreate(new Date());
                 regularMapping.setGmtModified(new Date());
+                regularMapping.setCreator(principleId.toString());
                 regularMapping.setRegularId(addColumnVerifyVO.getRegularId());
                 try {
                     regularMappingFacade.getBaseMapper().insert(regularMapping);
@@ -240,6 +242,7 @@ public class ColumnVerifyManagementFacade {
                 columnVerify.setDescription(addColumnVerifyVO.getDescription());
                 columnVerify.setGmtCreate(new Date());
                 columnVerify.setGmtModified(new Date());
+                columnVerify.setCreator(principleId.toString());
                 try {
                     columnVerifyFacade.getBaseMapper().insert(columnVerify);
                 } catch (Exception e) {
@@ -260,6 +263,7 @@ public class ColumnVerifyManagementFacade {
                 nonnullInfo.setColumnId(columnId);
                 nonnullInfo.setGmtCreate(new Date());
                 nonnullInfo.setGmtModified(new Date());
+                nonnullInfo.setCreator(principleId.toString());
                 nonnullInfo.setIsRequired(addColumnVerifyVO.getIsRequired());
                 try {
                     nonnullInfoFacade.getBaseMapper().insert(nonnullInfo);
@@ -274,6 +278,7 @@ public class ColumnVerifyManagementFacade {
                 columnVerify.setDescription(addColumnVerifyVO.getDescription());
                 columnVerify.setGmtCreate(new Date());
                 columnVerify.setGmtModified(new Date());
+                columnVerify.setCreator(principleId.toString());
                 try {
                     columnVerifyFacade.getBaseMapper().insert(columnVerify);
                 } catch (Exception e) {
@@ -288,6 +293,7 @@ public class ColumnVerifyManagementFacade {
                     standardvalueInfo.setColumnId(columnId);
                     standardvalueInfo.setGmtCreate(new Date());
                     standardvalueInfo.setGmtModified(new Date());
+                    standardvalueInfo.setCreator(principleId.toString());
                     standardvalueInfo.setVal(standardValue);
                     try {
                         standardvalueInfoFacade.getBaseMapper().insert(standardvalueInfo);
@@ -302,6 +308,7 @@ public class ColumnVerifyManagementFacade {
                     columnVerify.setDescription(addColumnVerifyVO.getDescription());
                     columnVerify.setGmtCreate(new Date());
                     columnVerify.setGmtModified(new Date());
+                    columnVerify.setCreator(principleId.toString());
                     try {
                         columnVerifyFacade.getBaseMapper().insert(columnVerify);
                     } catch (Exception e) {
@@ -394,6 +401,7 @@ public class ColumnVerifyManagementFacade {
      */
     public Boolean updateColumnVerify(UpdateColumnVerifyVO updateColumnVerifyVO) {
         Long currentHospitalId = SysUserUtils.getCurrentHospitalId();
+        Long principleId = SysUserUtils.getCurrentPrincipleId();
         updateColumnVerifyVO.setHospitalId(currentHospitalId);
         List<ColumnInfoVO> columnList = updateColumnVerifyVO.getColumnList();
         //判断是否有重复--去重
@@ -455,6 +463,7 @@ public class ColumnVerifyManagementFacade {
                                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                                 .set("regular_id", updateColumnVerifyVO.getRegularId())
                                 .set("gmt_modified", new Date())
+                                .set("modifier",principleId)
                         );
                         Long mappingId = selectOneMapping.getId();
                         //修改总表
@@ -465,12 +474,14 @@ public class ColumnVerifyManagementFacade {
                                 .set("verify_val", updateColumnVerifyVO.getRegularName())
                                 .set("description", updateColumnVerifyVO.getDescription())
                                 .set("gmt_modified", new Date())
+                                .set("modifier",principleId)
                         );
                     } else {
                         //未关联正则走新增
                         RegularMapping regularMapping = new RegularMapping();
                         regularMapping.setColumnId(columnId);
                         regularMapping.setGmtCreate(new Date());
+                        regularMapping.setCreator(principleId.toString());
                         regularMapping.setRegularId(updateColumnVerifyVO.getRegularId());
                         try {
                             regularMappingFacade.getBaseMapper().insert(regularMapping);
@@ -484,6 +495,7 @@ public class ColumnVerifyManagementFacade {
                         columnVerify.setVerifyVal(updateColumnVerifyVO.getRegularName());
                         columnVerify.setDescription(updateColumnVerifyVO.getDescription());
                         columnVerify.setGmtCreate(new Date());
+                        columnVerify.setCreator(principleId.toString());
                         try {
                             columnVerifyFacade.getBaseMapper().insert(columnVerify);
                         } catch (Exception e) {
@@ -505,6 +517,7 @@ public class ColumnVerifyManagementFacade {
                                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                                 .set("is_required", updateColumnVerifyVO.getIsRequired())
                                 .set("gmt_modified", new Date())
+                                .set("modifier",principleId)
                         );
                         Long mappingId = selectOneInfo.getId();
                         //修改总表
@@ -515,11 +528,13 @@ public class ColumnVerifyManagementFacade {
                                 .set("verify_val", updateColumnVerifyVO.getIsRequired())
                                 .set("description", updateColumnVerifyVO.getDescription())
                                 .set("gmt_modified", new Date())
+                                .set("modifier",principleId)
                         );
                     } else {
                         NonnullInfo nonnullInfo = new NonnullInfo();
                         nonnullInfo.setColumnId(columnId);
                         nonnullInfo.setGmtCreate(new Date());
+                        nonnullInfo.setCreator(principleId.toString());
                         nonnullInfo.setIsRequired(updateColumnVerifyVO.getIsRequired());
                         try {
                             nonnullInfoFacade.getBaseMapper().insert(nonnullInfo);
@@ -533,6 +548,7 @@ public class ColumnVerifyManagementFacade {
                         columnVerify.setVerifyVal(updateColumnVerifyVO.getIsRequired());
                         columnVerify.setDescription(updateColumnVerifyVO.getDescription());
                         columnVerify.setGmtCreate(new Date());
+                        columnVerify.setCreator(principleId.toString());
                         try {
                             columnVerifyFacade.getBaseMapper().insert(columnVerify);
                         } catch (Exception e) {
@@ -557,6 +573,7 @@ public class ColumnVerifyManagementFacade {
                         standardvalueInfo.setGmtCreate(new Date());
                         standardvalueInfo.setGmtModified(new Date());
                         standardvalueInfo.setVal(standardValue);
+                        standardvalueInfo.setCreator(principleId.toString());
                         try {
                             standardvalueInfoFacade.getBaseMapper().insert(standardvalueInfo);
                         } catch (Exception e) {
@@ -570,6 +587,7 @@ public class ColumnVerifyManagementFacade {
                         columnVerify.setDescription(updateColumnVerifyVO.getDescription());
                         columnVerify.setGmtCreate(new Date());
                         columnVerify.setGmtModified(new Date());
+                        columnVerify.setCreator(principleId.toString());
                         try {
                             columnVerifyFacade.getBaseMapper().insert(columnVerify);
                         } catch (Exception e) {

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

@@ -28,6 +28,9 @@ public class BlockLossDataCompareTask implements SchedulingConfigurer {
     @Value("${blockloss.compare.use}")
     private String isUsed = "false";
 
+    @Value("${blockloss.compare.hospitalId}")
+    private String hospitalId = "0";
+
     /**
      * 执行定时任务.
      */
@@ -40,6 +43,7 @@ public class BlockLossDataCompareTask implements SchedulingConfigurer {
                     DataCompareVO dataCompareVO = new DataCompareVO();
                     dataCompareVO.setStartDate(DateUtil.addDate(DateUtil.now(),-1));
                     dataCompareVO.setEndDate(DateUtil.now());
+                    dataCompareVO.setHospitalId(Long.parseLong(hospitalId));
                     blockLossManagementFacade.dataCompare(dataCompareVO);
                 }
             }

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

@@ -27,6 +27,8 @@ public class ColumnResultDataCompareTask implements SchedulingConfigurer {
     private String cron = "0 0 1 * * ?";
     @Value("${columnResult.compare.use}")
     private String isUsed = "false";
+    @Value("${columnResult.compare.hospitalId}")
+    private String hospitalId = "0";
 
     /**
      * 执行定时任务.
@@ -40,6 +42,7 @@ public class ColumnResultDataCompareTask implements SchedulingConfigurer {
                     DataCheckVO dataCheckVO = new DataCheckVO();
                     dataCheckVO.setDateStart(DateUtil.addDate(DateUtil.now(),-1));
                     dataCheckVO.setDateEnd(DateUtil.now());
+                    dataCheckVO.setHospitalId(Long.valueOf(hospitalId));
                     columnResultManagementFacade.dataCheck(dataCheckVO);
                 }
             }

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

@@ -27,7 +27,8 @@ public class UpColumnResultDataCompareTask implements SchedulingConfigurer {
     private String cron = "0 0 0 * * ?";
     @Value("${upColumnResult.compare.use}")
     private String isUsed = "false";
-
+    @Value("${upColumnResult.compare.hospitalId}")
+    private String hospitalId = "0";
     /**
      * 执行定时任务.
      */
@@ -37,7 +38,8 @@ public class UpColumnResultDataCompareTask implements SchedulingConfigurer {
             @Override
             public void run() {
                 if(Boolean.parseBoolean(isUsed)){
-                    columnResultManagementFacade.taskCheckTableColumnVal();
+
+                    columnResultManagementFacade.taskCheckTableColumnVal(Long.valueOf(hospitalId));
                 }
             }
         }, new Trigger() {

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

@@ -59,15 +59,18 @@ swagger.version: 0.0.1-SNAPSHOT
 #数据比对定时器
 blockloss:
   compare:
-    cron: 0 0 1 * * ?
+    cron: 0 0/1 * * * ?
     use: true
+    hospitalId: 4
 #数据校验定时器
 columnResult:
   compare:
-    cron: 0 0 1 * * ?
+    cron: 0 0/1 * * ?
     use: true
+    hospitalId: 4
 #修改规则数据校验定时器
 upColumnResult:
   compare:
-    cron: 0 0 0 * * ?
-    use: true
+    cron: 0 0/0 * * ?
+    use: true
+    hospitalId: 4

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

@@ -45,7 +45,9 @@
         med_behospital_info
         WHERE
         is_deleted = 'N'
+        <if test="getTableColumnInfoVO.hospitalId != null and getTableColumnInfoVO.hospitalId != ''">
         AND hospital_id = #{getTableColumnInfoVO.hospitalId}
+        </if>
         AND behospital_code in
         <foreach collection="getTableColumnInfoVO.behospitalCodeList" item="behospitalCode" open="(" separator=","
                  close=")">

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

@@ -13,7 +13,8 @@
         GROUP_CONCAT(a.isRequired SEPARATOR ';') isRequired,
         GROUP_CONCAT(a.standardvalue SEPARATOR ';') standardvalue,
         GROUP_CONCAT(a.regular SEPARATOR ';') regular,
-        a.description
+        a.description,
+        a.gmt_create
         FROM
         (
         SELECT
@@ -24,6 +25,7 @@
         dcv.column_ename,
         dcv.type,
         dcv.description,
+        dcv.gmt_create,
         CASE dcv.type WHEN 1 THEN dcv.verify_val ELSE NULL END isRequired,
         CASE dcv.type WHEN 2 THEN dcv.verify_val ELSE NULL END standardvalue,
         CASE dcv.type WHEN 3 THEN dcv.verify_val ELSE NULL END regular