From 58e3b9ea31bd3ab11f13974b1fe6cf30f92fab44 Mon Sep 17 00:00:00 2001
From: zengwh <81383286@qq.com>
Date: Thu, 23 Jul 2020 17:08:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E6=9C=AA=E8=BF=87=E6=BB=A4=E5=B7=B2=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E5=92=8C=E7=94=B3=E8=AF=B7=E5=85=B3=E8=81=94=E5=AD=97=E5=85=B8?=
 =?UTF-8?q?=E8=A1=A8parentId=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/approve/Emr_Apply_ApproveMapper.xml | 4 ++--
 src/main/resources/mapper/commomSearch/ScanPathMapper.xml     | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

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