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

---
 src/main/resources/mapper/Archive_MasterMapper.xml | 6 +++---
 src/main/resources/mapper/V_CountMapper.xml        | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml
index 26365a5f..aef78578 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 is not null and ArchiveState!='' and ArchiveState not IN ('在院','取消入院','作废')
+        SUM(CASE WHEN ArchiveState is not null 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}
@@ -985,7 +985,7 @@
             </when>
         </choose>
         AND Is_Valid != 1 THEN 1 ELSE 0 END) as lockinfo,
-        SUM(CASE WHEN ArchiveState is not null and ArchiveState!='' and ArchiveState not IN ('归档中','提交','主任退回','复审退回')
+        SUM(CASE WHEN ArchiveState is not null 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 is not null and ArchiveState!='' and  ArchiveState not IN ('归档中','提交','主任退回','复审退回')
+        SUM(CASE WHEN ArchiveState is not null 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}
diff --git a/src/main/resources/mapper/V_CountMapper.xml b/src/main/resources/mapper/V_CountMapper.xml
index 4b26272e..2e37aa1c 100644
--- a/src/main/resources/mapper/V_CountMapper.xml
+++ b/src/main/resources/mapper/V_CountMapper.xml
@@ -84,7 +84,7 @@
     </choose>
         AND NOT ( datepart( weekday, discharge_date_time) = 1
         OR datepart( weekday, discharge_date_time) = 7 ) THEN 1 ELSE 0 END) as inNum,
-        SUM(CASE WHEN ArchiveState NOT IN ('在院','作废') AND Is_Valid != 1
+        SUM(CASE WHEN ArchiveState NOT IN ('在院','作废','') AND Is_Valid != 1 and ArchiveState is not null
     <choose>
       <when test="startDate != null and startDate != '' and endDate != null and endDate != ''">
         and CONVERT(VARCHAR(10),discharge_date_time,120) between CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120) and #{endDate,jdbcType=NCHAR}
@@ -110,7 +110,7 @@
       </when>
     </choose>
         AND NOT (datepart( weekday, discharge_date_time) = 1 OR datepart( weekday, discharge_date_time) = 7) THEN 1 ELSE 0 END) as fileNum,
-        SUM(CASE WHEN ArchiveState NOT IN ('已归档', '已认证','作废') AND Is_Valid != 1
+        SUM(CASE WHEN ArchiveState NOT IN ('已归档', '已认证','作废','') AND Is_Valid != 1 and ArchiveState is not null
     <choose>
       <when test="startDate != null and startDate != '' and endDate != null and endDate != ''">
         and CONVERT(VARCHAR(10),discharge_date_time,120) between CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120) and #{endDate,jdbcType=NCHAR}
@@ -205,7 +205,7 @@
         death_flag,dept_admission_to,convert(varchar,admission_date_time,120) admission_date_time
         from archive_master
       <where>
-          1=1 and ArchiveState NOT IN ('已封存', '作废','在院') and Is_Valid!=1
+          1=1 and ArchiveState NOT IN ('已封存', '作废','在院','') and Is_Valid!=1 and ArchiveState is not null
           <choose>
               <when test="startDate != null and startDate != '' and endDate != null and endDate != ''">
                   and CONVERT(VARCHAR(10),discharge_date_time,120) between CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120) and #{endDate,jdbcType=NCHAR}