From dc99e62a21d725b683657f97147fca1429a1b9b1 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Mon, 21 Aug 2017 11:26:14 +0800 Subject: [PATCH] update code --- .../platform/common/enums/WxTempleteIdEnums.java | 5 +- .../msg/controller/MsgGenerateController.java | 2 +- .../platform/msg/remote/AmsMessageService.java | 4 +- .../src/main/resources/database.properties | 13 + .../operate/web/facade/BabyBookbuildingFacade.java | 326 +++++++++++---------- .../platform/operate/web/facade/PatientFacade.java | 65 ++-- .../operate/web/facade/ResidentsArchiveFacade.java | 50 ++-- 7 files changed, 263 insertions(+), 202 deletions(-) diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/WxTempleteIdEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/WxTempleteIdEnums.java index a6b3e73..c36c50b 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/WxTempleteIdEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/WxTempleteIdEnums.java @@ -19,7 +19,10 @@ public enum WxTempleteIdEnums { YUN_YI_BAN_ZHI_DAO("98i1P6zh3slBxEKLftweaESnnem4w6SDmzvJIBWRXNE","孕妇一般指导"),//孕妇 CHAN_YI_BAN_ZHI_DAO("H2_ucLqVEbsZAv-EZcmUDpD1Zul5NGqMoJktHT0u4gw","产妇一般指导"),//产妇 - BABY_YI_BAN_ZHI_DAO("dqvyESU8UXx1V3cIMQDqj4PLxI6T9-sgihQcs3ZGL9E","儿童一般指导");//儿童 + BABY_YI_BAN_ZHI_DAO("dqvyESU8UXx1V3cIMQDqj4PLxI6T9-sgihQcs3ZGL9E","儿童一般指导"),//儿童 + + YI_SHENG_ZHI_DAO("OggqiSHitLkCgSLCaCH72reCZzaw5NyG8iO56InQiQg","医生指导"),//指导 + WEI_JI_ZHI_DAO("fNkkLSp_gS-YWvzji6gwgdTddl4XBlk8SNP7FRksrfk","危急值提醒");//危急值提醒 diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/controller/MsgGenerateController.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/controller/MsgGenerateController.java index 58c0171..65db1c6 100644 --- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/controller/MsgGenerateController.java +++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/controller/MsgGenerateController.java @@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.ResponseBody; public class MsgGenerateController extends BaseController { // private static final Logger logger = LoggerFactory.getLogger(MsgGenerateController.class); -// +//// // @Autowired // private IMsgGenerateService msgGenerateService; // diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/remote/AmsMessageService.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/remote/AmsMessageService.java index a9b613e..d14e9d0 100644 --- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/remote/AmsMessageService.java +++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/remote/AmsMessageService.java @@ -154,8 +154,8 @@ public class AmsMessageService { } public static void main(String[] args) { - Map> list = getMessageTemplateMap("216", - AmsServiceTypeEnum.YUN_GUIDE); + Map> list = getMessageTemplateMap("206", + AmsServiceTypeEnum.CHILD_GUIDE); List msgs = list.get("年龄≥35岁"); System.out.println(msgs); } diff --git a/platform-msg-generate/src/main/resources/database.properties b/platform-msg-generate/src/main/resources/database.properties index 7fef9c4..d5a78f5 100644 --- a/platform-msg-generate/src/main/resources/database.properties +++ b/platform-msg-generate/src/main/resources/database.properties @@ -1,4 +1,17 @@ maindata.driver=com.mysql.jdbc.Driver +#maindata.jdbcurl=jdbc:mysql://119.90.43.68:3307/platform?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8 +#maindata.username=platform +#maindata.password=platform123 +# +# +#mongo.db.host=119.90.43.68 +#mongo.db.port=27019 +#mongo.db.dbname=platform +#mongo.db.username=platform +#mongo.db.password=platform123 + + + maindata.jdbcurl=${mysql.jdbcurl} maindata.username=${mysql.db.name} maindata.password=${mysql.db.password} 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 f1e6063..5c422ac 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 @@ -832,146 +832,146 @@ public class BabyBookbuildingFacade { /** * 创建建档短信 */ - public void createBuildSms(BabyModel babyModel) { - - //判断医院是否启动和对应的服务项是否启用 - SmsConfigModel configModel = new SmsConfigModel(); - BaseResponse response = smsConfigFacade.hospitalIsStart(babyModel.getHospitalId(), configModel, SmsServiceEnums.FWKT.getId()); - if (response != null) { - return; - } - - ExceptionUtils.catchException("儿童建档1---------->" + babyModel.getMphone() + ";name=" + babyModel.getName()); - - SmsTemplateQuery query = new SmsTemplateQuery(); - query.setYn(YnEnums.YES.getId()); - query.setStatus(1); - query.setHospitalId(babyModel.getHospitalId()); - query.setServiceObj(ServiceObjEnums.BABYOBJ.getId()); - query.setSpecialDateType(SpecialDateEnums.JD.getId()); - - Integer serviceType = babyModel.getServiceType(); - Integer serviceStatus = babyModel.getServiceStatus(); - List sendList = new ArrayList<>(); - List temps = smsTemplateService.querySmsTemplates(query); - if (CollectionUtils.isNotEmpty(temps)) { - - for (SmsTemplateModel temp : temps) { - if (temp.getServiceType() == serviceType && temp.getServiceStatus() == serviceStatus) { - sendList.add(temp); - break; - } - } - - for (SmsTemplateModel temp : temps) { - if (temp.getServiceStatus() == ServiceStatusEnums.STANDARD_ALL.getId()) { - if (serviceStatus == ServiceStatusEnums.STANDARD_OPEN.getId() || serviceStatus == ServiceStatusEnums.NO_OPEN.getId() || serviceStatus == ServiceStatusEnums.STANDARD_OVERDUE.getId()) { - sendList.add(temp); - break; - } - } - } - - for (SmsTemplateModel temp : temps) { - if (temp.getServiceStatus() == ServiceStatusEnums.ADD_ALL.getId()) { - if (serviceStatus == ServiceStatusEnums.ADD_OPEN.getId() || serviceStatus == ServiceStatusEnums.UNSUBSCRIBE.getId() - || serviceStatus == ServiceStatusEnums.ADD_OVERDUE.getId() || serviceStatus == ServiceStatusEnums.SUSPEND.getId()) { - sendList.add(temp); - break; - } - } - } - - - for (SmsTemplateModel temp : temps) { - if (temp.getServiceStatus() == ServiceStatusEnums.ALL_OPEN.getId()) { - if (serviceStatus == ServiceStatusEnums.STANDARD_OPEN.getId() || serviceStatus == ServiceStatusEnums.ADD_OPEN.getId()) { - sendList.add(temp); - break; - } - } - } - - - for (SmsTemplateModel temp : temps) { - if (temp.getServiceStatus() == ServiceStatusEnums.ALL_NO_OPEN.getId()) { - if (serviceStatus == ServiceStatusEnums.NO_OPEN.getId() || serviceStatus == ServiceStatusEnums.UNSUBSCRIBE.getId()) { - sendList.add(temp); - break; - } - } - } - - - for (SmsTemplateModel temp : temps) { - if (temp.getServiceStatus() == ServiceStatusEnums.ALL_OVERDUE.getId()) { - if (serviceStatus == ServiceStatusEnums.STANDARD_OVERDUE.getId() || serviceStatus == ServiceStatusEnums.ADD_OVERDUE.getId()) { - sendList.add(temp); - break; - } - } - } - - - for (SmsTemplateModel temp : temps) { - if (temp.getServiceType() == ServiceTypeEnums.ALL_SERVICE.getId() && temp.getServiceStatus() == ServiceStatusEnums.ALL.getId()) { - sendList.add(temp); - break; - } - } - - if (CollectionUtils.isNotEmpty(sendList)) { - - - //短信前缀 - String messagePrefix = smsConfigFacade.getMsgPrefix(configModel, babyModel.getBuildDoctor(),ServiceObjEnums.YUNOBJ.getId()); - for (SmsTemplateModel templateModel : sendList) { - if (templateModel != null && templateModel.getStatus() == 1) { - ExceptionUtils.catchException("儿童建档2---------->"+babyModel.getMphone()+";name="+babyModel.getName()); - MessageListRequest smsList = new MessageListRequest(); - List messages = new ArrayList<>(); - MessageRequest mr = new MessageRequest(); - String content = "【" + messagePrefix + "】" + templateModel.getContent(); - mr.setContent(StringUtils.replaceBaby(babyModel.getName(), babyModel.getBirth(), content)); - mr.setObjType(ServiceObjEnums.BABYOBJ.getId()); - mr.setPhone(babyModel.getMphone()); - //短信商 - mr.setServiceType(SmsProviderEnums.YM.getId()); - mr.setTypeId(ProjectTypeEnums.YNXT.getId()); - mr.setPlanTime(DateUtil.getyyyy_MM_dd_hms(new Date())); - mr.setSubTypeId(SmsServiceEnums.FWKT.getId()); - mr.setStatus(SmsStatusEnums.WFS.getId()); - mr.setTimeType(SmsTimeTypeEnums.ONTIME.getId()); - - mr.setExt1(babyModel.getHospitalId()); - mr.setExt2(templateModel.getId()); - mr.setExt3(babyModel.getId()); - messages.add(mr); - - if (CollectionUtils.isNotEmpty(messages)) { - smsList.setTypeId(ProjectTypeEnums.YNXT.getId()); - smsList.setMessages(messages); - if ("4".equals(HIS_VERSION)) - { - //秦皇岛建档 - if (syncDataService.savePostMsg(JsonUtil.obj2JsonString(smsList), messages.get(0).getExt1())) { - ExceptionUtils.catchException("儿童建档3---------->"+babyModel.getMphone()+";name="+babyModel.getName()); - } - } - else - { - //线上 - MessageCenterService.saveSmsCenter(smsList); - ExceptionUtils.catchException("儿童建档3---------->" + babyModel.getMphone() + ";name=" + babyModel.getName()); - } - } - } - } - } - - - } - } +// public void createBuildSms(BabyModel babyModel) { +// +// //判断医院是否启动和对应的服务项是否启用 +// SmsConfigModel configModel = new SmsConfigModel(); +// BaseResponse response = smsConfigFacade.hospitalIsStart(babyModel.getHospitalId(), configModel, SmsServiceEnums.FWKT.getId()); +// if (response != null) { +// return; +// } +// +// ExceptionUtils.catchException("儿童建档1---------->" + babyModel.getMphone() + ";name=" + babyModel.getName()); +// +// SmsTemplateQuery query = new SmsTemplateQuery(); +// query.setYn(YnEnums.YES.getId()); +// query.setStatus(1); +// query.setHospitalId(babyModel.getHospitalId()); +// query.setServiceObj(ServiceObjEnums.BABYOBJ.getId()); +// query.setSpecialDateType(SpecialDateEnums.JD.getId()); +// +// Integer serviceType = babyModel.getServiceType(); +// Integer serviceStatus = babyModel.getServiceStatus(); +// List sendList = new ArrayList<>(); +// List temps = smsTemplateService.querySmsTemplates(query); +// if (CollectionUtils.isNotEmpty(temps)) { +// +// for (SmsTemplateModel temp : temps) { +// if (temp.getServiceType() == serviceType && temp.getServiceStatus() == serviceStatus) { +// sendList.add(temp); +// break; +// } +// } +// +// for (SmsTemplateModel temp : temps) { +// if (temp.getServiceStatus() == ServiceStatusEnums.STANDARD_ALL.getId()) { +// if (serviceStatus == ServiceStatusEnums.STANDARD_OPEN.getId() || serviceStatus == ServiceStatusEnums.NO_OPEN.getId() || serviceStatus == ServiceStatusEnums.STANDARD_OVERDUE.getId()) { +// sendList.add(temp); +// break; +// } +// } +// } +// +// for (SmsTemplateModel temp : temps) { +// if (temp.getServiceStatus() == ServiceStatusEnums.ADD_ALL.getId()) { +// if (serviceStatus == ServiceStatusEnums.ADD_OPEN.getId() || serviceStatus == ServiceStatusEnums.UNSUBSCRIBE.getId() +// || serviceStatus == ServiceStatusEnums.ADD_OVERDUE.getId() || serviceStatus == ServiceStatusEnums.SUSPEND.getId()) { +// sendList.add(temp); +// break; +// } +// } +// } +// +// +// for (SmsTemplateModel temp : temps) { +// if (temp.getServiceStatus() == ServiceStatusEnums.ALL_OPEN.getId()) { +// if (serviceStatus == ServiceStatusEnums.STANDARD_OPEN.getId() || serviceStatus == ServiceStatusEnums.ADD_OPEN.getId()) { +// sendList.add(temp); +// break; +// } +// } +// } +// +// +// for (SmsTemplateModel temp : temps) { +// if (temp.getServiceStatus() == ServiceStatusEnums.ALL_NO_OPEN.getId()) { +// if (serviceStatus == ServiceStatusEnums.NO_OPEN.getId() || serviceStatus == ServiceStatusEnums.UNSUBSCRIBE.getId()) { +// sendList.add(temp); +// break; +// } +// } +// } +// +// +// for (SmsTemplateModel temp : temps) { +// if (temp.getServiceStatus() == ServiceStatusEnums.ALL_OVERDUE.getId()) { +// if (serviceStatus == ServiceStatusEnums.STANDARD_OVERDUE.getId() || serviceStatus == ServiceStatusEnums.ADD_OVERDUE.getId()) { +// sendList.add(temp); +// break; +// } +// } +// } +// +// +// for (SmsTemplateModel temp : temps) { +// if (temp.getServiceType() == ServiceTypeEnums.ALL_SERVICE.getId() && temp.getServiceStatus() == ServiceStatusEnums.ALL.getId()) { +// sendList.add(temp); +// break; +// } +// } +// +// if (CollectionUtils.isNotEmpty(sendList)) { +// +// +// //短信前缀 +// String messagePrefix = smsConfigFacade.getSmsPrefix(configModel, babyModel.getBuildDoctor()); +// for (SmsTemplateModel templateModel : sendList) { +// if (templateModel != null && templateModel.getStatus() == 1) { +// ExceptionUtils.catchException("儿童建档2---------->"+babyModel.getMphone()+";name="+babyModel.getName()); +// MessageListRequest smsList = new MessageListRequest(); +// List messages = new ArrayList<>(); +// MessageRequest mr = new MessageRequest(); +// String content = "【" + messagePrefix + "】" + templateModel.getContent(); +// mr.setContent(StringUtils.replaceBaby(babyModel.getName(), babyModel.getBirth(), content)); +// mr.setObjType(ServiceObjEnums.BABYOBJ.getId()); +// mr.setPhone(babyModel.getMphone()); +// //短信商 +// mr.setServiceType(SmsProviderEnums.YM.getId()); +// mr.setTypeId(ProjectTypeEnums.YNXT.getId()); +// mr.setPlanTime(DateUtil.getyyyy_MM_dd_hms(new Date())); +// mr.setSubTypeId(SmsServiceEnums.FWKT.getId()); +// mr.setStatus(SmsStatusEnums.WFS.getId()); +// mr.setTimeType(SmsTimeTypeEnums.ONTIME.getId()); +// +// mr.setExt1(babyModel.getHospitalId()); +// mr.setExt2(templateModel.getId()); +// mr.setExt3(babyModel.getId()); +// messages.add(mr); +// +// if (CollectionUtils.isNotEmpty(messages)) { +// smsList.setTypeId(ProjectTypeEnums.YNXT.getId()); +// smsList.setMessages(messages); +// if ("4".equals(HIS_VERSION)) +// { +// //秦皇岛建档 +// if (syncDataService.savePostMsg(JsonUtil.obj2JsonString(smsList), messages.get(0).getExt1())) { +// ExceptionUtils.catchException("儿童建档3---------->"+babyModel.getMphone()+";name="+babyModel.getName()); +// } +// } +// else +// { +// //线上 +// MessageCenterService.saveSmsCenter(smsList); +// ExceptionUtils.catchException("儿童建档3---------->" + babyModel.getMphone() + ";name=" + babyModel.getName()); +// } +// } +// } +// } +// } +// +// +// } +// } /** @@ -2241,10 +2241,10 @@ public class BabyBookbuildingFacade { public BaseResponse sendBabyGuideSms(BabyGuideSmsequest request, Integer userId) { String hospitalId = ""; - + Users dbuser = null; //得到当前登录的医院id if (userId != null) { - Users dbuser = usersService.getUsers(userId); + dbuser = usersService.getUsers(userId); if (dbuser != null) { hospitalId = String.valueOf(dbuser.getOrgId()); } @@ -2258,8 +2258,6 @@ public class BabyBookbuildingFacade { } - MessageListRequest smsList = new MessageListRequest(); - List messages = new ArrayList<>(); List sendModels = new ArrayList<>(); if (CollectionUtils.isNotEmpty(request.getIds())) { @@ -2282,26 +2280,43 @@ public class BabyBookbuildingFacade { sendModels = getBabayListByCondition(request.getRequest(), false, babyQuery); } + com.lyms.platform.beans.MessageListRequest smsList = new com.lyms.platform.beans.MessageListRequest(); + List messages = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(sendModels)) { for (BabyModel model : sendModels) { - if (model != null && StringUtils.isNotEmpty(model.getMphone())) { + if (model != null) { //短信前缀 - String messagePrefix = smsConfigFacade.getSmsPrefix(configModel, model.getBuildDoctor()); - MessageRequest mr = new MessageRequest(); - mr.setContent("【" + messagePrefix + "】" + request.getSmsContent()); + String messagePrefix = smsConfigFacade.getMsgPrefix(configModel, model.getBuildDoctor(),ServiceObjEnums.BABYOBJ.getId()); + com.lyms.platform.beans.MessageRequest mr = new com.lyms.platform.beans.MessageRequest(); + String content = "【" + messagePrefix + "】" + request.getSmsContent(); + + mr.setFirst(content); mr.setObjType(ServiceObjEnums.BABYOBJ.getId()); mr.setPhone(model.getMphone()); - //短信商 - mr.setServiceType(SmsProviderEnums.YM.getId()); mr.setTypeId(ProjectTypeEnums.YNXT.getId()); mr.setPlanTime(DateUtil.getyyyy_MM_dd_hms(new Date())); mr.setSubTypeId(SmsServiceEnums.YSGXHZD.getId()); + mr.setStatus(SmsStatusEnums.WFS.getId()); mr.setTimeType(SmsTimeTypeEnums.ONTIME.getId()); - mr.setStatus(SmsStatusEnums.WFS.getId()); + mr.setHospitalId(model.getHospitalId()); + mr.setPatientId(model.getId()); + + String doctorName = ""; + if (dbuser != null) + { + doctorName = dbuser.getName(); + } + + mr.setKeyword1(doctorName); + mr.setKeyword2(DateUtil.getyyyy_MM_dd(new Date())); + mr.setRemark(""); + mr.setCreated(DateUtil.getyyyy_MM_dd_hms(new Date())); + mr.setWxTempId(WxTempleteIdEnums.YI_SHENG_ZHI_DAO.getId()); - mr.setExt1(String.valueOf(model.getHospitalId())); messages.add(mr); + } } } @@ -2310,19 +2325,16 @@ public class BabyBookbuildingFacade { smsList.setTypeId(ProjectTypeEnums.YNXT.getId()); smsList.setMessages(messages); //调用发送接口 -// if (!syncDataService.savePostMsg(JsonUtil.obj2JsonString(smsList), messages.get(0).getExt1())) { -// MessageCenterService.saveSmsCenter(smsList); -// } if ("4".equals(HIS_VERSION)) { //秦皇岛 //保存到同步表中 - syncDataService.savePostMsg(JsonUtil.obj2JsonString(smsList), messages.get(0).getExt1()); + syncDataService.savePostMsg(JsonUtil.obj2JsonString(smsList), messages.get(0).getHospitalId()); } else { //保存到短信中心 线上 - MessageCenterService.saveSmsCenter(smsList); + MessageCenterService.saveMsgCenter(smsList); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index 503573e..1a7703f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -616,17 +616,26 @@ public class PatientFacade { public BaseResponse patientGuildSms(PatientGuideSmsRequest patientGuideSmsRequest, Integer userId) { - String hospital = autoMatchFacade.getHospitalId(userId); + String hospitalId = ""; + + Users dbuser = null; + //得到当前登录的医院id + if (userId != null) { + dbuser = usersService.getUsers(userId); + if (dbuser != null) { + hospitalId = String.valueOf(dbuser.getOrgId()); + } + } //判断医院是否启动和对应的服务项是否启用 SmsConfigModel configModel = new SmsConfigModel(); - BaseResponse response = smsConfigFacade.hospitalIsStart(hospital, configModel, SmsServiceEnums.YSGXHZD.getId()); + BaseResponse response = smsConfigFacade.hospitalIsStart(hospitalId, configModel, SmsServiceEnums.YSGXHZD.getId()); if (response != null) { return response; } - MessageListRequest smsList = new MessageListRequest(); - List messages = new ArrayList<>(); + com.lyms.platform.beans.MessageListRequest smsList = new com.lyms.platform.beans.MessageListRequest(); + List messages = new ArrayList<>(); List sendModels = new ArrayList<>(); if (CollectionUtils.isNotEmpty(patientGuideSmsRequest.getIds())) { for (String patientId : patientGuideSmsRequest.getIds()) { @@ -636,26 +645,41 @@ public class PatientFacade { } } if (CollectionUtils.isNotEmpty(sendModels)) { - for (Patients model : sendModels) { - if (model != null && com.lyms.platform.common.utils.StringUtils.isNotEmpty(model.getPhone())) { - MessageRequest mr = new MessageRequest(); + for (Patients patient : sendModels) { + if (patient != null) { //短信前缀 - String messagePrefix = smsConfigFacade.getSmsPrefix(configModel, model.getBookbuildingDoctor()); - mr.setContent("【" + messagePrefix + "】" + patientGuideSmsRequest.getSmsContent()); - mr.setObjType(Integer.valueOf(patientGuideSmsRequest.getType())); - mr.setPhone(model.getPhone()); - //短信商 - mr.setServiceType(SmsProviderEnums.YM.getId()); + String messagePrefix = smsConfigFacade.getMsgPrefix(configModel, patient.getBookbuildingDoctor(), ServiceObjEnums.YUNOBJ.getId()); + + com.lyms.platform.beans.MessageRequest mr = new com.lyms.platform.beans.MessageRequest(); + + String content = patientGuideSmsRequest.getSmsContent(); + + mr.setFirst("【" + messagePrefix + "】" + content); + mr.setObjType(ServiceObjEnums.YUNOBJ.getId()); + mr.setPhone(patient.getPhone()); + mr.setTimeType(SmsTimeTypeEnums.ONTIME.getId()); mr.setTypeId(ProjectTypeEnums.YNXT.getId()); mr.setPlanTime(DateUtil.getyyyy_MM_dd_hms(new Date())); mr.setSubTypeId(SmsServiceEnums.YSGXHZD.getId()); - mr.setTimeType(SmsTimeTypeEnums.ONTIME.getId()); - mr.setStatus(SmsStatusEnums.WFS.getId()); + mr.setHospitalId(patient.getHospitalId()); + mr.setPatientId(patient.getId()); + + String doctorName = ""; + if (dbuser != null) + { + doctorName = dbuser.getName(); + } + + mr.setKeyword1(doctorName); + mr.setKeyword2(DateUtil.getyyyy_MM_dd(new Date())); + mr.setRemark(""); + mr.setCreated(DateUtil.getyyyy_MM_dd_hms(new Date())); - mr.setExt1(String.valueOf(model.getHospitalId())); + mr.setWxTempId(WxTempleteIdEnums.YI_SHENG_ZHI_DAO.getId()); messages.add(mr); + } } } @@ -663,21 +687,18 @@ public class PatientFacade { if (CollectionUtils.isNotEmpty(messages)) { smsList.setTypeId(ProjectTypeEnums.YNXT.getId()); smsList.setMessages(messages); + smsList.setMessages(messages); //调用发送接口 -// if (!syncDataService.savePostMsg(JsonUtil.obj2JsonString(smsList), messages.get(0).getExt1())) { -// MessageCenterService.saveSmsCenter(smsList); -// } - if ("4".equals(HIS_VERSION)) { //秦皇岛 //保存到同步表中 - syncDataService.savePostMsg(JsonUtil.obj2JsonString(smsList), messages.get(0).getExt1()); + syncDataService.savePostMsg(JsonUtil.obj2JsonString(smsList), messages.get(0).getHospitalId()); } else { //保存到短信中心 线上 - MessageCenterService.saveSmsCenter(smsList); + MessageCenterService.saveMsgCenter(smsList); } } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java index 259564d..9bb874e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java @@ -736,10 +736,12 @@ public class ResidentsArchiveFacade{ * @return */ public BaseResponse womenGuildSms(WomenGuideSmsRequest request,Integer userId){ + String hospitalId = ""; + Users dbuser = null; //得到当前登录的医院id if (userId != null) { - Users dbuser = usersService.getUsers(userId); + dbuser = usersService.getUsers(userId); if (dbuser != null) { hospitalId = String.valueOf(dbuser.getOrgId()); } @@ -756,8 +758,8 @@ public class ResidentsArchiveFacade{ return response; } - MessageListRequest smsList = new MessageListRequest(); - List messages = new ArrayList<>(); + com.lyms.platform.beans.MessageListRequest smsList = new com.lyms.platform.beans.MessageListRequest(); + List messages = new ArrayList<>(); List sendModels = new ArrayList<>(); if (CollectionUtils.isNotEmpty(request.getIds())) { @@ -776,22 +778,35 @@ public class ResidentsArchiveFacade{ if (CollectionUtils.isNotEmpty(sendModels)) { for (ResidentsArchiveModel model : sendModels){ - if (model!=null && StringUtils.isNotEmpty(model.getPhone())){ - MessageRequest mr = new MessageRequest(); - String messagePrefix = smsConfigFacade.getSmsPrefix(configModel, model.getBuildDoctor()); - mr.setContent("【" + messagePrefix + "】" + request.getSmsContent()); - mr.setObjType(ServiceObjEnums.FUNV.getId()); + if (model != null){ + //短信前缀 + String messagePrefix = smsConfigFacade.getMsgPrefix(configModel, model.getBuildDoctor(), ServiceObjEnums.YUNOBJ.getId()); + com.lyms.platform.beans.MessageRequest mr = new com.lyms.platform.beans.MessageRequest(); + String content = request.getSmsContent(); + + mr.setFirst("【" + messagePrefix + "】" + content); + mr.setObjType(ServiceObjEnums.YUNOBJ.getId()); mr.setPhone(model.getPhone()); - //短信商 - mr.setServiceType(SmsProviderEnums.YM.getId()); + mr.setTimeType(SmsTimeTypeEnums.ONTIME.getId()); mr.setTypeId(ProjectTypeEnums.YNXT.getId()); mr.setPlanTime(DateUtil.getyyyy_MM_dd_hms(new Date())); mr.setSubTypeId(SmsServiceEnums.YSGXHZD.getId()); - mr.setTimeType(SmsTimeTypeEnums.ONTIME.getId()); - mr.setStatus(SmsStatusEnums.WFS.getId()); + mr.setHospitalId(model.getHospitalId()); + mr.setPatientId(model.getId()); - mr.setExt1(String.valueOf(model.getHospitalId())); + String doctorName = ""; + if (dbuser != null) + { + doctorName = dbuser.getName(); + } + + mr.setKeyword1(doctorName); + mr.setKeyword2(DateUtil.getyyyy_MM_dd(new Date())); + mr.setRemark(""); + mr.setCreated(DateUtil.getyyyy_MM_dd_hms(new Date())); + + mr.setWxTempId(WxTempleteIdEnums.YI_SHENG_ZHI_DAO.getId()); messages.add(mr); } } @@ -800,22 +815,19 @@ public class ResidentsArchiveFacade{ if (CollectionUtils.isNotEmpty(messages)) { smsList.setTypeId(ProjectTypeEnums.YNXT.getId()); smsList.setMessages(messages); + smsList.setMessages(messages); //调用发送接口 -// if (!syncDataService.savePostMsg(JsonUtil.obj2JsonString(smsList), messages.get(0).getExt1())) { -// MessageCenterService.saveSmsCenter(smsList); -// } if ("4".equals(HIS_VERSION)) { //秦皇岛 //保存到同步表中 - syncDataService.savePostMsg(JsonUtil.obj2JsonString(smsList), messages.get(0).getExt1()); + syncDataService.savePostMsg(JsonUtil.obj2JsonString(smsList), messages.get(0).getHospitalId()); } else { //保存到短信中心 线上 - MessageCenterService.saveSmsCenter(smsList); + MessageCenterService.saveMsgCenter(smsList); } - } } return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); -- 1.8.3.1