From 487253d4f862a4c33e7b1936e5fd9f61cbe7c1f3 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 18 Aug 2016 15:52:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E7=AB=A5=E7=94=B5=E5=AD=90=E7=97=85?= =?UTF-8?q?=E5=8E=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/data/controller/SmsController.java | 2 +- .../lyms/platform/data/pojo/MessageRequest.java | 17 ++++++++++++++++ .../platform/data/service/impl/SmsServiceImpl.java | 23 +++++++++++----------- .../web/controller/SmsConfigController.java | 2 +- .../operate/web/facade/BabyBookbuildingFacade.java | 9 +++++++++ 5 files changed, 40 insertions(+), 13 deletions(-) diff --git a/platform-data-api/src/main/java/com/lyms/platform/data/controller/SmsController.java b/platform-data-api/src/main/java/com/lyms/platform/data/controller/SmsController.java index 11cecaf..a7ffefa 100644 --- a/platform-data-api/src/main/java/com/lyms/platform/data/controller/SmsController.java +++ b/platform-data-api/src/main/java/com/lyms/platform/data/controller/SmsController.java @@ -22,7 +22,7 @@ public class SmsController extends BaseController { */ @RequestMapping(value = "/template") public void productSms(HttpServletResponse response){ - smsService.getBirthPatients(); + smsService.productTemplateSms(); // MessageListRequest list = new MessageListRequest(); // List messages = new ArrayList<>(); diff --git a/platform-data-api/src/main/java/com/lyms/platform/data/pojo/MessageRequest.java b/platform-data-api/src/main/java/com/lyms/platform/data/pojo/MessageRequest.java index 8e1e981..368cd33 100644 --- a/platform-data-api/src/main/java/com/lyms/platform/data/pojo/MessageRequest.java +++ b/platform-data-api/src/main/java/com/lyms/platform/data/pojo/MessageRequest.java @@ -118,4 +118,21 @@ public class MessageRequest { public void setExt3(String ext3) { this.ext3 = ext3; } + + @Override + public String toString() { + return "MessageRequest{" + + "phone='" + phone + '\'' + + ", content='" + content + '\'' + + ", typeId=" + typeId + + ", subTypeId=" + subTypeId + + ", status=" + status + + ", planTime='" + planTime + '\'' + + ", objType=" + objType + + ", serviceType=" + serviceType + + ", ext1='" + ext1 + '\'' + + ", ext2='" + ext2 + '\'' + + ", ext3='" + ext3 + '\'' + + '}'; + } } diff --git a/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java b/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java index a7d0601..0baa9d5 100644 --- a/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java +++ b/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java @@ -121,7 +121,7 @@ public class SmsServiceImpl implements SmsService{ patientsQuery.setType(1); //末次月经必须大于当前时间减去42周视为为分娩孕妇 - Date lastMensesMax = DateUtil.getNewDate(-42,"周",1); + Date lastMensesMax = DateUtil.getNewDate(-42, "周", 1); patientsQuery.setLastMensesStart(lastMensesMax); //健康指导短信 只能是类型为 增值服务 开通状态 才发送 patientsQuery.setServiceType(ServiceTypeEnums.ADD_SERVICE.getId()); @@ -159,7 +159,7 @@ public class SmsServiceImpl implements SmsService{ continue; } - List guideTimes = JsonUtil.toList(timeStr,String.class); + List guideTimes = JsonUtil.toList(timeStr, String.class); if (guideTimes == null || guideTimes.size() != 2) { continue; @@ -872,7 +872,7 @@ public class SmsServiceImpl implements SmsService{ //更新成产妇状态 分娩时间设置成当前时间 pat.setType(3); - pat.setDueDate(new Date()); + pat.setFmDate(new Date()); pat.setModified(new Date()); yunBookbuildingService.updatePregnant(pat, pat.getId()); } @@ -2031,6 +2031,14 @@ public class SmsServiceImpl implements SmsService{ if (list != null && CollectionUtils.isNotEmpty(list.getMessages())) { //平台ID TODO list.setTypeId(1); + if (list != null && list.getMessages() != null) + { + List msgs = list.getMessages(); + for (MessageRequest msg :msgs) + { + System.out.println("=======" + msg.getContent()); + } + } //SaveMessageService.saveSmsCenter(list); } } @@ -2148,14 +2156,8 @@ public class SmsServiceImpl implements SmsService{ return ""; } - UsersQuery usersQuery = new UsersQuery(); - usersQuery.setYn(YnEnums.YES.getId()); - usersQuery.setId(userId); //通过建档医生查询用户信息 - List users = usersService.queryUsers2(usersQuery); - if (CollectionUtils.isNotEmpty(users)) - { - Users user = users.get(0); + Users user = usersService.getUsers(userId); if (user != null) { //得到医生对应的部门id @@ -2176,7 +2178,6 @@ public class SmsServiceImpl implements SmsService{ } } } - } return ""; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmsConfigController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmsConfigController.java index 2d1705a..60c1152 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmsConfigController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmsConfigController.java @@ -130,7 +130,7 @@ public class SmsConfigController extends BaseController { @RequestParam(required = true) String cityId, @RequestParam(required = true) String areaId, @RequestParam(required = true) String address, - @RequestParam(required = true) String remark, + @RequestParam(required = false) String remark, @RequestParam(required = true) String hid, @RequestParam(required = true) String highConfig, @RequestParam(required = true) Integer status) { 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 a2aeb5b..522832c 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 @@ -104,6 +104,15 @@ public class BabyBookbuildingFacade { checkRecord.put("monthAge", monthAge); checkRecord.put("buildId", babyModel.getId()); checkRecord.put("type","1"); + checkRecord.put("hospitalId",babyModel.getHospitalId()); + //查询建档医院 + Organization org = organizationService.getOrganization(Integer.valueOf(babyModel.getHospitalId())); + if (org != null) { + checkRecord.put("hospitalName", org.getName()); + } else { + checkRecord.put("hospitalName", ""); + } + list.add(checkRecord); } } -- 1.8.3.1