diff --git a/src/main/java/com/emr/controller/faultController.java b/src/main/java/com/emr/controller/faultController.java
index 80d7531a..81fe1482 100644
--- a/src/main/java/com/emr/controller/faultController.java
+++ b/src/main/java/com/emr/controller/faultController.java
@@ -105,7 +105,7 @@ public class faultController {
                             if(faultInfo.getArchiveDetailId().equals(backInfo.getArchiveDetailId())) {
                                 if(backInfo.getCreateTime()!=null && backInfo.getCreateTime()!=""){
                                     if(backInfo.getStartDateTo()!=null && backInfo.getStartDateTo()!="" && backInfo.getEndDateTo()!=null && backInfo.getEndDateTo()!=""){
-                                        SimpleDateFormat ft = new SimpleDateFormat ("yyyy-MM-dd hh:mm:ss");
+                                        SimpleDateFormat ft = new SimpleDateFormat ("yyyy-MM-dd HH:mm:ss");
                                         Date nowTime = ft.parse(backInfo.getCreateTime());
                                         Date startTime = ft.parse(backInfo.getStartDateTo());
                                         Date endTime = ft.parse(backInfo.getEndDateTo());
@@ -152,7 +152,7 @@ public class faultController {
          System.out.println("耗时：" + (end - start) / 1000 + "秒");*/
     }
     public boolean compare(String time1,String time2) throws ParseException {
-        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Date a=sdf.parse(time1);
         Date b=sdf.parse(time2);
         //a早于b返回true
diff --git a/src/main/java/com/emr/controller/lastVerifyController.java b/src/main/java/com/emr/controller/lastVerifyController.java
index aad14c44..a32fa72d 100644
--- a/src/main/java/com/emr/controller/lastVerifyController.java
+++ b/src/main/java/com/emr/controller/lastVerifyController.java
@@ -254,15 +254,16 @@ public class lastVerifyController {
             emrFaultDetail.setCreater(username);
             emrFaultDetail.setCreateTime(nowTime);
             emrFaultDetail.setState("未召回");
-            //判断是否已经有召回记录
-            /*Emr_Fault_Vo vo=new Emr_Fault_Vo();
-            vo.setArchiveDetailId(emrFaultDetail.getArchiveDetailId());*/
+
             //暂时优化不改动流程（每次初审通过后，都会删除已有的召回记录，并插入新的未召回记录）
             bol = emrFaultDetailService.delbyCol(emrFaultDetail);
             if(bol>=0) {
                 emrFaultDetailService.insertSel(emrFaultDetail);
             }
-            /*List<Emr_Fault_Vo> list = emrFaultDetailService.selectByCol(vo);
+            /*判断是否已经有召回记录
+            Emr_Fault_Vo vo=new Emr_Fault_Vo();
+            vo.setArchiveDetailId(emrFaultDetail.getArchiveDetailId());
+            List<Emr_Fault_Vo> list = emrFaultDetailService.selectByCol(vo);
             if(list.size()>0){
                 //存在归档记录
                 bol = emrFaultDetailService.delbyCol(emrFaultDetail);
diff --git a/src/main/java/com/emr/service/ipml/Emr_Fault_DetailServiceImpl.java b/src/main/java/com/emr/service/ipml/Emr_Fault_DetailServiceImpl.java
index a66ff322..b8ec6439 100644
--- a/src/main/java/com/emr/service/ipml/Emr_Fault_DetailServiceImpl.java
+++ b/src/main/java/com/emr/service/ipml/Emr_Fault_DetailServiceImpl.java
@@ -581,7 +581,7 @@ public class Emr_Fault_DetailServiceImpl implements Emr_Fault_DetailService {
     }
 
     public boolean compare(String time1,String time2) throws ParseException{
-        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Date a=sdf.parse(time1);
         Date b=sdf.parse(time2);
         //a早于b返回true
diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml
index aef78578..ce4aef72 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 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 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 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 2e37aa1c..7649d39d 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 and ArchiveState is not null
+        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 and ArchiveState is not null
+        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}