diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java index 9dbe62e..55bac89 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java @@ -17,6 +17,7 @@ public class MaternalDeliverModel { private String id; //产妇id private String parentId; + private String pid; //分娩时间 private String dueDate; //分娩孕周 @@ -124,6 +125,14 @@ public class MaternalDeliverModel { this.modified = modified; } + public String getPid() { + return pid; + } + + public void setPid(String pid) { + this.pid = pid; + } + public static class Baby { private String id; diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/PostReviewModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/PostReviewModel.java index a97aa26..434a0e6 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/PostReviewModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/PostReviewModel.java @@ -17,6 +17,8 @@ public class PostReviewModel extends BaseModel { //产妇id private String parentId; + private String pid; + //分娩天数 private String day; //健康情况 @@ -89,6 +91,14 @@ public class PostReviewModel extends BaseModel { private Date modified; private String hospitalId; + public String getPid() { + return pid; + } + + public void setPid(String pid) { + this.pid = pid; + } + public String getHospitalId() { return hospitalId; } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java index a58b6f4..070fc74 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java @@ -17,16 +17,29 @@ public class MatDeliverQuery extends BaseQuery implements IConvertToNativeQuery private String parentId; private String vcCardNo; private String cardNo; + private String pid; /** * 是否有效 */ private Integer yn; + + public String getPid() { + return pid; + } + + public void setPid(String pid) { + this.pid = pid; + } + @Override public MongoQuery convertToQuery() { MongoCondition condition=MongoCondition.newInstance(); if(null!=id){ condition=condition.and("id",id, MongoOper.IS); } + if(null!=pid){ + condition=condition.and("pid",pid, MongoOper.IS); + } if(null!=vcCardNo){ condition=condition.and("vcCardNo",vcCardNo,MongoOper.IS); } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PostReviewQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PostReviewQuery.java index 2b2611e..3d88c9e 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PostReviewQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PostReviewQuery.java @@ -20,6 +20,15 @@ public class PostReviewQuery extends BaseQuery implements IConvertToNativeQuery private Date start; private Date end; + private String pid; + + public String getPid() { + return pid; + } + + public void setPid(String pid) { + this.pid = pid; + } public Date getEnd() { return end; @@ -70,6 +79,9 @@ public class PostReviewQuery extends BaseQuery implements IConvertToNativeQuery if(null!=id){ mongoCondition= mongoCondition.and("id",id, MongoOper.IS); } + if(null!=pid){ + mongoCondition= mongoCondition.and("pid",pid, MongoOper.IS); + } if(null!=parentId){ mongoCondition= mongoCondition.and("parentId",parentId, MongoOper.IS); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 5a140a4..eee5480 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -71,6 +71,9 @@ public class MatDeliverFacade { patientsQuery.setId(parentId); List patients = patientsService.queryPatient(patientsQuery); Patients patients1 = null; + if (CollectionUtils.isNotEmpty(patients)){ + maternalDeliverModel.setPid(patients.get(0).getPid()); + } if (CollectionUtils.isNotEmpty(list)) { String userName = ""; if (CollectionUtils.isNotEmpty(patients)) { @@ -256,7 +259,7 @@ public class MatDeliverFacade { return new BaseResponse().setErrormsg("没有相关的产妇记录").setErrorcode(ErrorCodeConstants.BUSINESS_ERROR); } MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); - matDeliverQuery.setParentId(patients.getId()); + matDeliverQuery.setPid(patients.getPid()); matDeliverQuery.setYn(YnEnums.YES.getId()); List list = matDeliverService.query(matDeliverQuery); MatDeliverListResult matDeliverListResult = new MatDeliverListResult(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java index e69a347..fd1ad28 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java @@ -53,6 +53,7 @@ public class PostReviewFacade { if(CollectionUtils.isNotEmpty(list1)){ postReviewModel.setHospitalId(list1.get(0)+""); } + postReviewModel.setPid(patientsService.findOnePatientById(postReviewRequest.getParentId()).getPid()); postReviewService.addPostReview(postReviewModel); } else { postReviewService.updatePostById(postReviewRequest.convertToDataModel(), postReviewRequest.getId()); @@ -69,11 +70,11 @@ public class PostReviewFacade { PostReviewListResult postReviewListResult = new PostReviewListResult(); if (null != patientsList) { PostReviewQuery postReviewQuery = new PostReviewQuery(); - postReviewQuery.setParentId(patientsList.getId()); + postReviewQuery.setPid(patientsList.getPid()); postReviewQuery.setYn(YnEnums.YES.getId()); List postReviewModels = postReviewService.findWithList(postReviewQuery); MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); - matDeliverQuery.setParentId(patientsList.getId()); + matDeliverQuery.setPid(patientsList.getPid()); matDeliverQuery.setYn(YnEnums.YES.getId()); List list = matDeliverService.query(matDeliverQuery);