From 6056036badf522952b008bc12c26923701025b8f Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 28 Jul 2016 10:05:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=84=BF=E7=AB=A5=E5=BB=BA?= =?UTF-8?q?=E6=A1=A3=E5=92=8C=E5=AD=95=E5=A6=87=E5=BB=BA=E6=A1=A3=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/BabyBookbuildingController.java | 4 +-- .../web/controller/BabyCheckController.java | 8 +---- .../web/controller/BookbuildingController.java | 3 +- .../operate/web/facade/BabyBookbuildingFacade.java | 16 +++++++++- .../operate/web/facade/BookbuildingFacade.java | 36 ++++++++++++++++------ 5 files changed, 46 insertions(+), 21 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java index 5e71e14..858d8c5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java @@ -62,8 +62,8 @@ public class BabyBookbuildingController extends BaseController { @RequestMapping(value = "/deleteBabyBuildById/{id}", method = RequestMethod.DELETE) @ResponseBody public BaseResponse deleteBabyBuildById(@PathVariable("id") String id) { - babyBookbuildingFacade.deleteBabyBuildById(id); - return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + return babyBookbuildingFacade.deleteBabyBuildById(id); + } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java index 4852963..13a3970 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java @@ -1,18 +1,14 @@ package com.lyms.platform.operate.web.controller; -import com.lyms.platform.biz.service.BabyBookbuildingService; import com.lyms.platform.biz.service.BabyCheckService; import com.lyms.platform.common.base.BaseController; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.StringUtils; -import com.lyms.platform.operate.web.facade.BabyBookbuildingFacade; import com.lyms.platform.operate.web.facade.BabyCheckFacade; -import com.lyms.platform.operate.web.request.BabyBookbuildingAddRequest; import com.lyms.platform.operate.web.request.BabyCheckRequest; -import com.lyms.platform.operate.web.request.BookbuildingQueryRequest; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; @@ -25,9 +21,7 @@ import javax.validation.Valid; */ @Controller public class BabyCheckController extends BaseController{ - - @Autowired - private BabyCheckService babyCheckService; + @Autowired private BabyCheckFacade babyCheckFacade; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BookbuildingController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BookbuildingController.java index 47b46d9..70a0406 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BookbuildingController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BookbuildingController.java @@ -80,8 +80,7 @@ public class BookbuildingController extends BaseController{ @RequestMapping(value = "/deletePregnant/{id}", method = RequestMethod.DELETE) @ResponseBody public BaseResponse deletePregnantById(@PathVariable("id")String id){ - yunBookbuildingService.deletePregnantById(id); - return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + return bookbuildingFacade.deletePregnantById(id); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index 1657c1b..ae9f093 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -61,6 +61,9 @@ public class BabyBookbuildingFacade { @Autowired private SmsTemplateService smsTemplateService; + @Autowired + private BabyCheckService babyCheckService; + public BaseResponse getBabyBase(String babyId){ //查询儿童的基本信息 BabyBasicResult base = new BabyBasicResult(); @@ -423,8 +426,19 @@ public class BabyBookbuildingFacade { * * @param id */ - public void deleteBabyBuildById(String id) { + public BaseResponse deleteBabyBuildById(String id) { + + BabyCheckModelQuery query = new BabyCheckModelQuery(); + query.setYn(YnEnums.YES.getId()); + query.setBuildId(id); + List checkModels = babyCheckService.queryBabyCheckRecord(query); + if (CollectionUtils.isNotEmpty(checkModels)) + { + return new BaseResponse().setErrorcode(ErrorCodeConstants.DONT_DELETE).setErrormsg("存在儿童检查记录，不能删除建档"); + } + babyBookbuildingService.deleteBabyById(id); + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } /** diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index aafd42c..09fede8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -1,11 +1,10 @@ package com.lyms.platform.operate.web.facade; import com.lyms.platform.biz.dal.IPersonDao; -import com.lyms.platform.biz.service.BasicConfigService; -import com.lyms.platform.biz.service.PersonService; -import com.lyms.platform.biz.service.SmsTemplateService; +import com.lyms.platform.biz.service.*; import com.lyms.platform.common.enums.*; import com.lyms.platform.common.result.BaseListResponse; +import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.common.utils.SystemConfig; @@ -17,9 +16,8 @@ import com.lyms.platform.operate.web.result.BookbuildingRecordResult; import com.lyms.platform.operate.web.result.PregnantInfoResult; import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.service.OrganizationService; -import com.lyms.platform.pojo.BasicConfig; -import com.lyms.platform.pojo.PersonModel; -import com.lyms.platform.pojo.SmsTemplateModel; +import com.lyms.platform.pojo.*; +import com.lyms.platform.query.AntExChuQuery; import com.lyms.platform.query.BasicConfigQuery; import com.lyms.platform.query.PatientsQuery; import com.lyms.platform.query.SmsTemplateQuery; @@ -27,12 +25,10 @@ import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import com.lyms.platform.biz.service.YunBookbuildingService; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.operate.web.request.YunBookbuildingAddRequest; -import com.lyms.platform.pojo.Patients; import java.util.*; @@ -58,6 +54,9 @@ public class BookbuildingFacade { @Autowired private SmsTemplateService smsTemplateService; + + @Autowired + private AntenatalExaminationService antenatalExaminationService; /** * 添加孕妇建档 * @param yunRequest @@ -198,7 +197,7 @@ public class BookbuildingFacade { pmodel.setType(1); pmodel.setYn(YnEnums.YES.getId()); pmodel.setModified(new Date()); - personService.updatePerson(pmodel,yunRequest.getPid()); + personService.updatePerson(pmodel, yunRequest.getPid()); } yunBookbuildingService.updatePregnant(patient, id); @@ -574,4 +573,23 @@ public class BookbuildingFacade { objectResponse.setErrormsg("成功"); return objectResponse; } + + /** + * 删除孕妇建档 + * @param id + * @return + */ + public BaseResponse deletePregnantById(String id) { + AntExChuQuery antExChuQuery = new AntExChuQuery(); + antExChuQuery.setParentId(id); + antExChuQuery.setYn(YnEnums.YES.getId()); + //获取初诊记录 + List antExChulist = antenatalExaminationService.queryAntExChu(antExChuQuery); + if (CollectionUtils.isNotEmpty(antExChulist)) + { + return new BaseResponse().setErrorcode(ErrorCodeConstants.DONT_DELETE).setErrormsg("孕妇存在检查记录,不能删除建档"); + } + yunBookbuildingService.deletePregnantById(id); + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + } } \ No newline at end of file -- 1.8.3.1