修改查询图片未过滤已删除和申请关联字典表parentId错误

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
         <where>
-            a.id IN (${checks})
+            AND a.id IN (${checks})
         </where>
     </select>
 

src/main/resources/mapper/commomSearch/ScanPathMapper.xml

@@ -59,6 +59,7 @@
         dbo.zd_assort.assort_id = dbo.t_scan_assort.assort_id
     <where>
         dbo.commomtable.patient_id in (${patientIds})
+		AND t_scan_assort.is_del != 1
         <if test="assortIds != null">
             AND dbo.t_scan_assort.scan_page in (${assortIds})
         </if>