jiangjiazhi / regional-platform

Download as
Browse Code ยป

Commit 4d7ea30ce817db90b25329184591a58f6f5e093b

Authored by liquanyu
1 parent 54b597c79d
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 1 changed file with 23 additions and 13 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CommonServerImpl.java View file @ 4d7ea30
... ... @@ -72,11 +72,15 @@
72 72 PersonModel personModel = mongoTemplate.findOne(Query.query(Criteria.where("cardNo").is(cardNo)), PersonModel.class);
73 73 if (personModel != null) {
74 74 result.setPid(personModel.getId());
75   - List<MaternalDeliverModel> models = mongoTemplate.find(Query.query(Criteria.where("pid").is(personModel.getId())).with(new Sort(Sort.Direction.DESC, "created")), MaternalDeliverModel.class);
76   - if (CollectionUtils.isNotEmpty(models)) {
77   - MaternalDeliverModel maternalDeliverModel = models.get(0);
78   - result.setMataFollowId(maternalDeliverModel.getId());
  75 + if (personModel.getType() != null && personModel.getType() == 3)
  76 + {
  77 + List<MaternalDeliverModel> models = mongoTemplate.find(Query.query(Criteria.where("pid").is(personModel.getId())).with(new Sort(Sort.Direction.DESC, "created")), MaternalDeliverModel.class);
  78 + if (CollectionUtils.isNotEmpty(models)) {
  79 + MaternalDeliverModel maternalDeliverModel = models.get(0);
  80 + result.setMataFollowId(maternalDeliverModel.getId());
  81 + }
79 82 }
  83 +
80 84 getParentIdByPid(result, personModel);
81 85 }
82 86 ResidentsArchiveModel archiveModel = mongoTemplate.findOne(Query.query(Criteria.where("certificateNum").is(cardNo)), ResidentsArchiveModel.class);
83 87  
... ... @@ -98,12 +102,16 @@
98 102 if (archiveModel != null) {
99 103 result.setWomenId(archiveModel.getId());
100 104 }
101   - List<MaternalDeliverModel> models = mongoTemplate.find(Query.query(Criteria.where("pid").is(personModel.getId())).with(new Sort(Sort.Direction.DESC, "created")), MaternalDeliverModel.class);
102   - if (CollectionUtils.isNotEmpty(models)) {
103   - MaternalDeliverModel maternalDeliverModel = models.get(0);
104   - result.setMataFollowId(maternalDeliverModel.getId());
105   - result.setParentId(maternalDeliverModel.getParentId());
  105 + if (personModel.getType() != null && personModel.getType() == 3)
  106 + {
  107 + List<MaternalDeliverModel> models = mongoTemplate.find(Query.query(Criteria.where("pid").is(personModel.getId())).with(new Sort(Sort.Direction.DESC, "created")), MaternalDeliverModel.class);
  108 + if (CollectionUtils.isNotEmpty(models)) {
  109 + MaternalDeliverModel maternalDeliverModel = models.get(0);
  110 + result.setMataFollowId(maternalDeliverModel.getId());
  111 + //result.setParentId(maternalDeliverModel.getParentId());
  112 + }
106 113 }
  114 +
107 115 getParentIdByPid(result, personModel);
108 116 }
109 117 baseResponse.setObject(result);
... ... @@ -119,10 +127,12 @@
119 127 PersonModel personModel = mongoTemplate.findOne(Query.query(Criteria.where("cardNo").is(archiveModel.getCertificateNum())), PersonModel.class);
120 128 if (personModel != null) {
121 129 result.setPid(personModel.getId());
122   - List<MaternalDeliverModel> models = mongoTemplate.find(Query.query(Criteria.where("pid").is(personModel.getId())).with(new Sort(Sort.Direction.DESC, "created")), MaternalDeliverModel.class);
123   - if (CollectionUtils.isNotEmpty(models)) {
124   - MaternalDeliverModel maternalDeliverModel = models.get(0);
125   - result.setMataFollowId(maternalDeliverModel.getId());
  130 + if (personModel.getType() != null && personModel.getType() == 3) {
  131 + List<MaternalDeliverModel> models = mongoTemplate.find(Query.query(Criteria.where("pid").is(personModel.getId())).with(new Sort(Sort.Direction.DESC, "created")), MaternalDeliverModel.class);
  132 + if (CollectionUtils.isNotEmpty(models)) {
  133 + MaternalDeliverModel maternalDeliverModel = models.get(0);
  134 + result.setMataFollowId(maternalDeliverModel.getId());
  135 + }
126 136 }
127 137 getParentIdByPid(result, personModel);
128 138 }