diff --git a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java
index ceb3d35f..a0f8f8d2 100644
--- a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java
+++ b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java
@@ -453,7 +453,6 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
             PageHelper.offsetPage(offset, limit);
         }
         List<Archive_Master_Vo> list = archiveMasterMapper.selectByUnfileNew(archiveMasterVo);
-        //转换科室
         Emr_Dictionary dic = new Emr_Dictionary();
         dic.setEffective(1);
         dic.setTypecode("dept_code");
@@ -462,18 +461,24 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
         for (Archive_Master_Vo archiveMaster:list)
         //转换科室
         for (int k = 0; k < dicList.size(); k++) {
-            String deptName = archiveMaster.getDeptName();
-            String dept2 = archiveMaster.getDeptAdmissionTo();
-            if (deptName.equals(dicList.get(k).getCode())) {
-                //出院科室
-                deptName = deptName.replace(deptName, dicList.get(k).getName());
-                archiveMaster.setDeptName(deptName);
+            if(StringUtils.isNotBlank(archiveMaster.getDeptName())){
+                String deptName = archiveMaster.getDeptName();
+
+                if (deptName.equals(dicList.get(k).getCode())) {
+                    //出院科室
+                    deptName = deptName.replace(deptName, dicList.get(k).getName());
+                    archiveMaster.setDeptName(deptName);
+                }
             }
-            if(dept2 != null && dept2.equals(dicList.get(k).getCode())) {
-                //入院科室dept_admission_to
-                dept2 = dept2.replace(dept2, dicList.get(k).getName());
-                archiveMaster.setDeptAdmissionTo(dept2);
+            if (StringUtils.isNotBlank(archiveMaster.getDeptAdmissionTo())){
+                String dept2 = archiveMaster.getDeptAdmissionTo();
+                if(dept2 != null && dept2.equals(dicList.get(k).getCode())) {
+                    //入院科室dept_admission_to
+                    dept2 = dept2.replace(dept2, dicList.get(k).getName());
+                    archiveMaster.setDeptAdmissionTo(dept2);
+                }
             }
+
         }
         //设置医生、护士名称和打印标识
         setNameAndPrintFlag(archiveMasterVo, list);
@@ -485,6 +490,7 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
     public OffsetLimitPage selectStorageByCol(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit) {
         PageHelper.offsetPage(offset, limit);
         List<Archive_Master_Vo> list = archiveMasterMapper.selectStorageByCol(archiveMasterVo);
+        //查询科室列表
         Emr_Dictionary dic = new Emr_Dictionary();
         dic.setEffective(1);
         dic.setTypecode("dept_code");
@@ -492,17 +498,21 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
         //转换科室
         for (Archive_Master_Vo archiveMaster:list){
             for (int k = 0; k < dicList.size(); k++) {
-                String deptName = archiveMaster.getDeptName();
-                String dept2 = archiveMaster.getDeptAdmissionTo();
-                if (deptName.equals(dicList.get(k).getCode())) {
-                    //出院科室
-                    deptName = deptName.replace(deptName, dicList.get(k).getName());
-                    archiveMaster.setDeptName(deptName);
+                if(StringUtils.isNotBlank(archiveMaster.getDeptName())){
+                    String deptName = archiveMaster.getDeptName();
+                    if (deptName.equals(dicList.get(k).getCode())) {
+                        //出院科室
+                        deptName = deptName.replace(deptName, dicList.get(k).getName());
+                        archiveMaster.setDeptName(deptName);
+                    }
                 }
-                if(dept2 != null && dept2.equals(dicList.get(k).getCode())) {
-                    //入院科室dept_admission_to
-                    dept2 = dept2.replace(dept2, dicList.get(k).getName());
-                    archiveMaster.setDeptAdmissionTo(dept2);
+                if (StringUtils.isNotBlank(archiveMaster.getDeptAdmissionTo())){
+                    String dept2 = archiveMaster.getDeptAdmissionTo();
+                    if(dept2 != null && dept2.equals(dicList.get(k).getCode())) {
+                        //入院科室dept_admission_to
+                        dept2 = dept2.replace(dept2, dicList.get(k).getName());
+                        archiveMaster.setDeptAdmissionTo(dept2);
+                    }
                 }
             }
         }
@@ -511,7 +521,34 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
 
     @Override
     public List<Archive_Master_Vo> selectStorageByCol(Archive_Master_Vo archiveMasterVo) {
-        return archiveMasterMapper.selectStorageByCol(archiveMasterVo);
+        List<Archive_Master_Vo> archiveMasterVos = archiveMasterMapper.selectStorageByCol(archiveMasterVo);
+        //查询科室列表
+        Emr_Dictionary dic = new Emr_Dictionary();
+        dic.setEffective(1);
+        dic.setTypecode("dept_code");
+        List<Emr_Dictionary> dicList = emrDictionaryService.dicByTypeCode(dic);
+        //转换科室
+        for (Archive_Master_Vo archiveMaster:archiveMasterVos){
+            for (int k = 0; k < dicList.size(); k++) {
+                if(StringUtils.isNotBlank(archiveMaster.getDeptName())){
+                    String deptName = archiveMaster.getDeptName();
+                    if (deptName.equals(dicList.get(k).getCode())) {
+                        //出院科室
+                        deptName = deptName.replace(deptName, dicList.get(k).getName());
+                        archiveMaster.setDeptName(deptName);
+                    }
+                }
+                if (StringUtils.isNotBlank(archiveMaster.getDeptAdmissionTo())){
+                    String dept2 = archiveMaster.getDeptAdmissionTo();
+                    if(dept2 != null && dept2.equals(dicList.get(k).getCode())) {
+                        //入院科室dept_admission_to
+                        dept2 = dept2.replace(dept2, dicList.get(k).getName());
+                        archiveMaster.setDeptAdmissionTo(dept2);
+                    }
+                }
+            }
+        }
+        return archiveMasterVos;
     }
 
     @Override
@@ -649,18 +686,23 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
                     }
                     //转换科室
                     for (int k = 0; k < dicList.size(); k++) {
-                        String deptName = archiveMaster.getDeptName();
-                        String dept2 = archiveMaster.getDeptAdmissionTo();
-                        if (deptName.equals(dicList.get(k).getCode())) {
-                            //出院科室
-                            deptName = deptName.replace(deptName, dicList.get(k).getName());
-                            archiveMaster.setDeptName(deptName);
+                        if (StringUtils.isNotBlank(archiveMaster.getDeptName())){
+                            String deptName = archiveMaster.getDeptName();
+                            if (deptName.equals(dicList.get(k).getCode())) {
+                                //出院科室
+                                deptName = deptName.replace(deptName, dicList.get(k).getName());
+                                archiveMaster.setDeptName(deptName);
+                            }
                         }
-                        if(dept2 != null && dept2.equals(dicList.get(k).getCode())) {
-                            //入院科室dept_admission_to
-                            dept2 = dept2.replace(dept2, dicList.get(k).getName());
-                            archiveMaster.setDeptAdmissionTo(dept2);
+                        if (StringUtils.isNotBlank(archiveMaster.getDeptAdmissionTo())){
+                            String dept2 = archiveMaster.getDeptAdmissionTo();
+                            if(dept2 != null && dept2.equals(dicList.get(k).getCode())) {
+                                //入院科室dept_admission_to
+                                dept2 = dept2.replace(dept2, dicList.get(k).getName());
+                                archiveMaster.setDeptAdmissionTo(dept2);
+                            }
                         }
+
                     }
                 }
             }
@@ -740,18 +782,24 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
                     List<Emr_Dictionary> dicList = emrDictionaryService.dicByTypeCode(dic);
                     //转换科室
                     for (int k = 0; k < dicList.size(); k++) {
-                        String deptName = archiveMaster.getDeptName();
-                        String dept2 = archiveMaster.getDeptAdmissionTo();
-                        if (deptName.equals(dicList.get(k).getCode())) {
-                            //出院科室
-                            deptName = deptName.replace(deptName, dicList.get(k).getName());
-                            archiveMaster.setDeptName(deptName);
-                        }
-                        if(dept2 != null && dept2.equals(dicList.get(k).getCode())) {
-                            //入院科室dept_admission_to
-                            dept2 = dept2.replace(dept2, dicList.get(k).getName());
-                            archiveMaster.setDeptAdmissionTo(dept2);
+                        if (StringUtils.isNotBlank(archiveMaster.getDeptName())){
+                            String deptName = archiveMaster.getDeptName();
+
+                            if (deptName.equals(dicList.get(k).getCode())) {
+                                //出院科室
+                                deptName = deptName.replace(deptName, dicList.get(k).getName());
+                                archiveMaster.setDeptName(deptName);
+                            }
                         }
+                      if (StringUtils.isNotBlank(archiveMaster.getDeptAdmissionTo())){
+                          String dept2 = archiveMaster.getDeptAdmissionTo();
+                          if(dept2 != null && dept2.equals(dicList.get(k).getCode())) {
+                              //入院科室dept_admission_to
+                              dept2 = dept2.replace(dept2, dicList.get(k).getName());
+                              archiveMaster.setDeptAdmissionTo(dept2);
+                          }
+                      }
+
                     }
                 }
             }
diff --git a/src/main/java/com/emr/service/ipml/Sign_ListServiceImpl.java b/src/main/java/com/emr/service/ipml/Sign_ListServiceImpl.java
index ffab3bf3..8eb85bb1 100644
--- a/src/main/java/com/emr/service/ipml/Sign_ListServiceImpl.java
+++ b/src/main/java/com/emr/service/ipml/Sign_ListServiceImpl.java
@@ -77,12 +77,14 @@ public class Sign_ListServiceImpl implements Sign_ListService {
                 }
                 //转换科室
                 for (int k = 0; k < dicList.size(); k++) {
-                    String deptName = sign_list_vo.getDeptName();
-                    if (deptName.equals(dicList.get(k).getCode())) {
-                        //出院科室
-                        deptName = deptName.replace(deptName, dicList.get(k).getName());
-                        sign_list_vo.setDeptName(deptName);
-                        break;
+                    if (StringUtils.isNotBlank(sign_list_vo.getDeptName())){
+                        String deptName = sign_list_vo.getDeptName();
+                        if (deptName.equals(dicList.get(k).getCode())) {
+                            //出院科室
+                            deptName = deptName.replace(deptName, dicList.get(k).getName());
+                            sign_list_vo.setDeptName(deptName);
+                            break;
+                        }
                     }
                 }
             }
diff --git a/src/main/java/com/emr/service/ipml/StatisticsServiceImpl.java b/src/main/java/com/emr/service/ipml/StatisticsServiceImpl.java
index 8f4b0c83..9489191f 100644
--- a/src/main/java/com/emr/service/ipml/StatisticsServiceImpl.java
+++ b/src/main/java/com/emr/service/ipml/StatisticsServiceImpl.java
@@ -33,10 +33,10 @@ public class StatisticsServiceImpl implements StatisticsService {
     public OffsetLimitPage getStatisticsVo(StatisticsVo statisticsVo, Integer offset, Integer limit) {
         PageHelper.offsetPage(offset, limit);
         List<StatisticsVo> statisticsVos = statisticsMapper.getStatisticsVo(statisticsVo);
-        for (StatisticsVo list:statisticsVos){
+        for (StatisticsVo list : statisticsVos) {
             int vxPrintNum = list.getVxPrintNum();
             int vxPrintNum1 = list.getVxPrintNum1();
-            list.setVxPrintNum(vxPrintNum+vxPrintNum1);
+            list.setVxPrintNum(vxPrintNum + vxPrintNum1);
             int i = statisticsMapper.getpaperlessPageNum();
             list.setPaperlessPageNum(i);
         }
@@ -86,23 +86,28 @@ public class StatisticsServiceImpl implements StatisticsService {
         for (int i = 0; i < fileStatistics.size(); i++) {
             String masterId = fileStatistics.get(i).getID();
             FileVo fileHandle = statisticsMapper.gethandleName(masterId);
-            fileStatistics.get(i).setHandleTime(fileHandle.getHandleTime());
-            fileStatistics.get(i).setHandleName(fileHandle.getHandleName());
+            if (fileHandle != null) {
+                fileStatistics.get(i).setHandleTime(fileHandle.getHandleTime());
+                fileStatistics.get(i).setHandleName(fileHandle.getHandleName());
+            }
             //替换科室
             for (int k = 0; k < dicList.size(); k++) {
-                String deptName = fileStatistics.get(i).getDeptName();
-                //入院科室dept_admission_to
-                String dept2 = fileStatistics.get(i).getDeptAdmissionTo();
-
-                if ((deptName != null && deptName.equals(dicList.get(k).getCode()))) {
-                    //出院科室
-                    deptName = deptName.replace(deptName, dicList.get(k).getName());
-                    fileStatistics.get(i).setDeptName(deptName);
+                if (StringUtils.isNotBlank(fileStatistics.get(i).getDeptName())) {
+                    String deptName = fileStatistics.get(i).getDeptName();
+                    if ((deptName != null && deptName.equals(dicList.get(k).getCode()))) {
+                        //出院科室
+                        deptName = deptName.replace(deptName, dicList.get(k).getName());
+                        fileStatistics.get(i).setDeptName(deptName);
+                    }
                 }
-                if (dept2 != null && dept2.equals(dicList.get(k).getCode())) {
-                    //入院科室
-                    dept2 = dept2.replace(dept2, dicList.get(k).getName());
-                    fileStatistics.get(i).setDeptAdmissionTo(dept2);
+                if (StringUtils.isNotBlank(fileStatistics.get(i).getDeptAdmissionTo())) {
+                    //入院科室dept_admission_to
+                    String dept2 = fileStatistics.get(i).getDeptAdmissionTo();
+                    if (dept2 != null && dept2.equals(dicList.get(k).getCode())) {
+                        //入院科室
+                        dept2 = dept2.replace(dept2, dicList.get(k).getName());
+                        fileStatistics.get(i).setDeptAdmissionTo(dept2);
+                    }
                 }
             }
         }
@@ -121,20 +126,23 @@ public class StatisticsServiceImpl implements StatisticsService {
         for (int i = 0; i < borrowingStatistics.size(); i++) {
             //替换科室
             for (int k = 0; k < dicList.size(); k++) {
-                String deptName = borrowingStatistics.get(i).getDeptName();
-                //入院科室dept_admission_to
-                String dept2 = borrowingStatistics.get(i).getDeptAdmissionTo();
-
-                if ((deptName != null && deptName.equals(dicList.get(k).getCode()))) {
-                    //出院科室
-                    deptName = deptName.replace(deptName, dicList.get(k).getName());
-                    borrowingStatistics.get(i).setDeptName(deptName);
+                if (StringUtils.isNotBlank(borrowingStatistics.get(i).getDeptName())) {
+                    String deptName = borrowingStatistics.get(i).getDeptName();
+                    if ((deptName != null && deptName.equals(dicList.get(k).getCode()))) {
+                        //出院科室
+                        deptName = deptName.replace(deptName, dicList.get(k).getName());
+                        borrowingStatistics.get(i).setDeptName(deptName);
+                    }
                 }
-                if (dept2 != null && dept2.equals(dicList.get(k).getCode())) {
-                    //入院科室
-                    dept2 = dept2.replace(dept2, dicList.get(k).getName());
-                    borrowingStatistics.get(i).setDeptAdmissionTo(dept2);
+                if (StringUtils.isNotBlank(borrowingStatistics.get(i).getDeptAdmissionTo())) {
+                    String dept2 = borrowingStatistics.get(i).getDeptAdmissionTo();
+                    if (dept2 != null && dept2.equals(dicList.get(k).getCode())) {
+                        //入院科室
+                        dept2 = dept2.replace(dept2, dicList.get(k).getName());
+                        borrowingStatistics.get(i).setDeptAdmissionTo(dept2);
+                    }
                 }
+
             }
         }
         return new OffsetLimitPage((Page) borrowingStatistics);
@@ -152,24 +160,24 @@ public class StatisticsServiceImpl implements StatisticsService {
         for (int i = 0; i < windowPrintStatistics.size(); i++) {
             //替换科室
             for (int k = 0; k < dicList.size(); k++) {
-                String deptName = windowPrintStatistics.get(i).getDeptName();
-                //入院科室dept_admission_to
-                String dept2 = windowPrintStatistics.get(i).getDeptAdmissionTo();
-
-                if ((deptName != null && deptName.equals(dicList.get(k).getCode()))) {
-                    //出院科室
-                    deptName = deptName.replace(deptName, dicList.get(k).getName());
-                    windowPrintStatistics.get(i).setDeptName(deptName);
+                if (StringUtils.isNotBlank(windowPrintStatistics.get(i).getDeptName())){
+                    String deptName = windowPrintStatistics.get(i).getDeptName();
+                    if ((deptName != null && deptName.equals(dicList.get(k).getCode()))) {
+                        //出院科室
+                        deptName = deptName.replace(deptName, dicList.get(k).getName());
+                        windowPrintStatistics.get(i).setDeptName(deptName);
+                    }
                 }
-                if (dept2 != null && dept2.equals(dicList.get(k).getCode())) {
-                    //入院科室
-                    dept2 = dept2.replace(dept2, dicList.get(k).getName());
-                    windowPrintStatistics.get(i).setDeptAdmissionTo(dept2);
+                if (StringUtils.isNotBlank(windowPrintStatistics.get(i).getDeptAdmissionTo())){
+                    //入院科室dept_admission_to
+                    String dept2 = windowPrintStatistics.get(i).getDeptAdmissionTo();
+                    if (dept2 != null && dept2.equals(dicList.get(k).getCode())) {
+                        //入院科室
+                        dept2 = dept2.replace(dept2, dicList.get(k).getName());
+                        windowPrintStatistics.get(i).setDeptAdmissionTo(dept2);
+                    }
                 }
             }
-
-
-
             //查询用户集合
             JSONArray powerUsers = powerUserService.getPowerUserList("1");
             List<Power_User_Dto> powerUserList = null;
@@ -193,7 +201,7 @@ public class StatisticsServiceImpl implements StatisticsService {
                 }
             }
         }
-        return new OffsetLimitPage((Page) windowPrintStatistics) ;
+        return new OffsetLimitPage((Page) windowPrintStatistics);
 
     }
 }
diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml
index 223c0971..01edf72d 100644
--- a/src/main/resources/mapper/Archive_MasterMapper.xml
+++ b/src/main/resources/mapper/Archive_MasterMapper.xml
@@ -2228,18 +2228,27 @@
     </select>
     <!--封存查询-->
     <select id="selectStorageByCol" parameterType="com.emr.entity.Archive_Master_Vo" resultMap="BaseResultMap2">
-        select m.id ,m.inp_no,m.visit_id,m.name,m.dept_name,CONVERT(VARCHAR(20),m.discharge_date_time,120) discharge_date_time,m.ArchiveState,m.sex,m.ID_NO,
-        m.dept_admission_to
-        ,CONVERT(VARCHAR(20),m.admission_date_time,120) admission_date_time,m.DISCHARGE_DISPOSITION,d.handle_time,d.handle_name,d.following_type
-        from(select * from Archive_Master where ArchiveState!='作废' and Is_Valid!=1 )  m
-        LEFT JOIN(
-            select master_id ,handle_time ,handle_name,following_type  from (
-            select ROW_NUMBER() over(partition by master_id order by handle_time desc) RowNum
-            ,Archive_Master_Following.*
-            from Archive_Master_Following where 1=1 ) as t1  where 1=1 and RowNum = 1 and following_type='11'
-        ) d
-        on m.id=d.master_id
-        where 1=1
+        SELECT
+        m.id ,
+        m.inp_no,
+        m.visit_id,
+        m.name,
+        m.dept_name,
+        CONVERT ( VARCHAR ( 20 ), m.discharge_date_time, 120 ) discharge_date_time,
+        m.ArchiveState,
+        m.sex,
+        m.dept_admission_to,
+        CONVERT ( VARCHAR ( 20 ), m.admission_date_time, 120 ) admission_date_time,
+        d.handle_time,
+        d.handle_name,
+        d.following_type
+        FROM
+        Archive_Master m
+        LEFT JOIN (
+        SELECT TOP 1 Archive_Master_Following.* FROM Archive_Master_Following WHERE  following_type = '11' ) AS d ON m.id= d.master_id
+        WHERE
+        ArchiveState != '作废'
+        AND Is_Valid != 1
         <if test="id != null and id != ''">
             and m.id = #{id,jdbcType=NVARCHAR}
         </if>
@@ -2596,7 +2605,7 @@
         select * from  archive_master where  id =#{id}
     </select>
     <select id="selectByInpAndVisitId" resultType="com.emr.entity.Archive_Master">
-        select patient_id,ID from  archive_master where inp_no=#{inpNo} and visit_id=#{visitId}
+        select patient_id,ID from  archive_master where inp_no=#{inpNo} and visit_id=#{visitId}  AND ArchiveState !='作废'
     </select>
     <select id="selectChildMasterId" resultType="com.emr.dto.Archive_MasterDto">
         select id,inp_no from Archive_Master where admission_date_time = #{time}
diff --git a/src/main/resources/mapper/Sign_ListMapper.xml b/src/main/resources/mapper/Sign_ListMapper.xml
index 06a28c3e..53a30489 100644
--- a/src/main/resources/mapper/Sign_ListMapper.xml
+++ b/src/main/resources/mapper/Sign_ListMapper.xml
@@ -106,6 +106,7 @@
       )
       AND m.is_sign = 1
       AND s.sysFlag = 1
+      AND m.ArchiveState !='作废'
       <if test="id != null  and id != ''"> and m.ID = #{id}</if>
       <if test="pid != null and pid != ''"> and s.pid = #{pid}</if>
       <choose>