From 1f1b16825fab7e11535033f9d39e916565c4b655 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Thu, 1 Sep 2016 11:46:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A5=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/query/MatDeliverQuery.java | 33 +++++++++++++++++ .../web/facade/AntenatalExaminationFacade.java | 4 +- .../operate/web/facade/MatDeliverFacade.java | 43 +++++++++++++++++++--- .../operate/web/facade/StopPregnancyFacade.java | 43 +++++++++++++++++++--- 4 files changed, 111 insertions(+), 12 deletions(-) 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 070fc74..3d7d282 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 @@ -6,6 +6,8 @@ import com.lyms.platform.common.dao.operator.MongoCondition; import com.lyms.platform.common.dao.operator.MongoOper; import com.lyms.platform.common.dao.operator.MongoQuery; +import java.util.Date; + /** * * 产妇分娩记录查询 @@ -18,6 +20,34 @@ public class MatDeliverQuery extends BaseQuery implements IConvertToNativeQuery private String vcCardNo; private String cardNo; private String pid; + private Date createdStart; + private Date endStart; + private String dueDate; + + public String getDueDate() { + return dueDate; + } + + public void setDueDate(String dueDate) { + this.dueDate = dueDate; + } + + public Date getCreatedStart() { + return createdStart; + } + + public void setCreatedStart(Date createdStart) { + this.createdStart = createdStart; + } + + public Date getEndStart() { + return endStart; + } + + public void setEndStart(Date endStart) { + this.endStart = endStart; + } + /** * 是否有效 */ @@ -43,6 +73,9 @@ public class MatDeliverQuery extends BaseQuery implements IConvertToNativeQuery if(null!=vcCardNo){ condition=condition.and("vcCardNo",vcCardNo,MongoOper.IS); } + if(null!=dueDate){ + condition=condition.and("dueDate",dueDate,MongoOper.IS); + } if(null!=cardNo) { condition = condition.and("cardNo", cardNo, MongoOper.IS); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index f6fd93e..4c99c88 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -606,7 +606,7 @@ public class AntenatalExaminationFacade { if (null != postReviewModel.getHospitalId()) { organization = organizationService.getOrganization(Integer.valueOf(postReviewModel.getHospitalId())); } - listData.add(new AntData(postReviewModel, null != organization ? organization.getName() : "", patientses.get(0).getFmDate())); + listData.add(new AntData(postReviewModel, null != organization ? organization.getName() : "", patientses.get(patientses.size()-1).getFmDate())); } } sortList.add(listData); @@ -650,7 +650,7 @@ public class AntenatalExaminationFacade { if (null != postReviewModel.getHospitalId()) { organization = organizationService.getOrganization(Integer.valueOf(postReviewModel.getHospitalId())); } - listData.add(new AntData(postReviewModel, null != organization ? organization.getName() : "", patientses.get(0).getFmDate())); + listData.add(new AntData(postReviewModel, null != organization ? organization.getName() : "", patientses.get(patientses.size()-1).getFmDate())); } } } 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 cd15c53..f902cc9 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 @@ -115,6 +115,21 @@ public class MatDeliverFacade { if (CollectionUtils.isNotEmpty(list2)) { return new BaseResponse().setErrormsg("您已分娩").setErrorcode(ErrorCodeConstants.DATA_EXIST); } + Patients patients2= patientsService.findOnePatientById(deliverAddRequest.getParentId()); + matDeliverQuery.setDueDate(deliverAddRequest.getDueDate()); + matDeliverQuery.setParentId(null); + matDeliverQuery.setPid(patients2.getPid()); + list2 = matDeliverService.query(matDeliverQuery); + + StopPregQuery stopPregQuery = new StopPregQuery(); + stopPregQuery.setYn(YnEnums.YES.getId()); + stopPregQuery.setStopDate(deliverAddRequest.getDueDate()); + stopPregQuery.setPid(patients2.getPid()); + List models = stopPregnancyService.queryStopPreg(stopPregQuery); + + if (CollectionUtils.isNotEmpty(list2) || CollectionUtils.isNotEmpty(models)) { + return new BaseResponse().setErrorcode(ErrorCodeConstants.DATA_EXIST).setErrormsg("同一天只能建一次分娩/终止妊娠"); + } MaternalDeliverModel maternalDeliverModel = deliverAddRequest.convertToDataModel(); //获取到小孩信息 List list = deliverAddRequest.getBabies(); @@ -171,13 +186,31 @@ public class MatDeliverFacade { sieveQuery.setParentId(deliverAddRequest.getParentId()); sieveQuery.setYn(YnEnums.YES.getId()); sieveQuery.setHospitalId(hospitalId);*/ - sieveService.deleteSieve(deliverAddRequest.getParentId(),hospitalId,null); + sieveService.deleteSieve(deliverAddRequest.getParentId(), hospitalId, null); maternalDeliverModel.setYn(YnEnums.YES.getId()); matDeliverService.addMatDeliver(maternalDeliverModel); //修改 } else if (StringUtils.isNotEmpty(deliverAddRequest.getId()) && StringUtils.isNotEmpty(deliverAddRequest.getParentId())) { MaternalDeliverModel maternalDeliverModel = deliverAddRequest.convertToDataModel(); + MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); + + Patients patients2= patientsService.findOnePatientById(deliverAddRequest.getParentId()); + matDeliverQuery.setPid(patients2.getPid()); + matDeliverQuery.setYn(YnEnums.YES.getId()); + matDeliverQuery.setDueDate(deliverAddRequest.getDueDate()); + List list2 = matDeliverService.query(matDeliverQuery); + + StopPregQuery stopPregQuery = new StopPregQuery(); + stopPregQuery.setYn(YnEnums.YES.getId()); + stopPregQuery.setStopDate(deliverAddRequest.getDueDate()); + stopPregQuery.setPid(patients2.getPid()); + List models = stopPregnancyService.queryStopPreg(stopPregQuery); + + if (CollectionUtils.isNotEmpty(list2) || CollectionUtils.isNotEmpty(models)) { + return new BaseResponse().setErrorcode(ErrorCodeConstants.DATA_EXIST).setErrormsg("同一天只能建一次分娩/终止妊娠"); + } + //获取到小孩信息 List list = deliverAddRequest.getBabies(); @@ -358,10 +391,10 @@ public class MatDeliverFacade { List babyName = buildBabyName(list); int i = 0; - Map map = deliverAddRequest.getDeliveryMode(); - String fmfs=null; - if(!map.isEmpty()){ - fmfs = map.get("fmfs").toString(); + Map map = deliverAddRequest.getDeliveryMode(); + String fmfs = null; + if (!map.isEmpty()) { + fmfs = map.get("fmfs").toString(); } for (MatDeliverAddRequest.Baby baby : list) { MaternalDeliverModel.Baby baby1 = baby.convertToDataModel(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java index b879071..ee0debb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java @@ -15,10 +15,7 @@ import com.lyms.platform.permission.model.Users; import com.lyms.platform.permission.model.UsersQuery; import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.*; -import com.lyms.platform.query.AntExChuQuery; -import com.lyms.platform.query.PatientsQuery; -import com.lyms.platform.query.PersonModelQuery; -import com.lyms.platform.query.StopPregQuery; +import com.lyms.platform.query.*; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -54,7 +51,8 @@ public class StopPregnancyFacade { private SieveService sieveService; @Autowired private AutoMatchFacade autoMatchFacade; - + @Autowired + private MatDeliverService matDeliverService; /** * 更新终止妊娠 @@ -72,6 +70,24 @@ public class StopPregnancyFacade { patientsQuery.setPid(request.getPid()); patientsQuery.setDueStatus(1); + + MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); + + matDeliverQuery.setPid(request.getPid()); + matDeliverQuery.setYn(YnEnums.YES.getId()); + matDeliverQuery.setDueDate(request.getStopDate()); + List list2 = matDeliverService.query(matDeliverQuery); + + StopPregQuery stopPregQuery = new StopPregQuery(); + stopPregQuery.setYn(YnEnums.YES.getId()); + stopPregQuery.setStopDate(request.getStopDate()); + stopPregQuery.setPid(request.getPid()); + List models = stopPregnancyService.queryStopPreg(stopPregQuery); + + if (CollectionUtils.isNotEmpty(list2) || CollectionUtils.isNotEmpty(models)) { + return new BaseResponse().setErrorcode(ErrorCodeConstants.DATA_EXIST).setErrormsg("同一天只能建一次分娩/终止妊娠"); + } + List patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); if (CollectionUtils.isNotEmpty(patients)) { @@ -118,6 +134,23 @@ public class StopPregnancyFacade { if (CollectionUtils.isNotEmpty(patients)) { + MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); + + matDeliverQuery.setPid(request.getPid()); + matDeliverQuery.setYn(YnEnums.YES.getId()); + matDeliverQuery.setDueDate(request.getStopDate()); + List list2 = matDeliverService.query(matDeliverQuery); + + StopPregQuery stopPregQuery = new StopPregQuery(); + stopPregQuery.setYn(YnEnums.YES.getId()); + stopPregQuery.setStopDate(request.getStopDate()); + stopPregQuery.setPid(request.getPid()); + List models = stopPregnancyService.queryStopPreg(stopPregQuery); + + if (CollectionUtils.isNotEmpty(list2) || CollectionUtils.isNotEmpty(models)) { + return new BaseResponse().setErrorcode(ErrorCodeConstants.DATA_EXIST).setErrormsg("同一天只能建一次分娩/终止妊娠"); + } + for (Patients patient : patients) { if (patient != null) -- 1.8.3.1