diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml
index 79576a5f..e6d84761 100644
--- a/src/main/resources/mapper/Archive_MasterMapper.xml
+++ b/src/main/resources/mapper/Archive_MasterMapper.xml
@@ -985,7 +985,7 @@
             </when>
         </choose>
         AND Is_Valid != 1 and patindex('%B%',inp_no) = 0 and inp_no not like 'LG%' THEN 1 ELSE 0 END) as lockinfo,
-        SUM(CASE WHEN ArchiveState is not null 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 and patindex('%B%',inp_no) = 0 and inp_no not like 'LG%' THEN 1 ELSE 0 END) as inpNo,
-        SUM(CASE WHEN ArchiveState is not null 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}
@@ -1505,7 +1505,7 @@
                 convert(varchar(10),(DATEADD(DAY,2,convert(varchar(10),discharge_date_time,23))),23) mid_date
                 ,ISNULL(dbo.getWorkday(convert(varchar(10),discharge_date_time,23),convert(varchar(10),(DATEADD(DAY,3,convert(varchar(10),discharge_date_time,23))),23)) , 0) dayOne
             </if>
-            from archive_master  where 1=1 and ArchiveState!='作废' and ArchiveState!='已封存' and Is_Valid!=1
+            from archive_master  where 1=1 and ArchiveState not in('作废','已封存','取消入院') and Is_Valid!=1
         ) m
         on f.master_id=m.master_id
         LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where typeCode='dept_code' )) c
@@ -1620,8 +1620,8 @@
         )f2
         on f1.master_id=f2.master_id and f1.rowNumb=f2.rowNumb-1
         LEFT JOIN (
-        select id master_id,patient_id,inp_no,visit_id,name,dept_name,convert(varchar,discharge_date_time,120) discharge_date_time,check_doctor,first_instance,DOCTOR_IN_CHARGE,death_flag,dept_admission_to,convert(varchar,admission_date_time,120) admission_date_time
-         from archive_master  where 1=1 and ArchiveState!='作废' and ArchiveState!='已封存' and Is_Valid!=1
+            select id master_id,patient_id,inp_no,visit_id,name,dept_name,convert(varchar,discharge_date_time,120) discharge_date_time,check_doctor,first_instance,DOCTOR_IN_CHARGE,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
         ) m
         on f1.master_id=m.master_id
         LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where typeCode='dept_code' )) c