From 938e0d684d1c455f9f77ba93f83478914c7b622a Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 12 Jan 2018 16:59:10 +0800 Subject: [PATCH] update code --- .../java/com/lyms/platform/msg/utils/HelperUtils.java | 15 ++++++++------- .../platform/msg/worker/TempleteMsgGenerateWorker.java | 17 +++++++++++++---- 2 files changed, 21 insertions(+), 11 deletions(-) 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 cf9190c..a228be6 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 @@ -379,14 +379,15 @@ public class HelperUtils { * @return */ public static String getVaccineName(String content) { - if (StringUtils.isNotEmpty(content)) + try { + if (StringUtils.isNotEmpty(content)) + { + return content.substring(content.indexOf("#")+1, content.lastIndexOf("#")); + } + }catch (Exception e) { -// String[] arras = content.f -// if (arras != null) -// { -// -// } + return ""; } - return null; + return ""; } } 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 fb4ae5f..10a4f3b 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 @@ -452,8 +452,11 @@ public class TempleteMsgGenerateWorker implements Runnable { String messageContent = "【"+messagePrefix+"】"+template.getContent(); messageContent = HelperUtils.replaceName(model.getName(), messageContent); - String vaccineTime = HelperUtils.getKeyword(start, end, "天"); + //接种时间 + String vaccineTime = start+"天"; + //疫苗名称 String vaccineName = HelperUtils.getVaccineName(template.getContent()); + //疫苗接种人 String vaccinePerson = model.getName(); MsgRequest request = HelperUtils.getMessageRequest(messageContent, model.getMphone(), @@ -509,12 +512,18 @@ public class TempleteMsgGenerateWorker implements Runnable { String messagePrefix = baseService.getSmsPrefix(config, model.getBuildDoctor(),ServiceObjEnums.BABYOBJ.getId()); String messageContent = "【"+messagePrefix+"】"+template.getContent(); messageContent = HelperUtils.replaceName(model.getName(), messageContent); - String itemName = "疫苗接种提醒"; - String nextCheckTime = HelperUtils.getKeyword(start, end, "月龄"); + + //疫苗名称 + String vaccineName = HelperUtils.getVaccineName(template.getContent()); + //疫苗接种人 + String vaccinePerson = model.getName(); + //接种时间 + String vaccineTime = start+ "月龄"; + MsgRequest request = HelperUtils.getMessageRequest(messageContent, model.getMphone(), ServiceObjEnums.BABYOBJ.getId(), template.getSmsType(), - model.getHospitalId(), template.getId(), model.getId(), itemName, nextCheckTime, "", + model.getHospitalId(), template.getId(), model.getId(), vaccineName, vaccinePerson, vaccineTime, WxTempleteIdEnums.ER_TONG_YI_MIAO_TIXING.getId(),service); messages.add(request); -- 1.8.3.1