小程序消息列表修改

This commit is contained in:
zhangheng 2024-08-02 09:17:22 +08:00
parent 61dc861f60
commit f21a34522f
3 changed files with 8 additions and 4 deletions

View File

@ -292,13 +292,16 @@ public class SignPatientManageRouteServiceImpl implements ISignPatientManageRout
@Override
@DataScope(agencyAlias = "pi", deptAlias = "pi")
public List<ManualFollowUpVO> selectManualFollowUpList(ManualFollowUpDTO manualFollowUpDTO) {
if (manualFollowUpDTO.getNodeExecuteStatus().equals(NodeExecuteStatusEnum.UNEXECUTED.getInfo())){
if (manualFollowUpDTO.getNodeExecuteStatus().equals(NodeExecuteStatusEnum.UNEXECUTED.getInfo())) {
manualFollowUpDTO.setPhoneNodeExecuteResultStatus(null);
}
List<ManualFollowUpVO> manualFollowUpVOS = signPatientManageRouteMapper.selectManualFollowUpList(manualFollowUpDTO);
if (StringUtils.isNotBlank(manualFollowUpDTO.getTimeSign()) && manualFollowUpDTO.getTimeSign().equals("WHOLE")) {
return manualFollowUpVOS;
}
if (manualFollowUpDTO.getNodeExecuteStatus().equals(NodeExecuteStatusEnum.EXECUTED.getInfo())) {
return manualFollowUpVOS;
}
ArrayList<ManualFollowUpVO> manualFollowUps = new ArrayList<>();
for (ManualFollowUpVO manualFollowUpVO : manualFollowUpVOS) {
//判断路径节点组装数据

View File

@ -239,8 +239,8 @@
COUNT(1) num
from subscribe_message_send_record
where manage_route_node_id IN
<foreach item="manageRouteNodeId" collection="manageRouteNodeId" open="(" separator="," close=")">
#{manageRouteNodeId}
<foreach item="manageRouteNodeIds" collection="manageRouteNodeIds" open="(" separator="," close=")">
#{manageRouteNodeIds}
</foreach>
</select>
</mapper>

View File

@ -86,7 +86,8 @@
LEFT JOIN patient_question_submit_result pqsr on spmrn.id = pqsr.manage_route_node_id
WHERE qi.question_type = #{questionType}
AND qi.questionnaire_status = #{questionnaireStatus}
and pi.resident_id = #{residentId}
AND pi.resident_id = #{residentId}
AND spmrn.node_execute_status = 'EXECUTED'
ORDER BY pqsr.create_time DESC, spmrn.create_time DESC
</select>