diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/utils/HelperUtils.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/utils/HelperUtils.java index efb10df..2a2e021 100644 --- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/utils/HelperUtils.java +++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/utils/HelperUtils.java @@ -353,5 +353,14 @@ public class HelperUtils { } + public static String getKeyword(int start,int end, String unit) { + if (start == end) + { + return start+unit; + } + return start+"-"+end+unit; + } + + } diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java index 48a9892..48178df 100644 --- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java +++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java @@ -292,7 +292,7 @@ public class TempleteMsgGenerateWorker implements Runnable { messageContent = HelperUtils.replaceName(model.getName(), messageContent); String itemName = "儿童保健"; - String nextCheckTime = HelperUtils.getMonthYear(model.getBirth(), new Date()); + String nextCheckTime = HelperUtils.getKeyword(start, end, "天"); MessageRequest request = HelperUtils.getMessageRequest(messageContent, model.getMphone(), ServiceObjEnums.BABYOBJ.getId(), template.getSmsType(), @@ -345,7 +345,7 @@ public class TempleteMsgGenerateWorker implements Runnable { String messageContent = "【"+messagePrefix+"】"+template.getContent(); messageContent = HelperUtils.replaceName(model.getName(), messageContent); String itemName = "儿童保健"; - String nextCheckTime = HelperUtils.getMonthYear(model.getBirth(), new Date()); + String nextCheckTime = HelperUtils.getKeyword(start, end, "月龄"); MessageRequest request = HelperUtils.getMessageRequest(messageContent, model.getMphone(), ServiceObjEnums.BABYOBJ.getId(), template.getSmsType(), @@ -662,7 +662,8 @@ public class TempleteMsgGenerateWorker implements Runnable { String messageContent = "【"+messagePrefix+"】"+template.getContent(); messageContent = HelperUtils.replaceName(pat.getUsername(), messageContent); - String days = DateUtils.daysBetween(pat.getFmDate(), new Date()) + "天"; + String days = "产后"+HelperUtils.getKeyword(start,end,"天"); + String title = "产后复查"; MessageRequest request = HelperUtils.getMessageRequest(messageContent, pat.getPhone(), ServiceObjEnums.CHANOBJ.getId(), template.getSmsType(),