diff --git a/src/main/resources/mapper/Archive_DetailMapper.xml b/src/main/resources/mapper/Archive_DetailMapper.xml index 43881f2..c8e27b2 100644 --- a/src/main/resources/mapper/Archive_DetailMapper.xml +++ b/src/main/resources/mapper/Archive_DetailMapper.xml @@ -116,6 +116,8 @@ from zd_assort z left join archive_detail t on z.assort_id=t.AssortID + left join archive_record_name_info + on archive_record_name_info.record_name = t.Title AND archive_record_name_info.effective = 1 INNER JOIN emr_user_reader ON z.assort_id = emr_user_reader.assort_id @@ -142,7 +144,7 @@ t.UpLoadDateTime ${order} - z.assort_sort,t.UpLoadDateTime + z.assort_sort,archive_record_name_info.record_sort,t.UpLoadDateTime @@ -179,13 +181,15 @@ select PDF_PATH,archive_detail.AssortID,archive_detail.title from archive_detail + left join archive_record_name_info + on archive_record_name_info.record_name = archive_detail.Title AND archive_record_name_info.effective = 1 left join zd_assort on zd_assort.assort_id = archive_detail.AssortID where 1=1 and flag=0 and id in (${title}) - order by zd_assort.assort_sort,archive_detail.UpLoadDateTime + order by zd_assort.assort_sort,archive_record_name_info.record_sort,archive_detail.UpLoadDateTime