diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/manualfollowup/ManualFollowUpDTO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/manualfollowup/ManualFollowUpDTO.java index 5ad630ce..a6bbe58e 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/manualfollowup/ManualFollowUpDTO.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/manualfollowup/ManualFollowUpDTO.java @@ -77,4 +77,6 @@ public class ManualFollowUpDTO extends BaseEntity { * 时间标识 whole:全部 today:今天及今天之前 */ private String timeSign; + + private String phoneNodeExecuteResultStatus; } 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 8d3ccfcc..25202d75 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 @@ -292,6 +292,9 @@ public class SignPatientManageRouteServiceImpl implements ISignPatientManageRout @Override @DataScope(agencyAlias = "pi", deptAlias = "pi") public List selectManualFollowUpList(ManualFollowUpDTO manualFollowUpDTO) { + if (manualFollowUpDTO.getNodeExecuteStatus().equals(NodeExecuteStatusEnum.UNEXECUTED.getInfo())){ + manualFollowUpDTO.setPhoneNodeExecuteResultStatus(null); + } List manualFollowUpVOS = signPatientManageRouteMapper.selectManualFollowUpList(manualFollowUpDTO); if (StringUtils.isNotBlank(manualFollowUpDTO.getTimeSign()) && manualFollowUpDTO.getTimeSign().equals("WHOLE")) { return manualFollowUpVOS; diff --git a/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroute/SignPatientManageRouteMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroute/SignPatientManageRouteMapper.xml index 46eb5133..272788f9 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroute/SignPatientManageRouteMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroute/SignPatientManageRouteMapper.xml @@ -390,11 +390,11 @@ AND pter.execute_time <= #{followEndTime} - + AND spmrn.manage_route_name like concat('%', #{manageRouteName}, '%') - - AND (spmrn.phone_node_execute_result_status is null or spmrn.phone_node_execute_result_status = ' ') + + AND (spmrn.phone_node_execute_result_status is null or spmrn.phone_node_execute_result_status = ' ') ${params.dataScope}