diff --git a/src/main/resources/mapper/approve/Emr_Apply_ApproveMapper.xml b/src/main/resources/mapper/approve/Emr_Apply_ApproveMapper.xml
index cd96d1d..03bc5e4 100644
--- a/src/main/resources/mapper/approve/Emr_Apply_ApproveMapper.xml
+++ b/src/main/resources/mapper/approve/Emr_Apply_ApproveMapper.xml
@@ -545,7 +545,7 @@
ON
a.patient_id = c.patient_id
LEFT JOIN
- (select code,Name from emr_dictionary where parent_id = (select id from emr_dictionary where typeCode = 'apply_type')) emr_dictionary
+ (select code,Name from emr_dictionary where parent_id = 'apply_type') emr_dictionary
ON
a.apply_type = emr_dictionary.code
LEFT JOIN
@@ -554,7 +554,7 @@
a.patient_id = emr_lock.patient_id
AND emr_lock.lock_state = 1
- a.id IN (${checks})
+ AND a.id IN (${checks})
diff --git a/src/main/resources/mapper/commomSearch/ScanPathMapper.xml b/src/main/resources/mapper/commomSearch/ScanPathMapper.xml
index 92f24d9..67a6f21 100644
--- a/src/main/resources/mapper/commomSearch/ScanPathMapper.xml
+++ b/src/main/resources/mapper/commomSearch/ScanPathMapper.xml
@@ -59,6 +59,7 @@
dbo.zd_assort.assort_id = dbo.t_scan_assort.assort_id
dbo.commomtable.patient_id in (${patientIds})
+ AND t_scan_assort.is_del != 1
AND dbo.t_scan_assort.scan_page in (${assortIds})