diff --git a/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml index 58fd68f4..da2030d2 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml @@ -1253,6 +1253,18 @@ AND a.question_info_id = spmrn.question_info_id AND e.question_subject_id = pqsjr.question_subject_id AND f.question_subject_option_id = pqor.question_subject_option_id + + AND date_format(a.node_finish_date,'%y%m%d') >= date_format(#{taskStartTime},'%y%m%d') + + + AND date_format(a.node_finish_date,'%y%m%d') <= date_format(#{taskEndTime},'%y%m%d') + + + and( (date_format(c.visit_date, '%y%m%d') >= date_format(#{visitStartTime}, '%y%m%d') + and date_format(c.visit_date, '%y%m%d') <= date_format(#{visitEndTime}, '%y%m%d')) + or (date_format(c.discharge_time,'%y%m%d') >= date_format(#{visitStartTime}, '%y%m%d') and + date_format(c.discharge_time,'%y%m%d') <= date_format(#{visitEndTime}, '%y%m%d'))) + ) choiceNumber, ( SELECT count( 1 ) FROM sign_patient_manage_route_node a