From 83c28dd50791d7dddfcc7eb5c5b4b01596883123 Mon Sep 17 00:00:00 2001
From: zhangheng <3226558941@qq.com>
Date: Tue, 17 Mar 2026 15:58:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=92=8C=E5=B9=B6=E4=BA=8C=E9=99=A2=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SignPatientManageRouteNodeMapper.xml      | 39 ++-----------------
 .../quartz/task/UploadRobotPublishTask.java   | 13 +++++--
 2 files changed, 14 insertions(+), 38 deletions(-)

diff --git a/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml
index 0648612d..f2e5ffff 100644
--- a/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml
+++ b/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml
@@ -1243,12 +1243,13 @@
     </select>
 
     <select id="questionnaireTaskStatistics"
-            resultType="com.xinelu.manage.vo.statistics.QuestionnaireTaskStatisticsVo"
-            resultMap="QuestionnaireTaskStatisticsVoResult">
+            resultType="com.xinelu.manage.vo.statistics.QuestionnaireTaskStatisticsVo">
         select
         qi.create_time,
         qi.questionnaire_name,
+        spmrn.id manageRouteNodeId,
         spmrn.question_info_id,
+        pqsjr.question_submit_result_id questionSubmitResultId,
         pqsjr.question_subject_id,
         pqsjr.question_number,
         pqsjr.question_type,
@@ -1257,39 +1258,7 @@
         pqor.question_subject_option_id questionSubjectOptionId,
         pqor.option_name,
         pqor.option_sort,
-        (
-        SELECT
-        count( f.option_choose_sign = 0 OR NULL )
-        FROM
-        sign_patient_manage_route_node a
-        LEFT JOIN sign_patient_manage_route b ON b.id = a.manage_route_id
-        LEFT JOIN patient_info c ON b.patient_id = c.id
-        LEFT JOIN patient_question_submit_result d ON a.id = d.manage_route_node_id
-        LEFT JOIN patient_question_subject_result e ON d.id = e.question_submit_result_id
-        LEFT JOIN patient_question_option_result f ON e.id = f.question_subject_result_id
-        WHERE
-        c.del_flag = 0
-        AND a.question_info_id = spmrn.question_info_id
-        AND e.question_subject_id = pqsjr.question_subject_id
-        AND f.question_subject_option_id = pqor.question_subject_option_id
-        <if test="taskStartTime != null"><!-- 开始时间检索 -->
-            AND date_format(a.node_finish_date,'%y%m%d') &gt;= date_format(#{taskStartTime},'%y%m%d')
-        </if>
-        <if test="taskEndTime != null"><!-- 结束时间检索 -->
-            AND date_format(a.node_finish_date,'%y%m%d') &lt;= date_format(#{taskEndTime},'%y%m%d')
-        </if>
-        <if test="visitStartTime != null and visitEndTime != null">
-            and( (date_format(c.visit_date, '%y%m%d') >= date_format(#{visitStartTime}, '%y%m%d')
-            and date_format(c.visit_date, '%y%m%d') &lt;= date_format(#{visitEndTime}, '%y%m%d'))
-            or (date_format(c.discharge_time,'%y%m%d') >= date_format(#{visitStartTime}, '%y%m%d') and
-            date_format(c.discharge_time,'%y%m%d') &lt;= date_format(#{visitEndTime}, '%y%m%d')))
-        </if>
-        ) choiceNumber,
-        (
-        SELECT count( 1 ) FROM sign_patient_manage_route_node a
-        LEFT JOIN patient_question_submit_result d ON a.id = d.manage_route_node_id
-        WHERE a.question_info_id = spmrn.question_info_id
-        ) total
+        pqor.option_choose_sign
         from sign_patient_manage_route_node spmrn
         left join question_info qi on spmrn.question_info_id = qi.id
         left join sign_patient_manage_route spmr on spmr.id = spmrn.manage_route_id
diff --git a/postdischarge-quartz/src/main/java/com/xinelu/quartz/task/UploadRobotPublishTask.java b/postdischarge-quartz/src/main/java/com/xinelu/quartz/task/UploadRobotPublishTask.java
index 8a4de51d..b8864f8f 100644
--- a/postdischarge-quartz/src/main/java/com/xinelu/quartz/task/UploadRobotPublishTask.java
+++ b/postdischarge-quartz/src/main/java/com/xinelu/quartz/task/UploadRobotPublishTask.java
@@ -161,10 +161,17 @@ public class UploadRobotPublishTask {
                 if (StringUtils.isBlank(taskId)) {
                     Long aLong = patientInfoImportMainMapper.selectHospitalAgencyId(sn);
                     DialTime dialTime = patientInfoImportMainMapper.selectDialTimeById(aLong);
-                    LocalTime localStartTime = LocalTime.parse(dialTime.getDialStartTime());
-                    LocalTime localEndTime = LocalTime.parse(dialTime.getDialEndTime());
+                    LocalTime localStartTime = null;
+                    LocalTime localEndTime = null;
                     LocalTime dateStartTime;
                     LocalTime dateEndTime;
+                    if (Objects.nonNull(dialTime)) {
+                        localStartTime = LocalTime.parse(dialTime.getDialStartTime());
+                        localEndTime = LocalTime.parse(dialTime.getDialEndTime());
+                    } else {
+                        localStartTime = LocalTime.parse("08:00");
+                        localEndTime = LocalTime.parse("19:00");
+                    }
                     List<SysDictData> sysDictDataList = iSysDictTypeService.selectDictDataByType(Constants.DIAL_TIME);
                     if (CollectionUtils.isEmpty(sysDictDataList) || sysDictDataList.size() != 2) {
                         dateStartTime = LocalTime.parse("08:00");
@@ -173,7 +180,7 @@ public class UploadRobotPublishTask {
                         dateStartTime = LocalTime.parse(sysDictDataList.get(0).getDictValue());
                         dateEndTime = LocalTime.parse(sysDictDataList.get(1).getDictValue());
                     }
-                    if (dateStartTime.isAfter(localStartTime) ) {
+                    if (dateStartTime.isAfter(localStartTime)) {
                         localStartTime = dateStartTime;
                     }
                     if (dateEndTime.isBefore(localEndTime)) {