From c6cd94f6c88b047fade56602914e7d05fc47e2cb Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Wed, 17 Jul 2024 17:49:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=88=91=E7=9A=84?= =?UTF-8?q?=E9=9A=8F=E8=AE=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/homepage/HomePageController.java | 4 ++-- .../service/homepage/Impl/HomePageServiceImpl.java | 14 +++++++++----- .../resources/mapper/homepage/HomePageMapper.xml | 9 +++++---- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/postdischarge-mobile/src/main/java/com/xinelu/mobile/controller/homepage/HomePageController.java b/postdischarge-mobile/src/main/java/com/xinelu/mobile/controller/homepage/HomePageController.java index b3b4cfd4..81027af4 100644 --- a/postdischarge-mobile/src/main/java/com/xinelu/mobile/controller/homepage/HomePageController.java +++ b/postdischarge-mobile/src/main/java/com/xinelu/mobile/controller/homepage/HomePageController.java @@ -44,7 +44,7 @@ public class HomePageController extends BaseController { } /** - * 问卷信息 + * 问卷信息（随访） */ @GetMapping("/selectQuestion") public AjaxResult selectQuestion(Long templateId) { @@ -52,7 +52,7 @@ public class HomePageController extends BaseController { } /** - * 问卷记录信息（消息记录） + * 问卷记录信息（消息记录、我的随访） */ @GetMapping("/selectQuestionSubmit") public AjaxResult selectQuestionSubmit(Long patientQuestionSubmitResultId, Long patientTaskExecuteRecordId) { 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 84f60397..16b943c9 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 @@ -24,7 +24,6 @@ import com.xinelu.manage.mapper.patienttaskexecuterecord.PatientTaskExecuteRecor import com.xinelu.manage.mapper.questioninfo.QuestionInfoMapper; import com.xinelu.manage.mapper.questionsubject.QuestionSubjectMapper; import com.xinelu.manage.mapper.questionsubjectoption.QuestionSubjectOptionMapper; -import com.xinelu.manage.mapper.scriptInfo.ScriptInfoMapper; import com.xinelu.manage.mapper.signpatientmanageroutenode.SignPatientManageRouteNodeMapper; import com.xinelu.manage.service.propagandainfo.IPropagandaInfoService; import com.xinelu.manage.vo.propagandainfo.PropagandaMaterialsVo; @@ -101,21 +100,26 @@ public class HomePageServiceImpl implements HomePageService { if (CollectionUtils.isEmpty(myFollowUpList)) { return pageServiceUtil.getDataTable(new ArrayList<>()); } + List myFollowUpVOS = new ArrayList<>(); for (MyFollowUpVO myFollowUpVO : myFollowUpList) { - if (Objects.nonNull(myFollowUpVO) && Objects.nonNull(myFollowUpVO.getDischargeTime())) { + 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()); } myFollowUpVO.setFollowName(myFollowUpVO.getManageRouteNodeName() + myFollowUpVO.getRouteNodeDay() + "天"); + myFollowUpVOS.add(myFollowUpVO); } - myFollowUpList.sort(Comparator.comparing(MyFollowUpVO::getFollowDate).reversed()); + 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(); - myFollowUpList = myFollowUpList.stream().skip((long) (pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList()); + myFollowUpVOS = myFollowUpVOS.stream().skip((long) (pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList()); } - TableDataInfo dataTable = pageServiceUtil.getDataTable(myFollowUpList); + TableDataInfo dataTable = pageServiceUtil.getDataTable(myFollowUpVOS); dataTable.setTotal(total); return dataTable; } diff --git a/postdischarge-mobile/src/main/resources/mapper/homepage/HomePageMapper.xml b/postdischarge-mobile/src/main/resources/mapper/homepage/HomePageMapper.xml index d77e95f4..528241a5 100644 --- a/postdischarge-mobile/src/main/resources/mapper/homepage/HomePageMapper.xml +++ b/postdischarge-mobile/src/main/resources/mapper/homepage/HomePageMapper.xml @@ -51,10 +51,11 @@ WHEN spmrn.task_node_type = 'TEXT_REMIND' THEN '文字提醒' END AS manageRouteNodeName, pter.execute_time - from resident_info ri - LEFT JOIN patient_info pi ON ri.id = pi.resident_id - LEFT JOIN patient_task_execute_record pter ON pter.patient_id = pi.id - LEFT JOIN sign_patient_manage_route_node spmrn ON spmrn.id = pter.manage_route_node_id + 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 + LEFT JOIN resident_info ri ON ri.id = pi.resident_id + LEFT JOIN patient_task_execute_record pter ON spmrn.id = pter.manage_route_node_id ri.del_flag = 0 AND pi.del_flag = 0