From f5e25fb28c571dda037070455e4a51fa786b886a Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 12 Feb 2020 11:05:17 +0800 Subject: [PATCH] update code --- .../operate/web/facade/AntenatalExaminationFacade.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index cd6b00c..3a620e1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -1205,17 +1205,18 @@ public class AntenatalExaminationFacade { AntExRecordQuery antExRecordQuery = new AntExRecordQuery(); antExRecordQuery.setPid(patients.getPid()); - List recordModels = recordService.queryAntExRecords(antExRecordQuery, Sort.Direction.DESC, "checkTime"); + List recordModels = recordService.queryAntExRecords(antExRecordQuery, Sort.Direction.DESC, "created"); System.out.println(recordModels.size()); if (CollectionUtils.isNotEmpty(recordModels) && recordModels.size() > 1) { TrackCountRecord record = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(patients.getPid())).with(new Sort(Sort.Direction.DESC, "created")), TrackCountRecord.class); System.out.println("record="+record); AntExRecordModel recordModel = recordModels.get(recordModels.size() - 2); + System.out.println("recordModel="+recordModel); System.out.println(recordModel.getId()); System.out.println(DateUtil.getyyyy_MM_dd(recordModel.getNextCheckTime())); - System.out.println(DateUtil.getyyyy_MM_dd(nextCheckTime)); - if (DateUtil.getyyyy_MM_dd(recordModel.getNextCheckTime()).equals(DateUtil.getyyyy_MM_dd(nextCheckTime))) + System.out.println(DateUtil.getyyyy_MM_dd(checkTime)); + if (DateUtil.getyyyy_MM_dd(recordModel.getNextCheckTime()).equals(DateUtil.getyyyy_MM_dd(checkTime))) { record.setZsCheckStatus(1); @@ -1248,10 +1249,14 @@ public class AntenatalExaminationFacade { { List rlevel = JsonUtil.jkstr2Obj(patients.getRiskLevelId(), List.class); Integer day = getTrackDay(rlevel, configs); + System.out.println("day="+day); if (day != null) { + System.out.println(checkTime.getTime() < DateUtil.addDay(recordModel.getNextCheckTime(),day+1).getTime()); + System.out.println(checkTime.getTime() >= recordModel.getNextCheckTime().getTime()); if (checkTime.getTime() < DateUtil.addDay(recordModel.getNextCheckTime(),day+1).getTime() && checkTime.getTime() >= recordModel.getNextCheckTime().getTime()) { + record.setBackStatus(1); Query query = Query.query(Criteria.where("_id").is(record.getId())); Update update = MongoConvertHelper -- 1.8.3.1