From 15b1f3fc95813772007cfc8a3522f72b12dd6aec Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 24 Oct 2018 11:02:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=A8=A9=E8=AE=B0=E5=BD=95=E5=AF=BC?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/common/enums/SmsServiceEnums.java | 3 ++- .../platform/common/enums/WxTempleteIdEnums.java | 2 +- .../platform/operate/web/facade/CourseFacade.java | 20 ++++++++++++++------ 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/SmsServiceEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/SmsServiceEnums.java index 710d30a..cdfb327 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/SmsServiceEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/SmsServiceEnums.java @@ -49,7 +49,8 @@ public enum SmsServiceEnums { EBGQTX(35,"儿童儿保过期提醒",32,"2"), FWDGTX(36,"服务订购提醒",18,"1"), JSGWZD(37,"及时高危指导",1,""), - CSJGTZ(38,"产筛结果通知",21,"1"); + CSJGTZ(38,"产筛结果通知",21,"1"), + YFXXJSTX(39,"孕妇学校课程结束提醒",21,"1,3"); private SmsServiceEnums(int id,String name,int pid,String serviceObj){ this.id = id; 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 a9bbfc5..8c79879 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,7 @@ public enum WxTempleteIdEnums { BABY_YI_BAN_ZHI_DAO("dqvyESU8UXx1V3cIMQDqj4PLxI6T9-sgihQcs3ZGL9E","儿童一般指导"),//儿童 YUN_XUE_KE_CHEN_TX("UEwcdz3lJL3NR38KRqN6yTO4nUvRgym5mlXl4jXQBik","孕妇学校课程提醒"),//孕妇学校课程提醒 - YUN_XUE_JSTX("","孕妇学校课程结束提醒"),//孕妇学校课程结束提醒 + YUN_XUE_JSTX("jBHP98VRjIf3d0TDnor89V_z2IQ9b0ecKW3fAZW4FS8","孕妇学校课程结束提醒"),//孕妇学校课程结束提醒 FU_WU_DING_GOU_TX("UEwcdz3lJL3NR38KRqN6yTO4nUvRgym5mlXl4jXQBik","服务订购提醒"),//服务订购提醒和收费成功后的高危提醒 YI_SHENG_ZHI_DAO("OggqiSHitLkCgSLCaCH72reCZzaw5NyG8iO56InQiQg","医生指导"),//指导 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java index 7060965..1031241 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java @@ -16,9 +16,8 @@ import com.lyms.platform.operate.web.result.CourseTypeResult; import com.lyms.platform.operate.web.utils.BabyListTask; import com.lyms.platform.operate.web.utils.MessageCenterService; import com.lyms.platform.operate.web.worker.CourseCountWorker; -import com.lyms.platform.permission.model.PatientService; -import com.lyms.platform.permission.model.UserScore; -import com.lyms.platform.permission.model.Users; +import com.lyms.platform.permission.model.*; +import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.*; import com.lyms.platform.query.CourseEvalQuery; @@ -67,6 +66,9 @@ public class CourseFacade { private SmsConfigFacade smsConfigFacade; @Autowired + private OrganizationService organizationService; + + @Autowired private CourseEvalService courseEvalService; @Autowired @@ -437,6 +439,12 @@ public class CourseFacade { private void saveMsg(String hospitalId,String phone,String patientId,String courseName,String doctorName,String patientCourseId,String courseId) { + + OrganizationQuery orgQuery = new OrganizationQuery(); + orgQuery.setYn(YnEnums.YES.getId()); + orgQuery.setId(Integer.parseInt(hospitalId)); + List list = organizationService.queryHospitals(orgQuery); + //判断医院是否启动和对应的服务项是否启用 SmsConfigModel configModel = new SmsConfigModel(); // 1 推送服务， 2 推送和短信服务 3短信服务， @@ -449,13 +457,13 @@ public class CourseFacade { List messages = new ArrayList<>(); MsgRequest mr = new MsgRequest(); - String content = "【" + messagePrefix + "】本次孕妇学校课程已结束,请对本次课程内容和讲解医生进行评价。"; + String content = "【" + messagePrefix + "】您本次参加的孕妇学校课程已经结束，请点击详情回顾课程内容并对本次课程评分。我们会根据您的评价结果相应做相应的评估的课程调整等。"; mr.setFirst(content); mr.setObjType(ServiceObjEnums.YUNOBJ.getId()); mr.setPhone(phone); mr.setTypeId(ProjectTypeEnums.YNXT.getId()); mr.setPlanTime(DateUtil.getyyyy_MM_dd_hms(new Date())); - mr.setSubTypeId(SmsServiceEnums.YFXXKCTX.getId()); + mr.setSubTypeId(SmsServiceEnums.YFXXJSTX.getId()); mr.setStatus(SmsStatusEnums.WFS.getId()); mr.setTimeType(SmsTimeTypeEnums.ONTIME.getId()); @@ -463,7 +471,7 @@ public class CourseFacade { mr.setTempId(patientCourseId); mr.setPatientId(patientId); - mr.setKeyword1(courseName); + mr.setKeyword1(list.get(0).getName()); mr.setKeyword2(doctorName); mr.setRemark(courseId); mr.setCreated(DateUtil.getyyyy_MM_dd_hms(new Date())); -- 1.8.3.1