From 3514b0a62a8cecc0af4f55fda2c2f510ccc876b9 Mon Sep 17 00:00:00 2001 From: youxilong Date: Mon, 8 Apr 2024 11:16:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=BA=E5=B7=A5=E9=9A=8F?= =?UTF-8?q?=E8=AE=BF=E4=BB=A3=E5=8A=9E=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SignPatientManageRouteServiceImpl.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroute/impl/SignPatientManageRouteServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroute/impl/SignPatientManageRouteServiceImpl.java index 2d807e04..3d6a964f 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroute/impl/SignPatientManageRouteServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroute/impl/SignPatientManageRouteServiceImpl.java @@ -208,11 +208,16 @@ public class SignPatientManageRouteServiceImpl implements ISignPatientManageRout // 新增患者管理任务执行记录 insertPatientTaskExecuteRecord(dto, routeHandlePerson, time); } else { - // 如果任务类型不是电话外呼(人工随访，问卷量表)，新增问卷提交结果表(题目，选项表)，更新节点任务表，新增患者管理任务执行记录 + // 如果任务类型不是电话外呼,更新节点任务表,新增患者管理任务执行记录,新增问卷提交结果表、题目表、选项表 + // 更新节点任务表 + updateSignPatientManageRouteNode(dto, routeHandlePerson, time); + // 新增患者管理任务执行记录 + Long taskExecuteRecordId = insertPatientTaskExecuteRecord(dto, routeHandlePerson, time); PatientQuestionSubmitResult patientQuestionSubmitResult = new PatientQuestionSubmitResult(); BeanUtils.copyBeanProp(patientQuestionSubmitResult, dto); patientQuestionSubmitResult.setCreateBy(routeHandlePerson); patientQuestionSubmitResult.setCreateTime(time); + patientQuestionSubmitResult.setTaskExecuteRecordId(taskExecuteRecordId); // 新增患者问卷提交结果 if (patientQuestionSubmitResultMapper.insertPatientQuestionSubmitResult(patientQuestionSubmitResult) <= 0) { throw new ServiceException("新增患者问卷提交结果失败"); @@ -255,11 +260,6 @@ public class SignPatientManageRouteServiceImpl implements ISignPatientManageRout if (patientQuestionOptionResultMapper.saveQuestionOptionList(saveQuestionSubjectOptions) <= 0) { throw new ServiceException("新增患者问卷题目选项提交结果失败"); } - // 更新节点任务表 - updateSignPatientManageRouteNode(dto, routeHandlePerson, time); - // 新增患者管理任务执行记录 - insertPatientTaskExecuteRecord(dto, routeHandlePerson, time); - } return AjaxResult.success(); } @@ -267,7 +267,7 @@ public class SignPatientManageRouteServiceImpl implements ISignPatientManageRout /** * 新增患者管理任务执行记录 */ - private void insertPatientTaskExecuteRecord(PatientQuestionSubmitResultDTO dto, String routeHandlePerson, LocalDateTime time) { + private Long insertPatientTaskExecuteRecord(PatientQuestionSubmitResultDTO dto, String routeHandlePerson, LocalDateTime time) { PatientTaskExecuteRecord patientTaskExecuteRecord = new PatientTaskExecuteRecord(); BeanUtils.copyProperties(dto, patientTaskExecuteRecord); patientTaskExecuteRecord.setTaskContent(dto.getTaskType()); @@ -276,11 +276,12 @@ public class SignPatientManageRouteServiceImpl implements ISignPatientManageRout patientTaskExecuteRecord.setExecuteType(TaskCreateTypeConstant.MANUAL_CREATE); patientTaskExecuteRecord.setCreateBy(routeHandlePerson); patientTaskExecuteRecord.setCreateTime(time); - if (patientTaskExecuteRecordMapper.insertPatientTaskExecuteRecord(patientTaskExecuteRecord) <= 0) { + if (patientTaskExecuteRecordMapper.insertPatientTaskExecuteRecord(patientTaskExecuteRecord) > 0) { + return patientTaskExecuteRecord.getId(); + } else { throw new ServiceException("新增患者管理任务记录失败"); } } - /** * 更新节点任务表 */