diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CommonRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CommonRequest.java index c9bf0e0..d96ff23 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CommonRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CommonRequest.java @@ -23,6 +23,11 @@ public class CommonRequest implements Serializable, Cloneable { */ private String womenId; + /** + * 分娩记录id + */ + private String mataFollowId; + public CommonRequest clone() throws CloneNotSupportedException { CommonRequest clone = (CommonRequest) super.clone(); String cardNo = clone.getCardNo(); @@ -40,6 +45,14 @@ public class CommonRequest implements Serializable, Cloneable { return clone; } + public String getMataFollowId() { + return mataFollowId; + } + + public void setMataFollowId(String mataFollowId) { + this.mataFollowId = mataFollowId; + } + public String getCardNo() { return cardNo; } 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 f609b782..5503d6b 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 @@ -1,8 +1,11 @@ package com.lyms.platform.operate.web.service.impl; +import java.util.List; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Sort; import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.data.mongodb.core.query.Query; @@ -13,6 +16,8 @@ import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.request.CommonRequest; import com.lyms.platform.operate.web.service.ICommonServer; +import com.lyms.platform.operate.web.utils.CollectionUtils; +import com.lyms.platform.pojo.MaternalDeliverModel; import com.lyms.platform.pojo.PersonModel; import com.lyms.platform.pojo.ResidentsArchiveModel; @@ -56,6 +61,11 @@ 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()); + } } baseResponse.setObject(result); return baseResponse; @@ -72,6 +82,11 @@ 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()); + } } baseResponse.setObject(result); return baseResponse; @@ -86,6 +101,11 @@ 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()); + } } } baseResponse.setObject(result);