From a38c34bb9b585ecefead2f630e30af1dcdfe22c4 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Wed, 29 Jun 2016 15:45:00 +0800 Subject: [PATCH] 1 --- .../lyms/platform/biz/service/MatDeliverService.java | 8 +++++++- .../com/lyms/platform/pojo/MaternalDeliverModel.java | 20 ++++++++++++++++++++ .../operate/web/facade/PostReviewFacade.java | 20 +++++++++++++++++++- .../operate/web/result/PostReviewListResult.java | 13 ++++++++++++- 4 files changed, 58 insertions(+), 3 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/MatDeliverService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/MatDeliverService.java index 44dcf42..deda234 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/MatDeliverService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/MatDeliverService.java @@ -1,11 +1,14 @@ package com.lyms.platform.biz.service; import com.lyms.platform.biz.dal.IMatDeliverDao; +import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.pojo.MaternalDeliverModel; import com.lyms.platform.query.MatDeliverQuery; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Sort; import org.springframework.stereotype.Service; +import java.util.Date; import java.util.List; /** @@ -27,11 +30,14 @@ public class MatDeliverService { * @return */ public MaternalDeliverModel addMatDeliver(MaternalDeliverModel deliverModel) { + deliverModel.setYn(YnEnums.YES.getId()); + deliverModel.setCreated(new Date()); + deliverModel.setModified(new Date()); return iMatDeliverDao.addMatDeliver(deliverModel); } public List query(MatDeliverQuery deliverQuery){ - return iMatDeliverDao.queryWithList(deliverQuery.convertToQuery()); + return iMatDeliverDao.queryWithList(deliverQuery.convertToQuery().addOrder(Sort.Direction.DESC,"created")); } public void deleteOne(String id){ iMatDeliverDao.deleteOne(id); 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 3595714..c7206eb 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 @@ -2,6 +2,7 @@ package com.lyms.platform.pojo; import org.springframework.data.mongodb.core.mapping.Document; +import java.util.Date; import java.util.List; /** @@ -94,6 +95,25 @@ public class MaternalDeliverModel { //接生医生 private String deliverDoctor; private Integer yn; + private Date created; + private Date modified; + + public Date getCreated() { + return created; + } + + public void setCreated(Date created) { + this.created = created; + } + + public Date getModified() { + return modified; + } + + public void setModified(Date modified) { + this.modified = modified; + } + public static class ExtPlacenta{ //胎盘娩出方式 private String tpmcType; 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 c0a37f0..05b4b45 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 @@ -1,5 +1,6 @@ package com.lyms.platform.operate.web.facade; +import com.lyms.platform.biz.service.MatDeliverService; import com.lyms.platform.biz.service.PatientsService; import com.lyms.platform.biz.service.PostReviewService; import com.lyms.platform.common.constants.ErrorCodeConstants; @@ -11,10 +12,13 @@ import com.lyms.platform.operate.web.request.PostReviewQueryRequest; import com.lyms.platform.operate.web.request.PostReviewRequest; import com.lyms.platform.operate.web.result.PostReviewListResult; import com.lyms.platform.operate.web.result.PostReviewResult; +import com.lyms.platform.pojo.MaternalDeliverModel; import com.lyms.platform.pojo.Patients; import com.lyms.platform.pojo.PostReviewModel; +import com.lyms.platform.query.MatDeliverQuery; import com.lyms.platform.query.PatientsQuery; import com.lyms.platform.query.PostReviewQuery; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -33,6 +37,8 @@ public class PostReviewFacade { private PostReviewService postReviewService; @Autowired private PatientsService patientsService; + @Autowired + private MatDeliverService matDeliverService; public BaseResponse addPostReview(PostReviewRequest postReviewRequest) { if (StringUtils.isEmpty(postReviewRequest.getId())) { @@ -55,7 +61,17 @@ public class PostReviewFacade { postReviewQuery.setParentId(patientsList.getId()); postReviewQuery.setYn(YnEnums.YES.getId()); List postReviewModels = postReviewService.findWithList(postReviewQuery); - postReviewListResult.convertToResult(postReviewModels, patientsList); + MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); + matDeliverQuery.setParentId(patientsList.getId()); + matDeliverQuery.setYn(YnEnums.YES.getId()); + + List list = matDeliverService.query(matDeliverQuery); + String dueDate=""; + if(CollectionUtils.isNotEmpty(list)){ + dueDate= list.get(0).getDueDate(); + + } + postReviewListResult.convertToResult(postReviewModels, patientsList,dueDate); } return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(postReviewListResult); } @@ -68,6 +84,8 @@ public class PostReviewFacade { */ public BaseResponse findById(String id) { PostReviewModel postReviewModel = postReviewService.findOneById(id); + + Assert.notNull(postReviewModel, "没有对应的数据."); PostReviewResult postReviewResult = new PostReviewResult(); postReviewResult.convertToResult(postReviewModel); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PostReviewListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PostReviewListResult.java index b0759f0..dafd6ae 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PostReviewListResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PostReviewListResult.java @@ -37,9 +37,19 @@ public class PostReviewListResult { private String remarks; //末次月经 private String lastMenses; + //分娩时间 + private String dueDate; // private List data = new ArrayList(); + public String getDueDate() { + return dueDate; + } + + public void setDueDate(String dueDate) { + this.dueDate = dueDate; + } + public List getRiskFactor() { return riskFactor; } @@ -128,7 +138,8 @@ public class PostReviewListResult { this.yChanQi = yChanQi; } - public PostReviewListResult convertToResult(List destModel,Patients patients) { + public PostReviewListResult convertToResult(List destModel,Patients patients,String dueDate) { + setDueDate(dueDate); setId(patients.getId()); try { if(null!=patients.getBirth()){ -- 1.8.3.1