diff --git a/src/main/java/com/emr/controller/signListController.java b/src/main/java/com/emr/controller/signListController.java
index e27c7a76..2a55a23b 100644
--- a/src/main/java/com/emr/controller/signListController.java
+++ b/src/main/java/com/emr/controller/signListController.java
@@ -19,6 +19,7 @@ import com.emr.webservice.MedicalRecordShowBackContent.MR_FILE_INDEX_CALLBACK;
 import org.apache.axis.client.Call;
 import org.apache.axis.client.Service;
 import org.apache.axis.encoding.XMLType;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.session.Session;
 import org.apache.shiro.subject.Subject;
@@ -153,6 +154,7 @@ public class signListController {
         request.setCharacterEncoding("utf-8");
         String result="";
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        if(StringUtils.isNotBlank(archiveMasterVo.getInpNo())&&StringUtils.isNotBlank(archiveMasterVo.getVisitId())){
         List<Archive_Master> master=archiveMasterService.selectByCol(archiveMasterVo);
         Sign_List signList=new Sign_List();
         signList.setOtherInfo("强制签收");
@@ -181,6 +183,9 @@ public class signListController {
         signList.setT1(sdf.format(new Date()));
         signListService.insertSignList(signList);
         result="签收成功";
+        }else{
+            result="缺少患者住院号及住院次数";
+        }
         return result;
     }
 
diff --git a/src/main/resources/mapper/Archive_DetailMapper.xml b/src/main/resources/mapper/Archive_DetailMapper.xml
index bc3ad0c7..343aab8a 100644
--- a/src/main/resources/mapper/Archive_DetailMapper.xml
+++ b/src/main/resources/mapper/Archive_DetailMapper.xml
@@ -51,8 +51,8 @@
     <select id="selectChildByClo" resultMap="BaseResultMap3" parameterType="com.emr.entity.Archive_Detail_Vo">
         select sum(s.pageNum) pageNum from
         (select count(*) pageNum from
-        archive_detail
-        where MasterID in (select id from archive_master where inp_no LIKE '%'+(
+        archive_detail table1
+        inner join (select id from archive_master where inp_no LIKE '%'+(
         select inp_no from archive_master where 1=1
         <if test="patientId != null and patientId != ''">
             and id=#{patientId,jdbcType=VARCHAR}
@@ -63,7 +63,8 @@
       </if>)
         and patindex('%B%',inp_no) != 0
         and id!=#{patientId,jdbcType=VARCHAR}
-        )
+        ) table2
+        on table1.MasterID=table2.id
         <if test="assortId != null and assortId != ''">
             and AssortID=#{assortId,jdbcType=VARCHAR}
         </if>
@@ -75,10 +76,12 @@
 
   <select id="selectChild" resultMap="BaseResultMap2" parameterType="com.emr.entity.Archive_Detail_Vo">
      select
-    <include refid="Base_Column_List"/>
+    a.id, a.PDF_PATH, a.MasterID, a.UpLoadDateTime, a.AssortID, a.Source, a.SubAssort, a.Title, a.flag,
+    a.Sys,a.page_number,a.recover_pdf_path
      from
-    archive_detail
-    where MasterID in (select id from archive_master where inp_no like '%'+(
+    archive_detail a
+    inner join
+    (select id from archive_master where inp_no like '%'+(
     select inp_no from archive_master where 1=1
     <if test="patientId != null and patientId != ''">
       and id=#{patientId,jdbcType=VARCHAR}
@@ -89,7 +92,8 @@
     </if>)
     and patindex('%B%',inp_no) != 0
     and id!=#{patientId,jdbcType=VARCHAR}
-    )
+    ) b
+    on a.MasterID=b.id
     <if test="flag != null">
       and flag = #{flag,jdbcType=NVARCHAR}
     </if>
@@ -97,17 +101,24 @@
 
   <select id="selectChildList" resultMap="BaseResultMap" parameterType="com.emr.entity.Archive_Detail">
     select
-    <include refid="Base_Column_List"/>
+    a.id, a.PDF_PATH, a.MasterID, a.UpLoadDateTime, a.AssortID, a.Source, a.SubAssort, a.Title, a.flag,
+    a.Sys,a.page_number,a.recover_pdf_path
     from
-    archive_detail
-    where MasterID in (select id from archive_master where inp_no like '%'+(
+    archive_detail a
+    inner join
+    (select id from archive_master where inp_no like '%'+(
     select inp_no from archive_master where 1=1
     <if test="masterid != null and masterid != ''">
       and id=#{masterid,jdbcType=VARCHAR}
     </if>)+'%'
+    and visit_id=(select visit_id from Archive_Master where 1=1
+    <if test="masterid != null and masterid != ''">
+      and id=#{masterid,jdbcType=VARCHAR}
+    </if>)
     and patindex('%B%',inp_no) != 0
     and id!=#{masterid,jdbcType=VARCHAR}
-    )
+    ) b
+    on a.MasterID=b.id
     <if test="flag != null">
       and flag = #{flag,jdbcType=NVARCHAR}
     </if>
@@ -185,9 +196,8 @@
     emr_fault_detail m
     left join archive_master f
     on m.archive_detail_id=f.id
-    where 1=1 and m.back_flag= 3
     <if test="patientId != null">
-      and f.id in (select id from archive_master where inp_no like '%'+(
+      INNER JOIN (select id from archive_master where inp_no like '%'+(
       select inp_no from archive_master where 1=1
       <if test="patientId != null and patientId != ''">
         and id=#{patientId,jdbcType=VARCHAR}
@@ -200,25 +210,24 @@
       and patindex('%B%',inp_no) != 0
       union
       select id from archive_master where id=#{patientId,jdbcType=VARCHAR}
-      )
+      )table1
+      on f.id=table1.id
+      where 1=1 and m.back_flag= 3
     </if>
     ) s
     on s.id=t.MasterID
-    where 1=1
     <if test="patientId != null">
-      and t.MasterID in (select id from archive_master where inp_no like '%'+(
+      INNER JOIN(select id from archive_master where inp_no like '%'+(
       select inp_no from archive_master where 1=1
       <if test="patientId != null and patientId != ''">
         and id=#{patientId,jdbcType=VARCHAR}
       </if>
-      <if test="visit != null and patientId != ''">
-        and id=#{patientId,jdbcType=VARCHAR}
-      </if>
       )+'%'
       and patindex('%B%',inp_no) != 0
       union
       select id from archive_master where id=#{patientId,jdbcType=VARCHAR}
-      )
+      )table2
+      on t.MasterID=table2.id
     </if>
     <if test="source != null and source != '' and source!='-1'">
       and t.Source=#{source,jdbcType=VARCHAR}
diff --git a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp
index 9d4c7763..75f849fd 100644
--- a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp
+++ b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp
@@ -652,7 +652,6 @@
 
                         </div>
                         <div class="row divCss2">
-
                             <div class="col-sm-4"><input type="text" id="outDateLab" hidden/>
                                 入院科室：<label id="deptToLab" class="labCss"></label>
                             </div>
@@ -668,7 +667,9 @@
                             </div>
                             <div class="col-sm-4"><input type="text" id="outDeptLab" hidden/>
                             出院科室：<label id="outDeptToLab" class="labCss"></label>
+                            </div>
                         </div>
+                        <div class="row divCss2">
                             <div class="col-sm-4">
                                 出院日期：<label id="outDeptDateLab" class="labCss"></label>
                             </div>
@@ -676,7 +677,7 @@
                                 跟踪管理:
                                 <button type="button" class="btn btn-info btn-sm" id="getTimeline">跟踪查看</button>
                             </div>
-
+                        </div>
                         </div>
                         <div class="row divCss4">完整性审核</div>
                         <div id="wzContent"></div>
diff --git a/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp b/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp
index 4c745cf6..77916d08 100644
--- a/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp
+++ b/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp
@@ -561,13 +561,15 @@
                             <div class="col-sm-4"><input type="text" id="outDeptLab" hidden/>
                                 出院科室：<label id="outDeptToLab" class="labCss"></label>
                             </div>
-                            <div class="col-sm-4">
-                                出院日期：<label id="outDeptDateLab" class="labCss"></label>
-                            </div>
                             <%--<div class="col-sm-3">--%>
                             <%--完整性审核：--%>
                             <%--</div>--%>
                         </div>
+                        <div class="row divCss2">
+                            <div class="col-sm-4">
+                                出院日期：<label id="outDeptDateLab" class="labCss"></label>
+                            </div>
+                        </div>
                         <%--<div class="row divCss2">--%>
                         <%--&lt;%&ndash;<div class="col-sm-4">&ndash;%&gt;--%>
                         <%--&lt;%&ndash;离院方式：<label id="outHospLab" class="labCss"></label>&ndash;%&gt;--%>
diff --git a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp
index 75d3952c..44786076 100644
--- a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp
+++ b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp
@@ -3465,12 +3465,9 @@
                             if (value == "1") {
                                 showVal="已签收";
                                 colorVal="#030378;";
-                            }else if (value == "2") {
+                            }else {
                                 showVal="未签收";
                                 colorVal="#c0c0c0;";
-                            }else {
-                                showVal="未知";
-                                colorVal="red;";
                             }
                             if (redFlag == 0) {
                                 a = '<span style="color:'+colorVal+'"><i class="glyphicon glyphicon-ok-circle" aria-hidden="true"></i>'+showVal+'</span>';
diff --git a/src/main/webapp/WEB-INF/views/signListDir/signList.jsp b/src/main/webapp/WEB-INF/views/signListDir/signList.jsp
index d7be9e5d..2e9139f3 100644
--- a/src/main/webapp/WEB-INF/views/signListDir/signList.jsp
+++ b/src/main/webapp/WEB-INF/views/signListDir/signList.jsp
@@ -691,6 +691,8 @@
                 <!--通过审批且未过期的patientId集合-->
                 <%--<form class="form-horizontal" id="logForm">--%>
                 <input type="hidden" id="inpId" name="inpId">
+                <input type="hidden" id="archiveMsg" name="archiveMsg">
+                <input type="hidden" id="inpId" name="inpId">
                 <div class="row divCss8">
                     <div class="form-group"><input id="fileUrlInp" hidden/>
                         <label class="col-sm-3 control-label">标题：</label>
@@ -2167,7 +2169,7 @@
 
     function verinfyFun(){
         //强制签收
-        var signVal= $('#archiveIdSign').val();
+        var signVal= $("#archiveMsg").val();
         signVal=signVal.trim();
             var signArr=signVal.split("-");
             var inpNo=signArr[0];
@@ -2179,6 +2181,7 @@
             data: {inpNo:inpNo, visitId: visitId},
             success: function (result) {
                 $('#table').bootstrapTable('refresh');
+                document.getElementById('archiveIdSign').select();
                 toastr.success(result);
             }, error: function () {
                 toastr.error("操作失败!");
@@ -3970,10 +3973,13 @@
             data: {inpNo:inpNo, visitId: visitId, isSign:isSign},
             success: function (result) {
                 if (result.indexOf("成功")!=-1) {
+                    $('#archiveIdSign').val('');
                     //刷新
                     $('#table').bootstrapTable('refresh');
                     toastr.success(result);
                 }else if(result.indexOf("该病历归档医生或护士尚未提交")!=-1){
+                    var r=$('#archiveIdSign').val();
+                    $("#archiveMsg").val($('#archiveIdSign').val());
                     //弹窗是否强制提交
                     $('#verinfyQZModal').modal({
                         backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
@@ -3988,6 +3994,13 @@
             }
         });
     }
+    //空格事件绑定
+    $('#verinfyQZModal').bind('keyup', function(event) {
+        if (event.keyCode == "32") {
+            //空格执行查询
+            $('#verinfyQZBtn').click();
+        }
+    });
 
     //回车事件绑定
     $('#archiveIdSign').bind('keyup', function(event) {
@@ -4011,7 +4024,6 @@
             var visitId=signArr[1];
             var isSign=1;
             updateSignStateFun(inpNo,visitId,isSign);
-            $('#archiveIdSign').val('');
         }else{
             toastr.warning("签收值格式应为：住院号-住院次数!");
             return;
diff --git a/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp b/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp
index 96386f9b..8048e0b5 100644
--- a/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp
+++ b/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp
@@ -3333,9 +3333,9 @@
                         formatter: function (value, row, index) {
                             var a = "";
                             if (value == 0) {
-                                a = '<span style="color:orange;"><i class="glyphicon glyphicon-ok-circle" aria-hidden="true"></i>已审核</span>';
-                            } else {
                                 a = '<span style="color:red;"><i class="glyphicon glyphicon-ban-circle" aria-hidden="true"></i>未审核</span>';
+                            } else {
+                                a = '<span style="color:orange;"><i class="glyphicon glyphicon-ok-circle" aria-hidden="true"></i>已审核</span>';
                             }
                             return a;
                         }