From ca3bf075e8446167444f7f006232e14903b57142 Mon Sep 17 00:00:00 2001 From: litao Date: Thu, 18 May 2017 10:10:07 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/controller/BabyBuildController.java | 5 +---- .../operate/web/controller/PregnantBuildController.java | 5 +---- .../platform/operate/web/facade/BabyBookbuildingFacade.java | 10 ++++++++++ .../lyms/platform/operate/web/facade/BookbuildingFacade.java | 8 ++++++++ .../com/lyms/platform/operate/web/facade/MatDeliverFacade.java | 3 +-- .../lyms/platform/operate/web/facade/StopPregnancyFacade.java | 2 +- platform-operate-api/src/main/resources/config.properties | 2 +- 7 files changed, 23 insertions(+), 12 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java index 131c9bb..d59ec27 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java @@ -81,10 +81,7 @@ public class BabyBuildController extends BaseController { @TokenRequired @ResponseBody public BaseResponse deleteBabyBuildById(@PathVariable("id") String id, HttpServletRequest request) { - BabyModel babyModel = mongoTemplate.findById(id, BabyModel.class); - if(babyModel != null) { - couponService.del(getUserId(request) +"", autoMatchFacade.getHospitalId(getUserId(request)), babyModel.getPid()); - } + return babyBookbuildingFacade.deleteBabyBuildById(id); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnantBuildController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnantBuildController.java index 7f61599..4bdff8f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnantBuildController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnantBuildController.java @@ -121,10 +121,7 @@ public class PregnantBuildController extends BaseController{ @TokenRequired public BaseResponse deletePregnantById(@PathVariable("id")String id,HttpServletRequest httpServletRequest){ LoginContext loginState = (LoginContext) httpServletRequest.getAttribute("loginContext"); - Patients patients = mongoTemplate.findById(id, Patients.class); - if(patients != null) { - couponService.del(getUserId(httpServletRequest) +"", autoMatchFacade.getHospitalId(getUserId(httpServletRequest)), patients.getPid()); - } + return bookbuildingFacade.deletePregnantById(id,loginState.getId()); } 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 1725b09..c169ca7 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 @@ -30,6 +30,7 @@ import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.data.domain.Sort; +import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.stereotype.Component; @@ -128,6 +129,9 @@ public class BabyBookbuildingFacade { @Autowired private CouponService couponService; + @Autowired + private MongoTemplate mongoTemplate; + public BaseResponse getBabyBase(String babyId) { //查询儿童的基本信息 @@ -1004,6 +1008,12 @@ public class BabyBookbuildingFacade { } babyBookbuildingService.deleteBabyById(id); + + BabyModel babyModel = mongoTemplate.findById(id, BabyModel.class); + if(babyModel != null) { + /** 删除儿童建档 未使用的儿保券作废 */ + couponService.invalid(id, "8"); + } 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 901368b..b4fbedf 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 @@ -20,6 +20,7 @@ import com.lyms.platform.operate.web.utils.MessageCenterService; import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.model.OrganizationQuery; import com.lyms.platform.permission.model.Users; +import com.lyms.platform.permission.service.CouponService; import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.*; @@ -118,6 +119,9 @@ public class BookbuildingFacade { @Autowired private GenSequenceIdService genSequenceIdService; + @Autowired + private CouponService couponService; + /** * 根据患者的建档ID，查询还未使用的免费产检查券 * @@ -1237,6 +1241,10 @@ public class BookbuildingFacade { patientCheckTicket.setStatus(3); patientCheckTicket.setPatientId(id); patientCheckTicketService.findAndModify(patientCheckTicketQuery,patientCheckTicket); + + + /** 删除建档应该是把全部未使用的优惠券状态更新为3【已作废】 */ + couponService.invalid(id, "1,2,3,4,5,6,7,8"); } return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); 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 c0aec4b..328b72f 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 @@ -1,7 +1,6 @@ package com.lyms.platform.operate.web.facade; import com.lyms.platform.biz.RemoteService; -import com.lyms.platform.biz.RemoteUrlEnum; import com.lyms.platform.biz.service.*; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.*; @@ -273,7 +272,7 @@ public class MatDeliverFacade { couponService.use(hospitalId, deliverAddRequest.getCouponCode(), userId, maternalDeliverModel.getId()); } - /** 儿童建档对应孕妇分娩 【未使用的产检券】要自动作废 */ + /** 分娩后 作废未使用的产检券 */ couponService.invalid(maternalDeliverModel.getId(), "2"); //作废产检劵 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 89db42a..2104ad0 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 @@ -111,7 +111,7 @@ public class StopPregnancyFacade { stopPregnancyService.updateStopPreg(model, request.getId()); /** 终止妊娠后 【未使用的产检券和分娩券】要自动作废 */ - couponService.invalid(request.getPid(), "2,4"); + couponService.invalid(model.getPid(), "2,4"); BaseResponse objectResponse = new BaseResponse(); diff --git a/platform-operate-api/src/main/resources/config.properties b/platform-operate-api/src/main/resources/config.properties index 3f3ab42..885a2b5 100644 --- a/platform-operate-api/src/main/resources/config.properties +++ b/platform-operate-api/src/main/resources/config.properties @@ -73,7 +73,7 @@ jdbc.6.username=LYMS_ODS jdbc.6.password=Welcome1 # 远程调用类型 1=本地 2=测试环境 3=线上环境 -remote.url.type=1 +remote.url.type=2 platform.operate.api.1.url=http://localhost:9091/ platform.operate.api.2.url=https://dev-rp.healthbaby.com.cn/ platform.operate.api.3.url=https://dev-rp.healthbaby.com.cn/ -- 1.8.3.1