From 94dcfe17122701dec22b2c7a665673e5b0fe70fb Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Fri, 20 Dec 2024 10:35:20 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=82=A3=E8=80=85=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/homepage/impl/SystemHomePageServiceImpl.java | 2 +- .../service/patientinfo/impl/PatientInfoServiceImpl.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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(); From b07d2ade483f88864ef1b701a85ea8e09edcb740 Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Fri, 20 Dec 2024 10:47:41 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A4=96=E5=91=BC=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UploadRobotPublishRecordDto.java | 5 +++++ .../SignPatientManageRouteNodeMapper.xml | 3 +++ 2 files changed, 8 insertions(+) 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/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml index f13e3155..cc12157e 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml @@ -1179,6 +1179,9 @@ and spmrn.task_excute_type = #{taskExcuteType} + + and spmrn.phone_node_execute_result_status = #{phoneNodeExecuteResultStatus} + and spmrn.sn = #{sn}