diff --git a/src/main/java/com/docus/server/collection/mapper/TBasicMapper.java b/src/main/java/com/docus/server/collection/mapper/TBasicMapper.java index 83f7c62..e9c5ee2 100644 --- a/src/main/java/com/docus/server/collection/mapper/TBasicMapper.java +++ b/src/main/java/com/docus/server/collection/mapper/TBasicMapper.java @@ -44,4 +44,6 @@ public interface TBasicMapper{ * @return 归档关联顺德人医报告的交叉索引 */ String getSdRyIndexByPatientId(@Param("patientId")String patientId); + + List selectBasicListByCreateOrUpdateTime(@Param("startDate")String queryBasicStartDate, @Param("endDate")String queryBasicEndDate, @Param("offset") int offset,@Param("size") int size); } diff --git a/src/main/java/com/docus/server/report/job/ReportJob.java b/src/main/java/com/docus/server/report/job/ReportJob.java index ecec4b7..29b033f 100644 --- a/src/main/java/com/docus/server/report/job/ReportJob.java +++ b/src/main/java/com/docus/server/report/job/ReportJob.java @@ -31,7 +31,10 @@ import java.time.Instant; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.ZoneId; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.List; import java.util.stream.Collectors; /** @@ -63,18 +66,20 @@ public class ReportJob { // 顺德人医 Lis 检验报告查询 final String jobType = "SdRyLisReport"; LocalDateTime now = LocalDateTime.now(); + // 等待基础数据入库时间 + now=now.plusMinutes(-10); log.info("LIS检验报告报告查询 任务开始了"); - // 定义查基础数据 入院时间 开始结束 + // 定义查基础数据 根据基础数据的创建时间 AfJobTime afJobTime = getJobTimeByJobType(jobType); - String queryBasicAdmissStartDate = afJobTime.getUpdateTime(); - String queryBasicAdmissEndDate = now.toString(); + String queryBasicStartDate = afJobTime.getUpdateTime(); + String queryBasicEndDate = DateUtil.formatDateTime(now); // 查询基础数据定义 分页 int offset = 0; int pageSize = 50; boolean loopCondition = true; try { do { - List basicList = tBasicMapper.selectBasicListByAdmissDate(queryBasicAdmissStartDate, queryBasicAdmissEndDate, offset, pageSize); + List basicList = tBasicMapper.selectBasicListByCreateOrUpdateTime(queryBasicStartDate, queryBasicEndDate, offset, pageSize); if (Func.isEmpty(basicList)) { break; } @@ -97,7 +102,7 @@ public class ReportJob { log.error("LIS检验报告报告查询 出错啦!", ex); } - afJobTime.setUpdateTime(now.toString()); + afJobTime.setUpdateTime(DateUtil.formatDateTime(now)); refreshTime(afJobTime); log.info("LIS检验报告报告查询 任务结束了,本次查询出院时间段 {} - {}", "", ""); } @@ -111,18 +116,20 @@ public class ReportJob { // 顺德人医 检查报告查询 final String jobType = "SdRyInspectReport"; LocalDateTime now = LocalDateTime.now(); + // 等待基础数据入库时间 + now=now.plusMinutes(-10); log.info("检查报告报告查询 任务开始了"); - // 定义查基础数据 入院时间 开始结束 + // 定义查基础数据 更新时间 开始结束 AfJobTime afJobTime = getJobTimeByJobType(jobType); - String queryBasicAdmissStartDate = afJobTime.getUpdateTime(); - String queryBasicAdmissEndDate = now.toString(); + String queryBasicStartDate = afJobTime.getUpdateTime(); + String queryBasicEndDate = DateUtil.formatDateTime(now); // 查询基础数据定义 分页 int offset = 0; int pageSize = 50; boolean loopCondition = true; try { do { - List basicList = tBasicMapper.selectBasicListByAdmissDate(queryBasicAdmissStartDate, queryBasicAdmissEndDate, offset, pageSize); + List basicList = tBasicMapper.selectBasicListByCreateOrUpdateTime(queryBasicStartDate, queryBasicEndDate, offset, pageSize); if (Func.isEmpty(basicList)) { break; } @@ -145,7 +152,7 @@ public class ReportJob { log.error("检查报告报告查询 出错啦!", ex); } - afJobTime.setUpdateTime(now.toString()); + afJobTime.setUpdateTime(DateUtil.formatDateTime(now)); refreshTime(afJobTime); log.info("检查报告报告查询 任务结束了,本次查询出院时间段 {} - {}", "", ""); } diff --git a/src/main/resources/mapper/TBasicMapper.xml b/src/main/resources/mapper/TBasicMapper.xml index 2773e6e..c224847 100644 --- a/src/main/resources/mapper/TBasicMapper.xml +++ b/src/main/resources/mapper/TBasicMapper.xml @@ -115,4 +115,27 @@ from `docus_medicalrecord`.`t_basic_extend` where patient_id=#{patientId} +