修正：当前科室归档(状态为空的统一不计算在内)

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>