From 7cde67cee2f68965515ce1deec471ada95aec033 Mon Sep 17 00:00:00 2001
From: zhangheng <3226558941@qq.com>
Date: Wed, 17 Jul 2024 18:01:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=88=91=E7=9A=84?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../homepage/Impl/HomePageServiceImpl.java      | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 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 16b943c9..fff39141 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
@@ -94,17 +94,21 @@ public class HomePageServiceImpl implements HomePageService {
      */
     @Override
     public TableDataInfo myFollowUp(MyFollowUpVO myFollowUp) {
+        //查询已执行数据
         myFollowUp.setNodeExecuteStatus(NodeExecuteStatusEnum.EXECUTED.getInfo());
         List<MyFollowUpVO> myFollowUpList = homePageMapper.selectManageRouteNode(myFollowUp);
         int total = myFollowUpList.size();
         if (CollectionUtils.isEmpty(myFollowUpList)) {
             return pageServiceUtil.getDataTable(new ArrayList<>());
         }
+        //筛选未提交路径、组装数据
         List<MyFollowUpVO> myFollowUpVOS = new ArrayList<>();
         for (MyFollowUpVO myFollowUpVO : myFollowUpList) {
+            //筛选未提交路径
             if (Objects.nonNull(myFollowUpVO.getSign()) && myFollowUpVO.getSign() == 0) {
                 continue;
             }
+            //组装数据
             if (Objects.nonNull(myFollowUpVO.getDischargeTime())) {
                 myFollowUpVO.setFollowDate(myFollowUpVO.getDischargeTime().plusDays(myFollowUpVO.getRouteNodeDay()));
                 myFollowUpVO.setManageRouteNodeName(RouteNodeNameEnum.getNameByInfo(myFollowUpVO.getRouteNodeName()).getName());
@@ -113,7 +117,7 @@ public class HomePageServiceImpl implements HomePageService {
             myFollowUpVOS.add(myFollowUpVO);
         }
         myFollowUpVOS.sort(Comparator.comparing(MyFollowUpVO::getFollowDate).reversed());
-        //处理上面查询的list集合
+        //分页
         if (Objects.nonNull(myFollowUp.getNum()) || Objects.nonNull(myFollowUp.getSize())) {
             Integer pageNum = myFollowUp.getNum();
             Integer pageSize = myFollowUp.getSize();
@@ -268,6 +272,7 @@ public class HomePageServiceImpl implements HomePageService {
     public TableDataInfo satisfactionQuestionnaire(Long residentId) {
         pageServiceUtil.startPage();
         List<SatisfactionQuestionnaire> satisfactionQuestionnaires = homePageMapper.satisfactionQuestionnaireByResidentId(residentId, QuestionTypeEnum.SATISFACTION_QUESTIONNAIRE.getInfo(), QuestionnaireStatusEnum.PUBLISHED.getInfo());
+        //判断是否完成
         for (SatisfactionQuestionnaire satisfactionQuestionnaire : satisfactionQuestionnaires) {
             if (Objects.isNull(satisfactionQuestionnaire.getPatientQuestionSubmitResultId())) {
                 satisfactionQuestionnaire.setSign("incomplete");
@@ -286,22 +291,26 @@ public class HomePageServiceImpl implements HomePageService {
      */
     @Override
     public AjaxResult selectSignPatientManageRouteNode(Long residentId) {
+        //查询已执行人工随访
         List<MessageTabulationVO> signPatientManageRouteNodes = homePageMapper.selectManageRouteByResidentId(residentId, NodeExecuteStatusEnum.EXECUTED.getInfo());
         if (CollectionUtils.isEmpty(signPatientManageRouteNodes)) {
             return AjaxResult.success(new ArrayList<>());
         }
+        //过滤电话外呼数据
+        List<MessageTabulationVO> messageTabulationVOS = new ArrayList<>();
         for (MessageTabulationVO manageRouteNode : signPatientManageRouteNodes) {
             if (Objects.isNull(manageRouteNode) || TaskContentEnum.PHONE_OUTBOUND.getInfo().equals(manageRouteNode.getTaskNodeType())) {
-                signPatientManageRouteNodes.remove(manageRouteNode);
+                continue;
             }
-            if (Objects.nonNull(manageRouteNode) && StringUtils.isNotBlank(manageRouteNode.getManageRouteName()) && StringUtils.isNotBlank(manageRouteNode.getRouteNodeName()) && Objects.nonNull(manageRouteNode.getRouteNodeDay())) {
+            if (StringUtils.isNotBlank(manageRouteNode.getManageRouteName()) && StringUtils.isNotBlank(manageRouteNode.getRouteNodeName()) && Objects.nonNull(manageRouteNode.getRouteNodeDay())) {
                 if (StringUtils.isNotBlank(manageRouteNode.getRouteNodeName())) {
                     manageRouteNode.setRouteNodeName(RouteNodeNameEnum.getNameByInfo(manageRouteNode.getRouteNodeName()).getName());
                 }
                 manageRouteNode.setRouteNodeName(manageRouteNode.getManageRouteName() + manageRouteNode.getRouteNodeName() + "第" + manageRouteNode.getRouteNodeDay() + "天");
+                messageTabulationVOS.add(manageRouteNode);
             }
         }
-        return AjaxResult.success(signPatientManageRouteNodes);
+        return AjaxResult.success(messageTabulationVOS);
     }
 
     /**