xinyilu/PostDischargePatientManage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

小程序我的随访

Browse Source
This commit is contained in:
zhangheng 2024-07-17 17:49:00 +08:00
parent c6c6db2c86
commit c6cd94f6c8
3 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
postdischarge-mobile/src/main/java/com/xinelu/mobile/controller/homepage/HomePageController.java
View File

@ -44,7 +44,7 @@ public class HomePageController extends BaseController {
} }
/** /**
* 问卷信息 * 问卷信息（随访）
*/ */
@GetMapping("/selectQuestion") @GetMapping("/selectQuestion")
public AjaxResult selectQuestion(Long templateId) { public AjaxResult selectQuestion(Long templateId) {
@ -52,7 +52,7 @@ public class HomePageController extends BaseController {
} }
/** /**
* 问卷记录信息（消息记录） * 问卷记录信息（消息记录、我的随访）
*/ */
@GetMapping("/selectQuestionSubmit") @GetMapping("/selectQuestionSubmit")
public AjaxResult selectQuestionSubmit(Long patientQuestionSubmitResultId, Long patientTaskExecuteRecordId) { public AjaxResult selectQuestionSubmit(Long patientQuestionSubmitResultId, Long patientTaskExecuteRecordId) {

14
postdischarge-mobile/src/main/java/com/xinelu/mobile/service/homepage/Impl/HomePageServiceImpl.java
View File

@ -24,7 +24,6 @@ import com.xinelu.manage.mapper.patienttaskexecuterecord.PatientTaskExecuteRecor
import com.xinelu.manage.mapper.questioninfo.QuestionInfoMapper; import com.xinelu.manage.mapper.questioninfo.QuestionInfoMapper;
import com.xinelu.manage.mapper.questionsubject.QuestionSubjectMapper; import com.xinelu.manage.mapper.questionsubject.QuestionSubjectMapper;
import com.xinelu.manage.mapper.questionsubjectoption.QuestionSubjectOptionMapper; 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.mapper.signpatientmanageroutenode.SignPatientManageRouteNodeMapper;
import com.xinelu.manage.service.propagandainfo.IPropagandaInfoService; import com.xinelu.manage.service.propagandainfo.IPropagandaInfoService;
import com.xinelu.manage.vo.propagandainfo.PropagandaMaterialsVo; import com.xinelu.manage.vo.propagandainfo.PropagandaMaterialsVo;
@ -101,21 +100,26 @@ public class HomePageServiceImpl implements HomePageService {
if (CollectionUtils.isEmpty(myFollowUpList)) { if (CollectionUtils.isEmpty(myFollowUpList)) {
return pageServiceUtil.getDataTable(new ArrayList<>()); return pageServiceUtil.getDataTable(new ArrayList<>());
} }
List<MyFollowUpVO> myFollowUpVOS = new ArrayList<>();
for (MyFollowUpVO myFollowUpVO : myFollowUpList) { 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.setFollowDate(myFollowUpVO.getDischargeTime().plusDays(myFollowUpVO.getRouteNodeDay()));
myFollowUpVO.setManageRouteNodeName(RouteNodeNameEnum.getNameByInfo(myFollowUpVO.getRouteNodeName()).getName()); myFollowUpVO.setManageRouteNodeName(RouteNodeNameEnum.getNameByInfo(myFollowUpVO.getRouteNodeName()).getName());
} }
myFollowUpVO.setFollowName(myFollowUpVO.getManageRouteNodeName() + myFollowUpVO.getRouteNodeDay() + "天"); myFollowUpVO.setFollowName(myFollowUpVO.getManageRouteNodeName() + myFollowUpVO.getRouteNodeDay() + "天");
myFollowUpVOS.add(myFollowUpVO);
} }
myFollowUpList.sort(Comparator.comparing(MyFollowUpVO::getFollowDate).reversed()); myFollowUpVOS.sort(Comparator.comparing(MyFollowUpVO::getFollowDate).reversed());
//处理上面查询的list集合 //处理上面查询的list集合
if (Objects.nonNull(myFollowUp.getNum()) || Objects.nonNull(myFollowUp.getSize())) { if (Objects.nonNull(myFollowUp.getNum()) || Objects.nonNull(myFollowUp.getSize())) {
Integer pageNum = myFollowUp.getNum(); Integer pageNum = myFollowUp.getNum();
Integer pageSize = myFollowUp.getSize(); 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); dataTable.setTotal(total);
return dataTable; return dataTable;
} }

9
postdischarge-mobile/src/main/resources/mapper/homepage/HomePageMapper.xml
View File

@ -51,10 +51,11 @@
WHEN spmrn.task_node_type = 'TEXT_REMIND' THEN '文字提醒' WHEN spmrn.task_node_type = 'TEXT_REMIND' THEN '文字提醒'
END AS manageRouteNodeName, END AS manageRouteNodeName,
pter.execute_time pter.execute_time
from resident_info ri from sign_patient_manage_route_node spmrn
LEFT JOIN patient_info pi ON ri.id = pi.resident_id LEFT JOIN sign_patient_manage_route spmr ON spmr.id = spmrn.manage_route_id
LEFT JOIN patient_task_execute_record pter ON pter.patient_id = pi.id LEFT JOIN patient_info pi ON pi.id = spmr.patient_id
LEFT JOIN sign_patient_manage_route_node spmrn ON spmrn.id = pter.manage_route_node_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
<where> <where>
ri.del_flag = 0 AND pi.del_flag = 0 ri.del_flag = 0 AND pi.del_flag = 0
<if test="residentId != null "> <if test="residentId != null ">