diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/YunAmsMsgGenerateWorker.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/YunAmsMsgGenerateWorker.java index 17efb41..ce7d58b 100644 --- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/YunAmsMsgGenerateWorker.java +++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/YunAmsMsgGenerateWorker.java @@ -88,12 +88,33 @@ public class YunAmsMsgGenerateWorker implements Runnable { String strService = config.getSmsService(); + int weekNum = HelperUtils.getWeekNum(guideTimes, week); + //判断消息服务是否启动 - boolean isStart = baseService.isStartService(SmsServiceEnums.YBZD.getId(), strService); + boolean isStart = false; + + /** + * 孕妇一周发送两次消息,第一次发送高危指导,一次发送一般指导 + * 孕妇周二发送高危指导 周五发送一般指导,根据小的周号发送高危指导,大的周号发送一般指导 + * 小周号判断高危指导是否开通 大周号判断一般指导是否开通 + */ + if (weekNum > WeekEnums.getIdByName(week)) + { + //判断消息服务是否启动 + isStart = baseService.isStartService(SmsServiceEnums.GWZD.getId(), strService); + } + else + { + //判断消息服务是否启动 + isStart = baseService.isStartService(SmsServiceEnums.YBZD.getId(), strService); + } + if (!isStart) { continue; } + + // 查询模板短信 从ams平台配置的短信通过医院ID Map> amsSmses = AmsMessageService .getMessageTemplateMap(hospitalId, @@ -139,9 +160,7 @@ public class YunAmsMsgGenerateWorker implements Runnable { } //消息前缀 - String messagePrefix = baseService.getSmsPrefix(config,pat.getBookbuildingDoctor(),ServiceObjEnums.YUNOBJ.getId()); - - int weekNum = HelperUtils.getWeekNum(guideTimes,week); + String messagePrefix = baseService.getSmsPrefix(config, pat.getBookbuildingDoctor(),ServiceObjEnums.YUNOBJ.getId()); boolean isRisk = false; if (weekNum > WeekEnums.getIdByName(week))