Commit 2cbbf515fcef23f7dfde67c1008a20fcb6954755

Authored by wtt
1 parent 4bfb221b62
Exists in master and in 1 other branch dev

update

Showing 2 changed files with 7 additions and 0 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java View file @ 2cbbf51
... ... @@ -717,6 +717,7 @@
717 717 data.addAll((List) f.get(30, TimeUnit.SECONDS));
718 718 } catch (Exception e) {
719 719 ExceptionUtils.catchException(e, "antexrecord findList get result future error.");
  720 + return null;
720 721 }
721 722 }
722 723 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/AntExRecordWorker.java View file @ 2cbbf51
... ... @@ -129,7 +129,13 @@
129 129 }
130 130  
131 131 AntExRecordQuery antExRecordQuery1 = new AntExRecordQuery();
  132 + if(StringUtils.isEmpty(e.getParentId())){
  133 + continue;
  134 + }
132 135 Patients patients = patientsService.findOnePatientById(e.getParentId());
  136 + if(patients == null || patients.getLastMenses() == null){
  137 + continue;
  138 + }
133 139 antExRecordQuery1.setCheckTimeStart(patients.getLastMenses());
134 140 antExRecordQuery1.setCheckTimeEnd(e.getCheckTime());
135 141 antExRecordQuery1.setPid(e.getPid());