diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/aibo/impl/AIOBServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/aibo/impl/AIOBServiceImpl.java index c0953bc4..25e04f25 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/aibo/impl/AIOBServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/aibo/impl/AIOBServiceImpl.java @@ -399,10 +399,7 @@ public class AIOBServiceImpl implements IAIOBService { signPatientManageRouteNodeMapper.updateSignPatientManageRouteNode(signPatientManageRouteNode); // 重拨表任务执行状态修改 - ScriptInfoTaskInfo scriptInfoTaskInfo = new ScriptInfoTaskInfo(); - scriptInfoTaskInfo.setSignPatientManageRouteNodeId(signPatientManageRouteNode.getRouteNodeId()); - scriptInfoTaskInfo.setAiobTaskType(AiboTaskTypeContant.ACTUALTIMETASK); - scriptInfoTaskInfoMapper.updateExecuteStatusByNodeId(signPatientManageRouteNode.getRouteNodeId()); + scriptInfoTaskInfoMapper.updateExecuteStatusByNodeId(signPatientManageRouteNode.getId()); // 任务执行记录 PatientTaskExecuteRecord patientTaskExecuteRecord = new PatientTaskExecuteRecord(); @@ -419,7 +416,8 @@ public class AIOBServiceImpl implements IAIOBService { // 发送短信 if (needSendSms) { - sendSms(signPatientManageRoute.getPatientId(), signPatientManageRouteNode); + System.out.println("发送短信-------------------------------------------"); + //sendSms(signPatientManageRoute.getPatientId(), signPatientManageRouteNode); } // 重拨 if (needRedial) { @@ -661,6 +659,7 @@ public class AIOBServiceImpl implements IAIOBService { scriptInfoTaskInfo.setCreateTime(LocalDateTime.now()); scriptInfoTaskInfo.setSignPatientManageRouteNodeId(signPatientManageRouteNode.getId()); scriptInfoTaskInfo.setAiobTaskType(AiboTaskTypeContant.ACTUALTIMETASK); + scriptInfoTaskInfo.setExecuteStatus(NodeExecuteStatusEnum.UNEXECUTED.getInfo()); LocalDateTime executeTime = signPatientManageRouteNodeService.getExecuteTime(signPatientManageRouteNode.getExecuteTime(), signPatientManageRouteNode.getRouteNodeName(), signPatientManageRouteNode.getRouteNodeDay(), patientVisitRecord); scriptInfoTaskInfo.setExecuteTime(executeTime.minusMinutes(signPatientManageRouteNode.getPhoneTimeInterval())); scriptInfoTaskInfoMapper.insertScriptInfoTaskInfo(scriptInfoTaskInfo); diff --git a/postdischarge-manage/src/main/resources/mapper/manage/scriptinfotaskinfo/ScriptInfoTaskInfoMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/scriptinfotaskinfo/ScriptInfoTaskInfoMapper.xml index 49c8e665..9f4e4f9e 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/scriptinfotaskinfo/ScriptInfoTaskInfoMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/scriptinfotaskinfo/ScriptInfoTaskInfoMapper.xml @@ -25,7 +25,7 @@ execute_time, aiob_task_type, execute_status, - create_time, + create_time from script_info_task_info @@ -95,7 +95,7 @@ update script_info_task_info set execute_status = 'EXECUTED' - where signPatientManageRouteNodeId = #{signPatientManageRouteNodeId} + where sign_patient_manage_route_node_id = #{signPatientManageRouteNodeId} diff --git a/postdischarge-quartz/src/main/java/com/xinelu/quartz/task/UploadRobotPublishTask.java b/postdischarge-quartz/src/main/java/com/xinelu/quartz/task/UploadRobotPublishTask.java index bc9032cb..cee0fd75 100644 --- a/postdischarge-quartz/src/main/java/com/xinelu/quartz/task/UploadRobotPublishTask.java +++ b/postdischarge-quartz/src/main/java/com/xinelu/quartz/task/UploadRobotPublishTask.java @@ -206,6 +206,8 @@ public class UploadRobotPublishTask { // 查询需要重拨的任务 ScriptInfoTaskInfo scriptInfoTaskInfo = new ScriptInfoTaskInfo(); + scriptInfoTaskInfo.setExecuteStatus(NodeExecuteStatusEnum.UNEXECUTED.getInfo()); + scriptInfoTaskInfo.setAiobTaskType(AiboTaskTypeContant.ACTUALTIMETASK); List scriptInfoTaskInfoList = scriptInfoTaskInfoMapper.selectList(scriptInfoTaskInfo); scriptInfoTaskInfoList.forEach(taskInfo -> { SignPatientManageRouteNode node = signPatientManageRouteNodeMapper.selectSignPatientManageRouteNodeById(taskInfo.getSignPatientManageRouteNodeId()); @@ -254,7 +256,7 @@ public class UploadRobotPublishTask { actualTimeTaskDto.setRobotId(scriptInfo.getRobotPublishId()); actualTimeTaskDto.setMobile(patientInfo.getPatientPhone()); actualTimeTaskDto.setSecretType(2); - actualTimeTaskDto.setStopDate(LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))); + actualTimeTaskDto.setStopDate(LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")) + " 17:00:00"); // 查询患者画像信息 List labelFieldContentList = labelFieldContentMapper.selectByPatientId(patientInfo.getId()); // 处理变量