From 81a1cfd21e039848da524ef415e351f38ffaa072 Mon Sep 17 00:00:00 2001
From: haown <454902499@qq.com>
Date: Fri, 27 Sep 2024 14:48:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=99=BE=E5=BA=A6=E5=AE=9E?=
 =?UTF-8?q?=E6=97=B6=E4=BB=BB=E5=8A=A1=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xinelu/manage/service/aibo/impl/AIOBServiceImpl.java | 9 ++++-----
 .../scriptinfotaskinfo/ScriptInfoTaskInfoMapper.xml      | 4 ++--
 .../com/xinelu/quartz/task/UploadRobotPublishTask.java   | 4 +++-
 3 files changed, 9 insertions(+), 8 deletions(-)

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
 	</sql>
 
@@ -95,7 +95,7 @@
 
 	<update id="updateExecuteStatusByNodeId" parameterType="java.lang.Long">
 		update script_info_task_info set execute_status = 'EXECUTED'
-		where signPatientManageRouteNodeId = #{signPatientManageRouteNodeId}
+		where sign_patient_manage_route_node_id = #{signPatientManageRouteNodeId}
 	</update>
 
 	<delete id="deleteScriptInfoTaskInfo">
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<ScriptInfoTaskInfo> 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<LabelFieldInfoContentVo> labelFieldContentList = labelFieldContentMapper.selectByPatientId(patientInfo.getId());
 			// 处理变量