xinyilu/PostDischargePatientManage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

任务代办修改

Browse Source
This commit is contained in:
zhangheng 2024-07-30 16:12:18 +08:00
parent fcac221026
commit ce17d4606d
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
postdischarge-manage/src/main/java/com/xinelu/manage/dto/manualfollowup/ManualFollowUpDTO.java
View File

@ -77,4 +77,6 @@ public class ManualFollowUpDTO extends BaseEntity {
* 时间标识 whole：全部 today：今天及今天之前 * 时间标识 whole：全部 today：今天及今天之前
*/ */
private String timeSign; private String timeSign;
private String phoneNodeExecuteResultStatus;
} }

3
postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroute/impl/SignPatientManageRouteServiceImpl.java
View File

@ -292,6 +292,9 @@ public class SignPatientManageRouteServiceImpl implements ISignPatientManageRout
@Override @Override
@DataScope(agencyAlias = "pi", deptAlias = "pi") @DataScope(agencyAlias = "pi", deptAlias = "pi")
public List<ManualFollowUpVO> selectManualFollowUpList(ManualFollowUpDTO manualFollowUpDTO) { public List<ManualFollowUpVO> selectManualFollowUpList(ManualFollowUpDTO manualFollowUpDTO) {
if (manualFollowUpDTO.getNodeExecuteStatus().equals(NodeExecuteStatusEnum.UNEXECUTED.getInfo())){
manualFollowUpDTO.setPhoneNodeExecuteResultStatus(null);
}
List<ManualFollowUpVO> manualFollowUpVOS = signPatientManageRouteMapper.selectManualFollowUpList(manualFollowUpDTO); List<ManualFollowUpVO> manualFollowUpVOS = signPatientManageRouteMapper.selectManualFollowUpList(manualFollowUpDTO);
if (StringUtils.isNotBlank(manualFollowUpDTO.getTimeSign()) && manualFollowUpDTO.getTimeSign().equals("WHOLE")) { if (StringUtils.isNotBlank(manualFollowUpDTO.getTimeSign()) && manualFollowUpDTO.getTimeSign().equals("WHOLE")) {
return manualFollowUpVOS; return manualFollowUpVOS;

6
postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroute/SignPatientManageRouteMapper.xml
View File

@ -390,11 +390,11 @@
<if test="followEndTime != null "> <if test="followEndTime != null ">
AND pter.execute_time &lt;= #{followEndTime} AND pter.execute_time &lt;= #{followEndTime}
</if> </if>
<if test="manageRouteName != null and manageRouteName != ''"> <if test="manageRouteName != null and manageRouteName != ''">
AND spmrn.manage_route_name like concat('%', #{manageRouteName}, '%') AND spmrn.manage_route_name like concat('%', #{manageRouteName}, '%')
</if> </if>
<if test="nodeExecuteStatus != null and nodeExecuteStatus = 'UNEXECUTED'"> <if test="phoneNodeExecuteResultStatus = null">
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 = ' ')
</if> </if>
<!-- 数据范围过滤 --> <!-- 数据范围过滤 -->
${params.dataScope} ${params.dataScope}