jiangjiazhi / regional-platform

Commit 39f25aab2a8973a6d2c286226904e3e11bcc25fe

Authored by liquanyu about 8 years ago

Exists in master and in 6 other branches

update code

Showing 1 changed file with 23 additions and 4 deletions

platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/YunAmsMsgGenerateWorker.java

...	...	@@ -88,12 +88,33 @@
88	88
89	89	String strService = config.getSmsService();
90	90
	91	+ int weekNum = HelperUtils.getWeekNum(guideTimes, week);
	92	+
91	93	//判断消息服务是否启动
92		- boolean isStart = baseService.isStartService(SmsServiceEnums.YBZD.getId(), strService);
	94	+ boolean isStart = false;
	95	+
	96	+ /**
	97	+ * 孕妇一周发送两次消息，第一次发送高危指导，一次发送一般指导
	98	+ * 孕妇周二发送高危指导周五发送一般指导，根据小的周号发送高危指导，大的周号发送一般指导
	99	+ * 小周号判断高危指导是否开通大周号判断一般指导是否开通
	100	+ */
	101	+ if (weekNum > WeekEnums.getIdByName(week))
	102	+ {
	103	+ //判断消息服务是否启动
	104	+ isStart = baseService.isStartService(SmsServiceEnums.GWZD.getId(), strService);
	105	+ }
	106	+ else
	107	+ {
	108	+ //判断消息服务是否启动
	109	+ isStart = baseService.isStartService(SmsServiceEnums.YBZD.getId(), strService);
	110	+ }
	111	+
93	112	if (!isStart) {
94	113	continue;
95	114	}
96	115
	116	+
	117	+
97	118	// 查询模板短信从ams平台配置的短信通过医院ID
98	119	Map<String, List<MessageContent>> amsSmses = AmsMessageService
99	120	.getMessageTemplateMap(hospitalId,
...	...	@@ -139,9 +160,7 @@
139	160	}
140	161
141	162	//消息前缀
142		- String messagePrefix = baseService.getSmsPrefix(config,pat.getBookbuildingDoctor(),ServiceObjEnums.YUNOBJ.getId());
143		-
144		- int weekNum = HelperUtils.getWeekNum(guideTimes,week);
	163	+ String messagePrefix = baseService.getSmsPrefix(config, pat.getBookbuildingDoctor(),ServiceObjEnums.YUNOBJ.getId());
145	164
146	165	boolean isRisk = false;
147	166	if (weekNum > WeekEnums.getIdByName(week))