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 557ad25e..44b6e659 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 @@ -209,7 +209,8 @@ public class HomePageServiceImpl implements HomePageService { patientQuestionSubmitResult.setCreateTime(time); // 新增患者问卷提交结果 if (patientQuestionSubmitResultMapper.insertPatientQuestionSubmitResult(patientQuestionSubmitResult) <= 0) { - throw new ServiceException("新增患者问卷提交结果失败"); + log.info("新增任务记录表失败"); + throw new ServiceException("问卷提交失败!"); } // 获取到患者问卷题目提交结果信息DTO List subjectResultList = dto.getSubjectResultDTOList(); @@ -229,7 +230,8 @@ public class HomePageServiceImpl implements HomePageService { } // 新增患者问卷题目提交结果 if (patientQuestionSubjectResultMapper.saveQuestionSubjectList(patientQuestionSubjectResults) < 0) { - throw new ServiceException("新增患者问卷题目提交结果失败"); + log.info("新增患者问卷题目提交结果失败"); + throw new ServiceException("问卷提交失败"); } if (CollectionUtils.isEmpty(patientQuestionOptionResults)) { return AjaxResult.success(); @@ -247,7 +249,17 @@ public class HomePageServiceImpl implements HomePageService { } // 新增患者问卷题目选项提交结果 if (patientQuestionOptionResultMapper.saveQuestionOptionList(saveQuestionSubjectOptions) < 0) { - throw new ServiceException("新增患者问卷题目选项提交结果失败"); + log.info("新增患者问卷题目选项提交结果失败"); + throw new ServiceException("问卷提交失败"); + } + SignPatientManageRouteNode signPatientManageRouteNode = new SignPatientManageRouteNode(); + signPatientManageRouteNode.setId(dto.getManageRouteNodeId()); + signPatientManageRouteNode.setRouteCheckDate(time); + signPatientManageRouteNode.setRouteHandleId(dto.getPatientId()); + signPatientManageRouteNode.setRouteHandlePerson(dto.getRouteHandlePerson()); + if (signPatientManageRouteNodeMapper.updateSignPatientManageRouteNode(signPatientManageRouteNode) < 0) { + log.info("修改签约患者管理任务路径节点表失败"); + throw new ServiceException("问卷提交失败"); } return AjaxResult.success(); } diff --git a/postdischarge-mobile/src/main/resources/mapper/homepage/HomePageMapper.xml b/postdischarge-mobile/src/main/resources/mapper/homepage/HomePageMapper.xml index e5ed6bf6..6a336c62 100644 --- a/postdischarge-mobile/src/main/resources/mapper/homepage/HomePageMapper.xml +++ b/postdischarge-mobile/src/main/resources/mapper/homepage/HomePageMapper.xml @@ -170,6 +170,8 @@ LEFT JOIN patient_task_execute_record pter ON pter.manage_route_node_id = spmrn.id where pi.resident_id = #{residentId} and spmrn.node_execute_status = #{nodeExecuteStatus} + and spmrn.applet_node_execute_result_status = 'SUCCESS' + and spmrn.applet_push_sign = 1 and spmrn.del_flag = 0 and pi.del_flag = 0 and (spmrn.task_node_type = 'PROPAGANDA_ARTICLE' or spmrn.task_node_type = 'TEXT_REMIND' or @@ -181,13 +183,15 @@ resultType="com.xinelu.manage.domain.patienttaskexecuterecord.PatientTaskExecuteRecord"> select spmr.patient_id, spmr.patient_name, - spmr.id manageRouteId, - spmrn.id manageRouteNodeId, - spmrn.manage_route_name manageRouteName, - spmrn.route_node_name manageRouteNodeName, - spmrn.task_node_type taskNodeType + spmr.id manageRouteId, + spmrn.id manageRouteNodeId, + spmrn.manage_route_name manageRouteName, + spmrn.route_node_name manageRouteNodeName, + spmrn.task_node_type taskNodeType, + pi.patient_visit_record_id visitRecordId 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 where spmrn.id = #{manageRouteNodeId}