From 7e6584b6699180ad5091b52a41b20c8e270ed2f2 Mon Sep 17 00:00:00 2001 From: "litao@lymsh.com" Date: Fri, 29 Dec 2017 10:49:18 +0800 Subject: [PATCH] bbbbbb --- .../lyms/platform/operate/web/service/impl/ReportServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java index 7a6bc89..3e5c788 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java @@ -605,12 +605,12 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService if(patients == null) { return RespBuilder.buildSuccess(); } - Patients p = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(patients.getPid()).and("type").is(1)), Patients.class); + Patients p = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(patients.getPid())).with(new Sort(Sort.Direction.DESC, "lastMenses")), Patients.class); if(p == null) { return RespBuilder.buildSuccess(); } - AntExChuModel antExChuModel = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(p.getId()).and("yn").is(1)).with(new Sort(Sort.Direction.DESC, "checkTime")), AntExChuModel.class); - List antexModels = mongoTemplate.find(Query.query(Criteria.where("parentId").is(p.getId()).and("yn").is(1)).with(new Sort(Sort.Direction.DESC, "checkDate")), AntenatalExaminationModel.class); + AntExChuModel antExChuModel = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(p.getId()).and("yn").is(1).and("checkTime").gte(p.getLastMenses())).with(new Sort(Sort.Direction.DESC, "checkTime")), AntExChuModel.class); + List antexModels = mongoTemplate.find(Query.query(Criteria.where("parentId").is(p.getId()).and("yn").is(1).and("checkDate").gte(p.getLastMenses())).with(new Sort(Sort.Direction.DESC, "checkDate")), AntenatalExaminationModel.class); Map xyMap = new HashMap<>(); List szyMin = new ArrayList<>(); -- 1.8.3.1