diff --git a/postdischarge-mobile/src/main/java/com/xinelu/mobile/vo/wechatofficialaccountcallback/PatientVO.java b/postdischarge-mobile/src/main/java/com/xinelu/mobile/vo/wechatofficialaccountcallback/PatientVO.java index d9f15baa..a8774da3 100644 --- a/postdischarge-mobile/src/main/java/com/xinelu/mobile/vo/wechatofficialaccountcallback/PatientVO.java +++ b/postdischarge-mobile/src/main/java/com/xinelu/mobile/vo/wechatofficialaccountcallback/PatientVO.java @@ -50,8 +50,8 @@ public class PatientVO { @ApiModelProperty(value = "管理路径节点时间,时间单位为:天") private Integer routeNodeDay; - @ApiModelProperty(value = "任务类型") - private String taskType; + @ApiModelProperty(value = "任务节点类型") + private String taskNodeType; @ApiModelProperty(value = "任务状态") private String taskStatus; diff --git a/postdischarge-mobile/src/main/resources/mapper/homepage/HomePageMapper.xml b/postdischarge-mobile/src/main/resources/mapper/homepage/HomePageMapper.xml index 7a09aa79..c0406ef6 100644 --- a/postdischarge-mobile/src/main/resources/mapper/homepage/HomePageMapper.xml +++ b/postdischarge-mobile/src/main/resources/mapper/homepage/HomePageMapper.xml @@ -112,7 +112,7 @@ select spmrn.manage_route_id, spmrn.id signPatientManageRouteNodeId, - spmrn.task_type, + spmrn.task_node_type, spmrn.task_subdivision, spmrn.manage_route_name, spmrn.route_node_name, @@ -128,20 +128,18 @@ from sign_patient_manage_route_node spmrn LEFT JOIN sign_patient_manage_route spmr ON spmr.id = spmrn.manage_route_id LEFT JOIN patient_info pi ON pi.id = spmr.patient_id - - spmrn.node_execute_status = 'UNEXECUTED' - and spmrn.del_flag = 0 - and pi.del_flag = 0 - and (spmrn.task_node_type = 'PROPAGANDA_ARTICLE' or spmrn.task_node_type = 'TEXT_REMIND' or - spmrn.task_node_type = 'QUESTIONNAIRE_SCALE' and phone_dial_method = 'COMMON') - and - - and spmr.patient_id in - - #{patientId} - - - + where + spmrn.node_execute_status = 'UNEXECUTED' + and spmrn.del_flag = 0 + and pi.del_flag = 0 + and (spmrn.task_node_type = 'PROPAGANDA_ARTICLE' or spmrn.task_node_type = 'TEXT_REMIND' or + spmrn.task_node_type = 'QUESTIONNAIRE_SCALE' and phone_dial_method = 'COMMON') + + and spmr.patient_id in + + #{patientId} + + @@ -165,16 +163,17 @@ spmrn.message_status, IF(pter.id is NULL, 0, 1) sign, pter.id patientTaskExecuteRecordId, - spmrn.task_type + spmrn.task_node_type from sign_patient_manage_route_node spmrn LEFT JOIN sign_patient_manage_route spmr ON spmr.id = spmrn.manage_route_id LEFT JOIN patient_info pi on pi.id = spmr.patient_id LEFT JOIN patient_task_execute_record pter ON pter.manage_route_node_id = spmrn.id where pi.resident_id = #{residentId} and spmrn.node_execute_status = #{nodeExecuteStatus} - and (spmrn.applet_push_sign = 1 or spmrn.official_push_sign = 1) and spmrn.del_flag = 0 and pi.del_flag = 0 + and (spmrn.task_node_type = 'PROPAGANDA_ARTICLE' or spmrn.task_node_type = 'TEXT_REMIND' or + spmrn.task_node_type = 'QUESTIONNAIRE_SCALE' and phone_dial_method = 'COMMON') Order BY spmrn.update_time DESC