From d2615383e728c4e83757f96b0bae8cb8dab23b81 Mon Sep 17 00:00:00 2001
From: haown <454902499@qq.com>
Date: Thu, 4 Jul 2024 16:24:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=87=E7=AD=BE=E6=9B=BF?=
 =?UTF-8?q?=E6=8D=A2=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SignPatientManageRouteServiceImpl.java             | 5 ++++-
 .../impl/SignPatientManageRouteNodeServiceImpl.java         | 6 ++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

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()) {