diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientmanageroutenode/UploadRobotPublishRecordDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientmanageroutenode/UploadRobotPublishRecordDto.java index c8108bc9..c0a4ae55 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientmanageroutenode/UploadRobotPublishRecordDto.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientmanageroutenode/UploadRobotPublishRecordDto.java @@ -92,4 +92,9 @@ public class UploadRobotPublishRecordDto extends BaseEntity { * 题目类型 */ private String questionType; + + /** + * 电话拨通情况;SUCCESS:成功;FAILURE:失败;EXPIRED:超期自动作废(如超期一周);NULL或空字符串:缺省值,表示未执行; + */ + private String phoneNodeExecuteResultStatus; } \ No newline at end of file diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/homepage/impl/SystemHomePageServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/homepage/impl/SystemHomePageServiceImpl.java index 1951ca4d..08c2cc48 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/homepage/impl/SystemHomePageServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/homepage/impl/SystemHomePageServiceImpl.java @@ -166,7 +166,7 @@ public class SystemHomePageServiceImpl implements SystemHomePageService { if (Objects.nonNull(patientAndNode.getDischargeTime())) { localDate = patientAndNode.getDischargeTime().plusDays(patientAndNode.getRouteNodeDay()); } - if (Objects.isNull(patientAndNode.getDischargeTime()) && Objects.nonNull(patientAndNode.getVisitDate())) { + if (Objects.isNull(patientAndNode.getDischargeTime()) && Objects.nonNull(patientAndNode.getVisitDate()) && Objects.nonNull(patientAndNode.getRouteNodeDay())) { localDate = patientAndNode.getVisitDate().plusDays(patientAndNode.getRouteNodeDay()); } if (Objects.isNull(localDate)) { diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/impl/PatientInfoServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/impl/PatientInfoServiceImpl.java index f8123f49..703ff087 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/impl/PatientInfoServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/impl/PatientInfoServiceImpl.java @@ -553,7 +553,7 @@ public class PatientInfoServiceImpl implements IPatientInfoService { PatientInfoImportMain patientInfoImportMainSn = new PatientInfoImportMain(); patientInfoImportMainSn.setSn(sn); patientInfoImportMainSn.setImportStatus(ImportStatusEnum.FINISHED.getInfo()); - patientInfoImportMainMapper.updatePatientInfoImportMain(patientInfoImportMainSn); + patientInfoImportMainMapper.updatePatientInfoImportMainImportStatus(patientInfoImportMainSn); String msg = "已完成数据导入!导入成功" + patientInfoImportList.size() + "条记录,失败0条记录"; if (list.size() != patientInfoImportList.size()) { int i = list.size() - patientInfoImportList.size(); @@ -658,7 +658,7 @@ public class PatientInfoServiceImpl implements IPatientInfoService { PatientInfoImportMain patientInfoImportMainSn = new PatientInfoImportMain(); patientInfoImportMainSn.setSn(patientInfoImportVO.getSn()); patientInfoImportMainSn.setImportStatus(ImportStatusEnum.FINISHED.getInfo()); - patientInfoImportMainMapper.updatePatientInfoImportMain(patientInfoImportMainSn); + patientInfoImportMainMapper.updatePatientInfoImportMainImportStatus(patientInfoImportMainSn); String msg = "已完成数据导入!导入成功" + patientInfoImports.size() + "条记录;失败0条记录"; if (patientInfoImportVO.getCount() != patientInfoImports.size()) { int minus = patientInfoImportVO.getCount() - patientInfoImports.size(); diff --git a/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml index ac1d109a..19ee7c3f 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml @@ -1183,6 +1183,9 @@ and spmrn.task_excute_type = #{taskExcuteType} + + and spmrn.phone_node_execute_result_status = #{phoneNodeExecuteResultStatus} + and spmrn.sn = #{sn}