From 582d39d16cdcb20e03fa18eaf0c9c43e705c702e Mon Sep 17 00:00:00 2001
From: zhangheng <3226558941@qq.com>
Date: Mon, 22 Apr 2024 11:09:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E9=9A=8F=E8=AE=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mobile/service/homepage/Impl/HomePageServiceImpl.java | 8 +++++---
 .../com/xinelu/mobile/vo/myfollowup/MyFollowUpVO.java     | 5 +++--
 .../src/main/resources/mapper/homepage/HomePageMapper.xml | 2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

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 9fe3277d..b94d863e 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
@@ -70,9 +70,11 @@ public class HomePageServiceImpl implements HomePageService {
         }
         myFollowUpList.sort(Comparator.comparing(MyFollowUpVO::getFollowDate).reversed());
         //处理上面查询的list集合
-        Integer pageNum = myFollowUp.getPageNum();
-        Integer pageSize = myFollowUp.getPageSize();
-        myFollowUpList = myFollowUpList.stream().skip((long) (pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
+        if (Objects.nonNull(myFollowUp.getNum()) || Objects.nonNull(myFollowUp.getSize())) {
+            Integer pageNum = myFollowUp.getNum();
+            Integer pageSize = myFollowUp.getSize();
+            myFollowUpList = myFollowUpList.stream().skip((long) (pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
+        }
         return pageServiceUtil.getDataTable(myFollowUpList);
     }
 
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 3d47003c..26ad3a83 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
@@ -33,6 +33,7 @@ public class MyFollowUpVO {
      * 模版id
      */
     private Long templateId;
+
     /**
      * 随访时间
      */
@@ -69,6 +70,6 @@ public class MyFollowUpVO {
      */
     private Integer sign;
 
-    private Integer pageNum;
-    private Integer pageSize;
+    private Integer num;
+    private Integer size;
 }
\ 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 4742dc7a..4cbd6c97 100644
--- a/postdischarge-mobile/src/main/resources/mapper/homepage/HomePageMapper.xml
+++ b/postdischarge-mobile/src/main/resources/mapper/homepage/HomePageMapper.xml
@@ -11,8 +11,8 @@
         spmrn.route_node_name,
         IFNULL( spmrn.route_node_day,0) routeNodeDay,
         pi.discharge_time,
-        IF(pter.id=NULL,0,1) sign,
         pter.id patientTaskExecuteRecordId,
+        IF(pter.id is NULL,0,1) sign,
         CASE
         WHEN spmrn.task_type = 'PHONE_OUTBOUND' THEN spmrn.phone_id
         WHEN spmrn.task_type = 'QUESTIONNAIRE_SCALE' THEN spmrn.question_info_id