jiangjiazhi / regional-platform

Commit dd26500a00505888bebb9d32e6e911770525f1ec

Authored by liquanyu almost 8 years ago

Exists in master and in 6 other branches

update code

Showing 2 changed files with 13 additions and 3 deletions

platform-msg-generate/src/main/java/com/lyms/platform/msg/utils/HelperUtils.java
platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java

...	...	@@ -353,6 +353,15 @@
353	353	}
354	354
355	355
	356	+ public static String getKeyword(int start,int end, String unit) {
	357	+ if (start == end)
	358	+ {
	359	+ return start+unit;
	360	+ }
	361	+ return start+"-"+end+unit;
	362	+ }
	363	+
	364	+
356	365
357	366	}

...	...	@@ -292,7 +292,7 @@
292	292	messageContent = HelperUtils.replaceName(model.getName(), messageContent);
293	293
294	294	String itemName = "儿童保健";
295		- String nextCheckTime = HelperUtils.getMonthYear(model.getBirth(), new Date());
	295	+ String nextCheckTime = HelperUtils.getKeyword(start, end, "天");
296	296
297	297	MessageRequest request = HelperUtils.getMessageRequest(messageContent, model.getMphone(),
298	298	ServiceObjEnums.BABYOBJ.getId(), template.getSmsType(),
...	...	@@ -345,7 +345,7 @@
345	345	String messageContent = "【"+messagePrefix+"】"+template.getContent();
346	346	messageContent = HelperUtils.replaceName(model.getName(), messageContent);
347	347	String itemName = "儿童保健";
348		- String nextCheckTime = HelperUtils.getMonthYear(model.getBirth(), new Date());
	348	+ String nextCheckTime = HelperUtils.getKeyword(start, end, "月龄");
349	349
350	350	MessageRequest request = HelperUtils.getMessageRequest(messageContent, model.getMphone(),
351	351	ServiceObjEnums.BABYOBJ.getId(), template.getSmsType(),
...	...	@@ -662,7 +662,8 @@
662	662	String messageContent = "【"+messagePrefix+"】"+template.getContent();
663	663	messageContent = HelperUtils.replaceName(pat.getUsername(), messageContent);
664	664
665		- String days = DateUtils.daysBetween(pat.getFmDate(), new Date()) + "天";
	665	+ String days = "产后"+HelperUtils.getKeyword(start,end,"天");
	666	+
666	667	String title = "产后复查";
667	668	MessageRequest request = HelperUtils.getMessageRequest(messageContent, pat.getPhone(),
668	669	ServiceObjEnums.CHANOBJ.getId(), template.getSmsType(),