From ef5b0e131b14493ca79eeafd4c4a2615af796c86 Mon Sep 17 00:00:00 2001 From: "litao@lymsh.com" Date: Tue, 14 Nov 2017 14:31:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/service/impl/ReportServiceImpl.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 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 e251620..0a0e6f1 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 @@ -1588,21 +1588,22 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService week = DateUtil.getWeekDesc(antexc.getLastMenses(), antexc.getCheckTime()); // number = findNumberByList("checkTime", "pid", antexc.getPid(), antexc, AntExChuModel.class); phone = findPhoneByPid(antexc.getPid()); - id = antexc.getId();/** ε€„η†ζŽ’εΊ */ - List AntExChuModel = mongoTemplate.find(Query.query(Criteria.where("pid").is(antexc.getPid())), AntExChuModel.class); + List AntExChuModel = mongoTemplate.find(Query.query(Criteria.where("pid").is(antexc.getPid()).and("parentId").is(antexc.getParentId())), AntExChuModel.class); if(CollectionUtils.isNotEmpty(AntExChuModel)) { for (AntExChuModel antExChuModel : AntExChuModel) { sortTempModels.add(new SortTempModel(antExChuModel.getId(), antExChuModel.getCheckTime())); } } - List antExChuModels = mongoTemplate.find(Query.query(Criteria.where("pid").is(antexc.getPid())), AntenatalExaminationModel.class); + List antExChuModels = mongoTemplate.find(Query.query(Criteria.where("pid").is(antexc.getPid()).and("parentId").is(antexc.getParentId())), AntenatalExaminationModel.class); if(CollectionUtils.isNotEmpty(antExChuModels)) { for (AntenatalExaminationModel antExChuModel : antExChuModels) { sortTempModels.add(new SortTempModel(antExChuModel.getId(), antExChuModel.getCreated())); } } + + } else { AntenatalExaminationModel antenatal = mongoTemplate.findById(usedId, AntenatalExaminationModel.class); if(antenatal != null) { @@ -1617,7 +1618,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService sortTempModels.add(new SortTempModel(antExChuModel.getId(), antExChuModel.getCreated())); } } - List AntExChuModel = mongoTemplate.find(Query.query(Criteria.where("pid").is(antenatal.getPid())), AntExChuModel.class); + List AntExChuModel = mongoTemplate.find(Query.query(Criteria.where("pid").is(antenatal.getPid()).and("parentId").is(antenatal.getParentId())), AntExChuModel.class); if(CollectionUtils.isNotEmpty(AntExChuModel)) { for (AntExChuModel antExChuModel : AntExChuModel) { sortTempModels.add(new SortTempModel(antExChuModel.getId(), antExChuModel.getCheckTime())); -- 1.8.3.1