From 001179ca8d3efb3f6dcc3f3946907519d1fb2f86 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 4 Aug 2016 11:38:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E7=AB=A5=E7=AE=A1=E7=90=86=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/BabyBookbuildingController.java | 9 +-- .../operate/web/facade/BabyBookbuildingFacade.java | 83 ++++++++++++++++++++-- 2 files changed, 83 insertions(+), 9 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 693908e..42beef8 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 @@ -106,7 +106,7 @@ public class BabyBookbuildingController extends BaseController { param.setVcCardNo(vcCardNo); param.setHospitalId(hospitalId); LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return babyBookbuildingFacade.queryBabyBuildRecord(param,856); + return babyBookbuildingFacade.queryBabyBuildRecord(param,loginState.getId()); } @@ -201,9 +201,10 @@ public class BabyBookbuildingController extends BaseController { */ @RequestMapping(method = RequestMethod.POST, value = "/sendBabyGuildSms") @ResponseBody - public BaseResponse babyGuildSms(@Valid @RequestBody BabyGuideSmsequest request) { - - return babyBookbuildingFacade.sendBabyGuideSms(request); + @TokenRequired + public BaseResponse babyGuildSms(@Valid @RequestBody BabyGuideSmsequest param,HttpServletRequest request) { + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + return babyBookbuildingFacade.sendBabyGuideSms(param,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 565b6da..048013d 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 @@ -1286,12 +1286,24 @@ public class BabyBookbuildingFacade { } babyQuery.setDiagnose(request.getDiagnose()); - // babyQuery.setNextDateStart(DateUtil.parseYMD(request.getNextDateStart())); -// babyQuery.setNextDateEnd(DateUtil.parseYMD(request.getNextDateEnd())); + //预约时间 + if (StringUtils.isNotEmpty(request.getNextDate())) + { + String nextDateStr = request.getNextDate(); + String[] dates = nextDateStr.split(" - "); + babyQuery.setNextDateStart(DateUtil.parseYMD(dates[0])); + babyQuery.setNextDateEnd(DateUtil.parseYMD(dates[1])); + } + + if (StringUtils.isNotEmpty(request.getBirth())) + { + String birthStr = request.getBirth(); + String[] dates = birthStr.split(" - "); + babyQuery.setBirthStart(DateUtil.parseYMD(dates[0])); + babyQuery.setBirthEnd(DateUtil.parseYMD(dates[1])); + } -// babyQuery.setBirthStart(DateUtil.parseYMD(request.getBirthStart())); -// babyQuery.setBirthEnd(DateUtil.parseYMD(request.getBirthEnd())); if (request.getServiceType() != null && request.getServiceType() != 100) { babyQuery.setServiceType(request.getServiceType()); @@ -1321,7 +1333,68 @@ public class BabyBookbuildingFacade { * @param request * @return */ - public BaseResponse sendBabyGuideSms(BabyGuideSmsequest request) { + public BaseResponse sendBabyGuideSms(BabyGuideSmsequest request,Integer userId) { + String hospitalId = ""; + + + //得到当前登录的医院id + if (userId != null) + { + Users dbuser = usersService.getUsers(userId); + if (dbuser != null) { + hospitalId = String.valueOf(dbuser.getOrgId()); + } + } + + OrganizationQuery orgQuery = new OrganizationQuery(); + orgQuery.setYn(YnEnums.YES.getId()); + orgQuery.setId(Integer.parseInt(hospitalId)); + List list = organizationService.queryOrganization(orgQuery); + boolean isRunning = false; + if (CollectionUtils.isNotEmpty(list)) + { + Organization org = list.get(0); + if (org != null) + { + Integer status = org.getStatus(); + if (status != null && (status == HospitalStatusEnums.SYX.getId() || status == HospitalStatusEnums.ZSYX.getId())) + { + isRunning = true; + } + } + } + if (!isRunning) + { + BaseResponse objectResponse = new BaseResponse(); + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + objectResponse.setErrormsg("暂无发送权限"); + return objectResponse; + } + + SmsConfigQuery configQuery = new SmsConfigQuery(); + configQuery.setYn(YnEnums.YES.getId()); + configQuery.setHospitalId(hospitalId); + //查询出对应医院配置 + List configs = smsConfigService.querySmsConfig(configQuery); + boolean isStart = false; + if (CollectionUtils.isNotEmpty(configs)) + { + String serviceStr = configs.get(0).getSmsService(); + if (StringUtils.isNotEmpty(serviceStr)) + { + isStart = isStartService(SmsServiceEnums.FWKT.getId(), serviceStr); + } + + } + if (!isStart) + { + BaseResponse objectResponse = new BaseResponse(); + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + objectResponse.setErrormsg("暂无发送权限"); + return objectResponse; + } + + MessageListRequest smsList = new MessageListRequest(); List messages = new ArrayList<>(); -- 1.8.3.1