From 4d7ea30ce817db90b25329184591a58f6f5e093b Mon Sep 17 00:00:00 2001 From: liquanyu Date: Mon, 16 Dec 2019 11:46:02 +0800 Subject: [PATCH] update --- .../operate/web/service/impl/CommonServerImpl.java | 36 ++++++++++++++-------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CommonServerImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CommonServerImpl.java index 61373dd..0b4f57e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CommonServerImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CommonServerImpl.java @@ -72,11 +72,15 @@ public class CommonServerImpl implements ICommonServer { PersonModel personModel = mongoTemplate.findOne(Query.query(Criteria.where("cardNo").is(cardNo)), PersonModel.class); if (personModel != null) { result.setPid(personModel.getId()); - List models = mongoTemplate.find(Query.query(Criteria.where("pid").is(personModel.getId())).with(new Sort(Sort.Direction.DESC, "created")), MaternalDeliverModel.class); - if (CollectionUtils.isNotEmpty(models)) { - MaternalDeliverModel maternalDeliverModel = models.get(0); - result.setMataFollowId(maternalDeliverModel.getId()); + if (personModel.getType() != null && personModel.getType() == 3) + { + List models = mongoTemplate.find(Query.query(Criteria.where("pid").is(personModel.getId())).with(new Sort(Sort.Direction.DESC, "created")), MaternalDeliverModel.class); + if (CollectionUtils.isNotEmpty(models)) { + MaternalDeliverModel maternalDeliverModel = models.get(0); + result.setMataFollowId(maternalDeliverModel.getId()); + } } + getParentIdByPid(result, personModel); } ResidentsArchiveModel archiveModel = mongoTemplate.findOne(Query.query(Criteria.where("certificateNum").is(cardNo)), ResidentsArchiveModel.class); @@ -98,12 +102,16 @@ public class CommonServerImpl implements ICommonServer { if (archiveModel != null) { result.setWomenId(archiveModel.getId()); } - List models = mongoTemplate.find(Query.query(Criteria.where("pid").is(personModel.getId())).with(new Sort(Sort.Direction.DESC, "created")), MaternalDeliverModel.class); - if (CollectionUtils.isNotEmpty(models)) { - MaternalDeliverModel maternalDeliverModel = models.get(0); - result.setMataFollowId(maternalDeliverModel.getId()); - result.setParentId(maternalDeliverModel.getParentId()); + if (personModel.getType() != null && personModel.getType() == 3) + { + List models = mongoTemplate.find(Query.query(Criteria.where("pid").is(personModel.getId())).with(new Sort(Sort.Direction.DESC, "created")), MaternalDeliverModel.class); + if (CollectionUtils.isNotEmpty(models)) { + MaternalDeliverModel maternalDeliverModel = models.get(0); + result.setMataFollowId(maternalDeliverModel.getId()); + //result.setParentId(maternalDeliverModel.getParentId()); + } } + getParentIdByPid(result, personModel); } baseResponse.setObject(result); @@ -119,10 +127,12 @@ public class CommonServerImpl implements ICommonServer { PersonModel personModel = mongoTemplate.findOne(Query.query(Criteria.where("cardNo").is(archiveModel.getCertificateNum())), PersonModel.class); if (personModel != null) { result.setPid(personModel.getId()); - List models = mongoTemplate.find(Query.query(Criteria.where("pid").is(personModel.getId())).with(new Sort(Sort.Direction.DESC, "created")), MaternalDeliverModel.class); - if (CollectionUtils.isNotEmpty(models)) { - MaternalDeliverModel maternalDeliverModel = models.get(0); - result.setMataFollowId(maternalDeliverModel.getId()); + if (personModel.getType() != null && personModel.getType() == 3) { + List models = mongoTemplate.find(Query.query(Criteria.where("pid").is(personModel.getId())).with(new Sort(Sort.Direction.DESC, "created")), MaternalDeliverModel.class); + if (CollectionUtils.isNotEmpty(models)) { + MaternalDeliverModel maternalDeliverModel = models.get(0); + result.setMataFollowId(maternalDeliverModel.getId()); + } } getParentIdByPid(result, personModel); } -- 1.8.3.1