From 1605462870c5df550d70fb37e5f1afc97e98ea2c Mon Sep 17 00:00:00 2001
From: zhangheng <3226558941@qq.com>
Date: Wed, 23 Sep 2026 09:56:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=B0=E5=BD=95=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/manage/phonedialrecord/PhoneDialRecordMapper.xml     | 2 +-
 .../shortmessagesendrecord/ShortMessageSendRecordMapper.xml     | 2 +-
 .../com/xinelu/quartz/controller/SendTextMessageController.java | 2 +-
 .../xinelu/quartz/service/impl/SendTextMessageServiceImpl.java  | 2 ++
 .../main/java/com/xinelu/quartz/task/SendTextMessageTask.java   | 2 +-
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/postdischarge-manage/src/main/resources/mapper/manage/phonedialrecord/PhoneDialRecordMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/phonedialrecord/PhoneDialRecordMapper.xml
index 5747959a..a0a45f36 100644
--- a/postdischarge-manage/src/main/resources/mapper/manage/phonedialrecord/PhoneDialRecordMapper.xml
+++ b/postdischarge-manage/src/main/resources/mapper/manage/phonedialrecord/PhoneDialRecordMapper.xml
@@ -136,7 +136,7 @@
         </if>
         <if test="dialTimeStart != null and dialTimeEnd != null">
             and record.dial_time &gt;= #{dialTimeStart}
-            and record.dial_time &lt; #{dialTimeEnd}
+            and record.dial_time &lt;= #{dialTimeEnd}
         </if>
         <if test="phoneTemplateId != null  and phoneTemplateId != ''">
             and record.phone_template_id = #{phoneTemplateId}
diff --git a/postdischarge-manage/src/main/resources/mapper/manage/shortmessagesendrecord/ShortMessageSendRecordMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/shortmessagesendrecord/ShortMessageSendRecordMapper.xml
index 10a54c7a..afa15d47 100644
--- a/postdischarge-manage/src/main/resources/mapper/manage/shortmessagesendrecord/ShortMessageSendRecordMapper.xml
+++ b/postdischarge-manage/src/main/resources/mapper/manage/shortmessagesendrecord/ShortMessageSendRecordMapper.xml
@@ -130,7 +130,7 @@
         </if>
         <if test="sendTimeStart != null and sendTimeEnd != null">
             and record.send_time &gt;= #{sendTimeStart}
-            and record.send_time &lt; #{sendTimeEnd}
+            and record.send_time &lt;= #{sendTimeEnd}
         </if>
         <if test="messageTemplateId != null">
             and record.message_template_id = #{messageTemplateId}
diff --git a/postdischarge-quartz/src/main/java/com/xinelu/quartz/controller/SendTextMessageController.java b/postdischarge-quartz/src/main/java/com/xinelu/quartz/controller/SendTextMessageController.java
index 02da846b..abd7640f 100644
--- a/postdischarge-quartz/src/main/java/com/xinelu/quartz/controller/SendTextMessageController.java
+++ b/postdischarge-quartz/src/main/java/com/xinelu/quartz/controller/SendTextMessageController.java
@@ -71,7 +71,7 @@ public class SendTextMessageController {
         if (Objects.isNull(signPatientManageRoute.getId())){
             return retObj;
         }
-        BigDecimal price = BigDecimal.valueOf(0.00);
+        BigDecimal price = null;
         List<SysDictData> sysDictDataList = iSysDictTypeService.selectDictDataByType("unit_price");
         if (CollectionUtils.isNotEmpty(sysDictDataList)){
             SysDictData message = sysDictDataList.stream().filter(Objects::nonNull).filter(item -> item.getDictLabel().equals("message")).findFirst().orElse(new SysDictData());
diff --git a/postdischarge-quartz/src/main/java/com/xinelu/quartz/service/impl/SendTextMessageServiceImpl.java b/postdischarge-quartz/src/main/java/com/xinelu/quartz/service/impl/SendTextMessageServiceImpl.java
index 464a9064..45005285 100644
--- a/postdischarge-quartz/src/main/java/com/xinelu/quartz/service/impl/SendTextMessageServiceImpl.java
+++ b/postdischarge-quartz/src/main/java/com/xinelu/quartz/service/impl/SendTextMessageServiceImpl.java
@@ -286,6 +286,8 @@ public class SendTextMessageServiceImpl implements SendTextMessageService {
             shortMessageSendRecord.setMessageType("COMMON");
             if (StringUtils.isNotBlank(data.getSms_size())){
                 shortMessageSendRecord.setMessageQuantity(Long.valueOf(data.getSms_size()));
+            }
+            if (Objects.nonNull(price)){
                 shortMessageSendRecord.setMessageUnitPrice(price);
             }
             shortMessageSendRecord.setCreateBy("system");
diff --git a/postdischarge-quartz/src/main/java/com/xinelu/quartz/task/SendTextMessageTask.java b/postdischarge-quartz/src/main/java/com/xinelu/quartz/task/SendTextMessageTask.java
index 493c758d..304c9a75 100644
--- a/postdischarge-quartz/src/main/java/com/xinelu/quartz/task/SendTextMessageTask.java
+++ b/postdischarge-quartz/src/main/java/com/xinelu/quartz/task/SendTextMessageTask.java
@@ -85,7 +85,7 @@ public class SendTextMessageTask {
                 log.info("短信数据缺少任务信息！");
                 return;
             }
-            BigDecimal price = BigDecimal.valueOf(0.00);
+            BigDecimal price = null;
             List<SysDictData> sysDictDataList = iSysDictTypeService.selectDictDataByType("unit_price");
             if (CollectionUtils.isNotEmpty(sysDictDataList)){
                 SysDictData message = sysDictDataList.stream().filter(Objects::nonNull).filter(item -> item.getDictLabel().equals("message")).findFirst().orElse(new SysDictData());