From 563523a2e673e116cdc6c53eae442608fbfe9621 Mon Sep 17 00:00:00 2001
From: zhangheng <3226558941@qq.com>
Date: Thu, 18 Jul 2024 17:06:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E9=97=AE=E5=8D=B7?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xinelu/mobile/service/homepage/HomePageService.java   | 2 +-
 .../mobile/service/homepage/Impl/HomePageServiceImpl.java | 2 +-
 .../SatisfactionQuestionnaire.java                        | 5 +++++
 .../src/main/resources/mapper/homepage/HomePageMapper.xml | 8 +++++---
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/postdischarge-mobile/src/main/java/com/xinelu/mobile/service/homepage/HomePageService.java b/postdischarge-mobile/src/main/java/com/xinelu/mobile/service/homepage/HomePageService.java
index e02d5196..15c4f732 100644
--- a/postdischarge-mobile/src/main/java/com/xinelu/mobile/service/homepage/HomePageService.java
+++ b/postdischarge-mobile/src/main/java/com/xinelu/mobile/service/homepage/HomePageService.java
@@ -67,7 +67,7 @@ public interface HomePageService {
     List<PatientTaskExecuteRecord> selectPatientTaskExecuteRecord(Long residentId);
 
     /**
-     * 已完成满意度问卷
+     * 满意度问卷
      *
      * @param residentId 居民信息
      * @return SatisfactionQuestionnaire
diff --git a/postdischarge-mobile/src/main/java/com/xinelu/mobile/service/homepage/Impl/HomePageServiceImpl.java b/postdischarge-mobile/src/main/java/com/xinelu/mobile/service/homepage/Impl/HomePageServiceImpl.java
index fff39141..a7df96bf 100644
--- a/postdischarge-mobile/src/main/java/com/xinelu/mobile/service/homepage/Impl/HomePageServiceImpl.java
+++ b/postdischarge-mobile/src/main/java/com/xinelu/mobile/service/homepage/Impl/HomePageServiceImpl.java
@@ -182,7 +182,7 @@ public class HomePageServiceImpl implements HomePageService {
     }
 
     /**
-     * 人工随访代办处理
+     * 小程序问卷提交
      *
      * @param dto 患者问卷提交结果信息表DTO
      * @return 结果
diff --git a/postdischarge-mobile/src/main/java/com/xinelu/mobile/vo/satisfactionquestionnaire/SatisfactionQuestionnaire.java b/postdischarge-mobile/src/main/java/com/xinelu/mobile/vo/satisfactionquestionnaire/SatisfactionQuestionnaire.java
index 0eab78e2..c1086915 100644
--- a/postdischarge-mobile/src/main/java/com/xinelu/mobile/vo/satisfactionquestionnaire/SatisfactionQuestionnaire.java
+++ b/postdischarge-mobile/src/main/java/com/xinelu/mobile/vo/satisfactionquestionnaire/SatisfactionQuestionnaire.java
@@ -39,4 +39,9 @@ public class SatisfactionQuestionnaire {
      * 患者问卷id
      */
     private Long patientQuestionSubmitResultId;
+
+    /**
+     * 签约患者管理任务节点表id
+     */
+    private Long manageRouteNodeId;
 }
\ No newline at end of file
diff --git a/postdischarge-mobile/src/main/resources/mapper/homepage/HomePageMapper.xml b/postdischarge-mobile/src/main/resources/mapper/homepage/HomePageMapper.xml
index 528241a5..f2c7baed 100644
--- a/postdischarge-mobile/src/main/resources/mapper/homepage/HomePageMapper.xml
+++ b/postdischarge-mobile/src/main/resources/mapper/homepage/HomePageMapper.xml
@@ -73,10 +73,12 @@
         SELECT spmrn.question_info_id                            templateId,
                spmrn.questionnaire_name,
                pqsr.create_time                                  executeTime,
+               spmrn.id                                          manageRouteNodeId,
                (SELECT id
-                FROM patient_question_submit_result
-                WHERE resident_id = #{residentId}
-                  AND question_info_id = spmrn.question_info_id) patientQuestionSubmitResultId
+                FROM patient_question_submit_result pqsr2
+                WHERE pqsr2.resident_id = #{residentId}
+                  AND pqsr2.question_info_id = spmrn.question_info_id
+                  AND pqsr2.manage_route_node_id = spmrn.id ) patientQuestionSubmitResultId
         from sign_patient_manage_route_node spmrn
                  LEFT JOIN sign_patient_manage_route spmr on spmr.id = spmrn.manage_route_id
                  LEFT JOIN patient_info pi ON pi.id = spmr.patient_id