Commit 3b1d7b70f414646c81ddd5cfe87ce4a749f3b902
1 parent
343ef2be81
Exists in
master
and in
6 other branches
修复bug
Showing 1 changed file with 4 additions and 4 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CommonServerImpl.java
View file @
3b1d7b7
... | ... | @@ -76,15 +76,15 @@ |
76 | 76 | PersonModel personModel = mongoTemplate.findOne(Query.query(Criteria.where("cardNo").is(cardNo)), PersonModel.class); |
77 | 77 | if (personModel != null) { |
78 | 78 | result.setPid(personModel.getId()); |
79 | - ResidentsArchiveModel archiveModel = mongoTemplate.findOne(Query.query(Criteria.where("certificateNum").is(cardNo)), ResidentsArchiveModel.class); | |
80 | - if (archiveModel != null) { | |
81 | - result.setWomenId(archiveModel.getId()); | |
82 | - } | |
83 | 79 | List<MaternalDeliverModel> models = mongoTemplate.find(Query.query(Criteria.where("pid").is(personModel.getId())).with(new Sort(Sort.Direction.DESC, "created")), MaternalDeliverModel.class); |
84 | 80 | if (CollectionUtils.isNotEmpty(models)) { |
85 | 81 | MaternalDeliverModel maternalDeliverModel = models.get(0); |
86 | 82 | result.setMataFollowId(maternalDeliverModel.getId()); |
87 | 83 | } |
84 | + } | |
85 | + ResidentsArchiveModel archiveModel = mongoTemplate.findOne(Query.query(Criteria.where("certificateNum").is(cardNo)), ResidentsArchiveModel.class); | |
86 | + if (archiveModel != null) { | |
87 | + result.setWomenId(archiveModel.getId()); | |
88 | 88 | } |
89 | 89 | baseResponse.setObject(result); |
90 | 90 | return baseResponse; |