From 94931253be14d7ad05d8ca908c9e6d1286931d9b Mon Sep 17 00:00:00 2001
From: hujl <hujl@126.com>
Date: Wed, 12 Jan 2022 12:22:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=EF=BC=9A=E5=BD=93=E5=89=8D?=
 =?UTF-8?q?=E7=A7=91=E5=AE=A4=E5=BD=92=E6=A1=A3(=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E7=9A=84=E7=BB=9F=E4=B8=80=E4=B8=8D=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97=E5=9C=A8=E5=86=85)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/Archive_MasterMapper.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml
index 2acf8087..26365a5f 100644
--- a/src/main/resources/mapper/Archive_MasterMapper.xml
+++ b/src/main/resources/mapper/Archive_MasterMapper.xml
@@ -959,7 +959,7 @@
     </select>
     <select id="bbSel" parameterType="com.emr.entity.Archive_Master_Vo" resultMap="BaseResultMap">
         select a.*,ISNULL(b.name, a.dept_name) name from(select dept_name,
-        SUM(CASE WHEN ArchiveState not IN ('在院','取消入院','作废') AND Is_Valid != 1
+        SUM(CASE WHEN ArchiveState is not null and ArchiveState!='' and ArchiveState not IN ('在院','取消入院','作废')
         <choose>
             <when test="startDateTo != null and startDateTo != '' and endDateTo != null and endDateTo != ''">
                 and CONVERT(VARCHAR(10),discharge_date_time,120) between CONVERT(VARCHAR(10),#{startDateTo,jdbcType=NCHAR},120) and #{endDateTo,jdbcType=NCHAR}
@@ -972,7 +972,7 @@
             </when>
         </choose>
         AND Is_Valid != 1 THEN 1 ELSE 0 END) as checkDoctor,
-        SUM(CASE WHEN ArchiveState IN ('归档中','提交','主任退回','复审退回')
+        SUM(CASE WHEN ArchiveState is not null and ArchiveState!='' and ArchiveState IN ('归档中','提交','主任退回','复审退回')
         <choose>
             <when test="startDateTo != null and startDateTo != '' and endDateTo != null and endDateTo != ''">
                 and CONVERT(VARCHAR(10),discharge_date_time,120) between CONVERT(VARCHAR(10),#{startDateTo,jdbcType=NCHAR},120) and #{endDateTo,jdbcType=NCHAR}
@@ -985,7 +985,7 @@
             </when>
         </choose>
         AND Is_Valid != 1 THEN 1 ELSE 0 END) as lockinfo,
-        SUM(CASE WHEN ArchiveState not IN ('归档中','提交','主任退回','复审退回')
+        SUM(CASE WHEN ArchiveState is not null and ArchiveState!='' and ArchiveState not IN ('归档中','提交','主任退回','复审退回')
         <choose>
             <when test="startDateTo != null and startDateTo != '' and endDateTo != null and endDateTo != ''">
                 and CONVERT(VARCHAR(10),discharge_date_time,120) between CONVERT(VARCHAR(10),#{startDateTo,jdbcType=NCHAR},120) and #{endDateTo,jdbcType=NCHAR}
@@ -998,7 +998,7 @@
             </when>
         </choose>
         AND Is_Valid != 1 THEN 1 ELSE 0 END) as inpNo,
-        SUM(CASE WHEN ArchiveState not IN ('归档中','提交','主任退回','复审退回')
+        SUM(CASE WHEN ArchiveState is not null and ArchiveState!='' and  ArchiveState not IN ('归档中','提交','主任退回','复审退回')
         <choose>
             <when test="startDateTo != null and startDateTo != '' and endDateTo != null and endDateTo != ''">
                 and CONVERT(VARCHAR(10),discharge_date_time,120) between CONVERT(VARCHAR(10),#{startDateTo,jdbcType=NCHAR},120) and #{endDateTo,jdbcType=NCHAR}
@@ -1049,7 +1049,7 @@
            select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where typeCode='dept_code' )
         ) E
         ON U.dept_name=E.code
-        <where> 1=1 and U.ArchiveState in('归档中','提交','主任退回','复审退回')
+        <where> 1=1 and U.ArchiveState in('归档中','提交','主任退回','复审退回') AND U.Is_Valid != 1
             <if test="remark!= null and remark!= ''">
                 and CEILING(DATEDIFF(hour,U.discharge_date_time,GETDATE())/24.00)>#{remark,jdbcType=NCHAR}
             </if>