From 08eebbacd0a4a585619cf917f6d10a4f877d9817 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Fri, 24 Jun 2016 11:08:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=A6=87=E5=A2=9E=E5=8A=A0=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/biz/service/PatientsService.java | 2 ++ .../operate/web/facade/MatDeliverFacade.java | 39 +++++++++++++++++----- 2 files changed, 33 insertions(+), 8 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java index 0c7fb89..353b64d 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java @@ -44,6 +44,8 @@ public class PatientsService { return iPatientDao.queryPatient(query.addOrder(Sort.Direction.DESC, "id")); } + + public int queryPatientCount(PatientsQuery patientsQuery) { return iPatientDao.queryPatientCount(patientsQuery.convertToQuery()); } 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 86f961d..c5bfc7f 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 @@ -7,6 +7,7 @@ import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; +import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.operate.web.request.MatDeliverAddRequest; import com.lyms.platform.operate.web.request.MatDeliverQueryRequest; import com.lyms.platform.operate.web.result.MatDeliverListResult; @@ -22,6 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import java.util.ArrayList; +import java.util.Date; import java.util.List; /** @@ -49,7 +51,7 @@ public class MatDeliverFacade { */ public BaseResponse addOrUpdateMatDeliver(MatDeliverAddRequest deliverAddRequest) { //增加 - if (StringUtils.isEmpty(deliverAddRequest.getId())&&StringUtils.isNotEmpty(deliverAddRequest.getParentId())) { + if (StringUtils.isEmpty(deliverAddRequest.getId()) && StringUtils.isNotEmpty(deliverAddRequest.getParentId())) { MaternalDeliverModel maternalDeliverModel = deliverAddRequest.convertToDataModel(); //获取到小孩信息 List list = deliverAddRequest.getBabies(); @@ -58,10 +60,16 @@ public class MatDeliverFacade { PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setId(parentId); List patients = patientsService.queryPatient(patientsQuery); + if (CollectionUtils.isNotEmpty(list)) { String userName = ""; if (CollectionUtils.isNotEmpty(patients)) { userName = patients.get(0).getUsername(); + if (null != deliverAddRequest.getDueDate()) { + Date fmDate = DateUtil.parseYMD(deliverAddRequest.getDueDate()); + patients.get(0).setFmDate(fmDate); + patientsService.updatePatient(patients.get(0)); + } } for (MatDeliverAddRequest.Baby baby : list) { @@ -71,30 +79,45 @@ public class MatDeliverFacade { babyIds.add(babyService.addOneBaby(babyModel).getId()); } } + maternalDeliverModel.setBaby(babyIds); matDeliverService.addMatDeliver(maternalDeliverModel); - //修改 - }else if(StringUtils.isNotEmpty(deliverAddRequest.getId())&&StringUtils.isNotEmpty(deliverAddRequest.getParentId())){ + //修改 + } else if (StringUtils.isNotEmpty(deliverAddRequest.getId()) && StringUtils.isNotEmpty(deliverAddRequest.getParentId())) { MaternalDeliverModel maternalDeliverModel = deliverAddRequest.convertToDataModel(); - matDeliverService.updateOne(maternalDeliverModel,maternalDeliverModel.getId()); + matDeliverService.updateOne(maternalDeliverModel, maternalDeliverModel.getId()); //获取到小孩信息 List list = deliverAddRequest.getBabies(); //修改小孩信息 - if(CollectionUtils.isNotEmpty(list)){ + if (CollectionUtils.isNotEmpty(list)) { for (MatDeliverAddRequest.Baby baby : list) { BabyModel babyModel = baby.convertToDataModel(); - if(StringUtils.isNotEmpty(babyModel.getId())){ - babyService.updateOneBaby(babyModel,babyModel.getId()); + if (StringUtils.isNotEmpty(babyModel.getId())) { + babyService.updateOneBaby(babyModel, babyModel.getId()); } } } - }else{ + if (null != deliverAddRequest.getDueDate()) { + Date fmDate = DateUtil.parseYMD(deliverAddRequest.getDueDate()); + PatientsQuery patientsQuery = new PatientsQuery(); + patientsQuery.setId(deliverAddRequest.getParentId()); + List patients = patientsService.queryPatient(patientsQuery); + if (CollectionUtils.isNotEmpty(patients)) { + patients.get(0).setFmDate(fmDate); + patientsService.updatePatient(patients.get(0)); + } + } + } else { return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("parentId 为空,找不到产妇"); } return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } + public void updateFmDate() { + + } + /** * 查询分娩记录信息 * -- 1.8.3.1