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-08-02 09:17:22 +08:00
parent 61dc861f60
commit f21a34522f
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -292,13 +292,16 @@ 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())){ if (manualFollowUpDTO.getNodeExecuteStatus().equals(NodeExecuteStatusEnum.UNEXECUTED.getInfo())) {
manualFollowUpDTO.setPhoneNodeExecuteResultStatus(null); 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;
} }
if (manualFollowUpDTO.getNodeExecuteStatus().equals(NodeExecuteStatusEnum.EXECUTED.getInfo())) {
return manualFollowUpVOS;
}
ArrayList<ManualFollowUpVO> manualFollowUps = new ArrayList<>(); ArrayList<ManualFollowUpVO> manualFollowUps = new ArrayList<>();
for (ManualFollowUpVO manualFollowUpVO : manualFollowUpVOS) { for (ManualFollowUpVO manualFollowUpVO : manualFollowUpVOS) {
//判断路径节点，组装数据 //判断路径节点，组装数据

4
postdischarge-manage/src/main/resources/mapper/manage/subscribemessagesendrecord/SubscribeMessageSendRecordMapper.xml
View File

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

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

@ -86,7 +86,8 @@
LEFT JOIN patient_question_submit_result pqsr on spmrn.id = pqsr.manage_route_node_id LEFT JOIN patient_question_submit_result pqsr on spmrn.id = pqsr.manage_route_node_id
WHERE qi.question_type = #{questionType} WHERE qi.question_type = #{questionType}
AND qi.questionnaire_status = #{questionnaireStatus} 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 ORDER BY pqsr.create_time DESC, spmrn.create_time DESC
</select> </select>