From 2cbbf515fcef23f7dfde67c1008a20fcb6954755 Mon Sep 17 00:00:00 2001 From: wtt Date: Tue, 6 Apr 2021 08:44:07 +0800 Subject: [PATCH] update --- .../com/lyms/platform/operate/web/facade/AntExRecordFacade.java | 1 + .../com/lyms/platform/operate/web/worker/AntExRecordWorker.java | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java index 57fa674..4c97b8c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java @@ -717,6 +717,7 @@ public class AntExRecordFacade { data.addAll((List) f.get(30, TimeUnit.SECONDS)); } catch (Exception e) { ExceptionUtils.catchException(e, "antexrecord findList get result future error."); + return null; } } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/AntExRecordWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/AntExRecordWorker.java index 63af7d7..0b90d17 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/AntExRecordWorker.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/AntExRecordWorker.java @@ -129,7 +129,13 @@ public class AntExRecordWorker implements Callable> { } AntExRecordQuery antExRecordQuery1 = new AntExRecordQuery(); + if(StringUtils.isEmpty(e.getParentId())){ + continue; + } Patients patients = patientsService.findOnePatientById(e.getParentId()); + if(patients == null || patients.getLastMenses() == null){ + continue; + } antExRecordQuery1.setCheckTimeStart(patients.getLastMenses()); antExRecordQuery1.setCheckTimeEnd(e.getCheckTime()); antExRecordQuery1.setPid(e.getPid()); -- 1.8.3.1