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

Merge branch '0418_小程序开发' of http://182.92.166.109:3000/zhuangyuanke/PostDischargePatientManage into 0418_小程序开发

Browse Source
This commit is contained in:
haown 2024-07-12 10:37:15 +08:00
commit 19087bbc31
3 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -722,7 +722,7 @@ public class SignPatientManageRouteServiceImpl implements ISignPatientManageRout
signPatientManageRouteNode.setManageRouteId(signPatientManageRoute.getId()); signPatientManageRouteNode.setManageRouteId(signPatientManageRoute.getId());
signPatientManageRouteNode.setManageRouteName(signPatientManageRoute.getRouteName()); signPatientManageRouteNode.setManageRouteName(signPatientManageRoute.getRouteName());
signPatientManageRouteNode.setNodeExecuteStatus(NodeExecuteStatusEnum.UNEXECUTED.getInfo()); signPatientManageRouteNode.setNodeExecuteStatus(NodeExecuteStatusEnum.UNEXECUTED.getInfo());
signPatientManageRouteNode.setTaskType(routeNode.getTaskType()); signPatientManageRouteNode.setTaskNodeType(routeNode.getTaskNodeType());
signPatientManageRouteNode.setRouteNodeName(routeNode.getRouteNodeName()); signPatientManageRouteNode.setRouteNodeName(routeNode.getRouteNodeName());
signPatientManageRouteNode.setRouteNodeDay(routeNode.getRouteNodeDay()); signPatientManageRouteNode.setRouteNodeDay(routeNode.getRouteNodeDay());
signPatientManageRouteNode.setCreateTime(LocalDateTime.now()); signPatientManageRouteNode.setCreateTime(LocalDateTime.now());

4
postdischarge-mobile/src/main/java/com/xinelu/mobile/vo/wechatofficialaccountcallback/PatientVO.java
View File

@ -50,8 +50,8 @@ public class PatientVO {
@ApiModelProperty(value = "管理路径节点时间，时间单位为：天") @ApiModelProperty(value = "管理路径节点时间，时间单位为：天")
private Integer routeNodeDay; private Integer routeNodeDay;
@ApiModelProperty(value = "任务类型") @ApiModelProperty(value = "任务节点类型")
private String taskType; private String taskNodeType;
@ApiModelProperty(value = "任务状态") @ApiModelProperty(value = "任务状态")
private String taskStatus; private String taskStatus;

30
postdischarge-mobile/src/main/resources/mapper/homepage/HomePageMapper.xml
View File

@ -112,7 +112,7 @@
select select
spmrn.manage_route_id, spmrn.manage_route_id,
spmrn.id signPatientManageRouteNodeId, spmrn.id signPatientManageRouteNodeId,
spmrn.task_type, spmrn.task_node_type,
spmrn.task_subdivision, spmrn.task_subdivision,
spmrn.manage_route_name, spmrn.manage_route_name,
spmrn.route_node_name, spmrn.route_node_name,
@ -128,17 +128,18 @@
from sign_patient_manage_route_node spmrn from sign_patient_manage_route_node spmrn
LEFT JOIN sign_patient_manage_route spmr ON spmr.id = spmrn.manage_route_id 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_info pi ON pi.id = spmr.patient_id
<where> where
<if test="patientId != null and patientId.size() > 0"> spmrn.node_execute_status = 'UNEXECUTED'
spmr.patient_id in and spmrn.del_flag = 0
<foreach item="patientId" collection="patientId" open="(" separator="," close=")"> and pi.del_flag = 0
#{patientId} and (spmrn.task_node_type = 'PROPAGANDA_ARTICLE' or spmrn.task_node_type = 'TEXT_REMIND' or
</foreach> spmrn.task_node_type = 'QUESTIONNAIRE_SCALE' and phone_dial_method = 'COMMON')
</if> <if test="patientId != null and patientId.size() > 0">
and spmrn.node_execute_status = 'UNEXECUTED' and spmr.patient_id in
and spmrn.del_flag = 0 <foreach item="patientId" collection="patientId" open="(" separator="," close=")">
and pi.del_flag = 0 #{patientId}
</where> </foreach>
</if>
</select> </select>
<update id="updateNodeExecuteStatusByIds"> <update id="updateNodeExecuteStatusByIds">
@ -162,16 +163,17 @@
spmrn.message_status, spmrn.message_status,
IF(pter.id is NULL, 0, 1) sign, IF(pter.id is NULL, 0, 1) sign,
pter.id patientTaskExecuteRecordId, pter.id patientTaskExecuteRecordId,
spmrn.task_type spmrn.task_node_type
from sign_patient_manage_route_node spmrn from sign_patient_manage_route_node spmrn
LEFT JOIN sign_patient_manage_route spmr ON spmr.id = spmrn.manage_route_id 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_info pi on pi.id = spmr.patient_id
LEFT JOIN patient_task_execute_record pter ON pter.manage_route_node_id = spmrn.id LEFT JOIN patient_task_execute_record pter ON pter.manage_route_node_id = spmrn.id
where pi.resident_id = #{residentId} where pi.resident_id = #{residentId}
and spmrn.node_execute_status = #{nodeExecuteStatus} and spmrn.node_execute_status = #{nodeExecuteStatus}
and (spmrn.applet_push_sign = 1 or spmrn.official_push_sign = 1)
and spmrn.del_flag = 0 and spmrn.del_flag = 0
and pi.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 Order BY spmrn.update_time DESC
</select> </select>