From a41d6eb011ad8b362235db8f6747a57480ddca0e Mon Sep 17 00:00:00 2001
From: zhangheng <3226558941@qq.com>
Date: Tue, 23 Apr 2024 11:14:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=81=A5=E5=BA=B7=E6=97=A5=E5=8E=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/xinelu/mobile/vo/myfollowup/MyFollowUpVO.java  | 10 ++++++++++
 .../main/resources/mapper/homepage/HomePageMapper.xml  |  6 ++++++
 2 files changed, 16 insertions(+)

diff --git a/postdischarge-mobile/src/main/java/com/xinelu/mobile/vo/myfollowup/MyFollowUpVO.java b/postdischarge-mobile/src/main/java/com/xinelu/mobile/vo/myfollowup/MyFollowUpVO.java
index 26ad3a83..f77f780b 100644
--- a/postdischarge-mobile/src/main/java/com/xinelu/mobile/vo/myfollowup/MyFollowUpVO.java
+++ b/postdischarge-mobile/src/main/java/com/xinelu/mobile/vo/myfollowup/MyFollowUpVO.java
@@ -14,6 +14,16 @@ import java.time.LocalDate;
 @Data
 public class MyFollowUpVO {
 
+    private Long patientId;
+
+    private String patientName;
+
+    private Long manageRouteId;
+
+    private String manageRouteName;
+
+    private String manageRouteNodeName;
+
     /**
      * 用户id
      */
diff --git a/postdischarge-mobile/src/main/resources/mapper/homepage/HomePageMapper.xml b/postdischarge-mobile/src/main/resources/mapper/homepage/HomePageMapper.xml
index 0d40087b..0ce739bf 100644
--- a/postdischarge-mobile/src/main/resources/mapper/homepage/HomePageMapper.xml
+++ b/postdischarge-mobile/src/main/resources/mapper/homepage/HomePageMapper.xml
@@ -6,7 +6,12 @@
 
     <select id="selectManageRouteNode" resultType="com.xinelu.mobile.vo.myfollowup.MyFollowUpVO">
         select
+        pi.id patientId,
+        pi.patient_name,
+        spmr.id manageRouteId,
+        spmr.route_name manageRouteName,
         spmrn.id manageRouteNodeId,
+        spmrn.route_node_name manageRouteNodeName,
         spmrn.task_type,
         spmrn.route_node_name,
         IFNULL( spmrn.route_node_day,0) routeNodeDay,
@@ -23,6 +28,7 @@
         LEFT JOIN sign_patient_manage_route_node spmrn ON spmrn.manage_route_id = spmr.id
         LEFT JOIN patient_task_execute_record pter ON pter.manage_route_node_id = spmrn.id
         <where>
+            spmrn.task_type in('PHONE_OUTBOUND','QUESTIONNAIRE_SCALE','ARTIFICIAL_FOLLOW_UP')
             <if test="residentId != null ">
                 and pi.resident_id = #{residentId}
             </if>