diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroute/impl/SignPatientManageRouteServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroute/impl/SignPatientManageRouteServiceImpl.java index 4faf8237..345d6450 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroute/impl/SignPatientManageRouteServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroute/impl/SignPatientManageRouteServiceImpl.java @@ -744,6 +744,9 @@ public class SignPatientManageRouteServiceImpl implements ISignPatientManageRout TextMessage textMessage = textMessageMapper.selectTextMessageById(messageTemplateId); if (ObjectUtils.isNotEmpty(textMessage)) { String textMessageContent = textMessage.getTextMessageContent(); + if (StringUtils.isBlank(textMessageContent)) { + return null; + } // 替换{{}}中的内容 Pattern pattern = Pattern.compile("#\\{([^\\}]*)\\}"); Matcher matcher = pattern.matcher(textMessage.getTextMessageContent()); @@ -789,7 +792,7 @@ public class SignPatientManageRouteServiceImpl implements ISignPatientManageRout return null; } String templateContent = wechatTemplate.getTemplateContent(); - if (StringUtils.isEmpty(templateContent)) { + if (StringUtils.isBlank(templateContent)) { return null; } Pattern pattern = Pattern.compile("#\\{([^\\}]*)\\}"); diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/impl/SignPatientManageRouteNodeServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/impl/SignPatientManageRouteNodeServiceImpl.java index cc3f973d..2ca530ce 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/impl/SignPatientManageRouteNodeServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/impl/SignPatientManageRouteNodeServiceImpl.java @@ -887,6 +887,9 @@ public class SignPatientManageRouteNodeServiceImpl implements ISignPatientManage TextMessage textMessage = textMessageMapper.selectTextMessageById(messageTemplateId); if (ObjectUtils.isNotEmpty(textMessage)) { String textMessageContent = textMessage.getTextMessageContent(); + if (StringUtils.isBlank(textMessageContent)) { + return null; + } // 替换{{}}中的内容 Pattern pattern = Pattern.compile("#\\{([^\\}]*)\\}"); Matcher matcher = pattern.matcher(textMessage.getTextMessageContent()); @@ -938,6 +941,9 @@ public class SignPatientManageRouteNodeServiceImpl implements ISignPatientManage return null; } String templateContent = wechatTemplate.getTemplateContent(); + if (StringUtils.isBlank(templateContent)) { + return null; + } Pattern pattern = Pattern.compile("#\\{([^\\}]*)\\}"); Matcher matcher = pattern.matcher(templateContent); while (matcher.find()) {