diff --git a/src/main/java/com/emr/controller/commitController.java b/src/main/java/com/emr/controller/commitController.java
index 358f5897..b9a61365 100644
--- a/src/main/java/com/emr/controller/commitController.java
+++ b/src/main/java/com/emr/controller/commitController.java
@@ -167,7 +167,7 @@ public class commitController {
     public void exportBbSelExcel(HttpServletResponse response, Archive_Master_Vo archiveMasterVo) throws Exception {
         response.setContentType("application/vnd.ms-excel;charset=UTF-8");
         String[] header = {"科室编码","科室名称","出院人数","已初审病历数","未初审病历数","超期未初审病历数"};
-        String[] fileNames = {"dept_name","name","checkDoctor","lockinfo","inpNo","visitId"};
+        String[] fileNames = {"deptName","name","checkDoctor","lockinfo","inpNo","visitId"};
         //文件名
         String fileName = "当前科室归档情况报表" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + ".xls";
         //构造excel的数据
diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml
index ce61d960..2acf8087 100644
--- a/src/main/resources/mapper/Archive_MasterMapper.xml
+++ b/src/main/resources/mapper/Archive_MasterMapper.xml
@@ -958,67 +958,122 @@
         </if>
     </select>
     <select id="bbSel" parameterType="com.emr.entity.Archive_Master_Vo" resultMap="BaseResultMap">
-        SELECT DISTINCT U.dept_name,E.name,isnull( D.checkDoctor,0) checkDoctor,isnull( A.lockinfo,0) lockinfo,isnull(B.inpNo,0) inpNo,isnull(C.visitId,0) visitId FROM (SELECT dept_name,discharge_date_time from archive_master) U
-        LEFT JOIN (
-        select s.dept_name,count(*) as lockinfo from archive_master as s where 1=1 and s.ArchiveState not in('在院','归档中','复审退回','主任退回') GROUP BY s.dept_name
-        )  A ON U.dept_name=A.dept_name
-        LEFT JOIN (
-        select dept_name,count(*) as inpNo from archive_master where 1=1 and ArchiveState in('在院','归档中','复审退回','主任退回') GROUP BY dept_name
-        )  B ON U.dept_name=B.dept_name
-        LEFT JOIN (
-        select dept_name,count(*) as visitId from archive_master where 1=1 and ArchiveState in('在院','归档中','复审退回','主任退回') and CEILING(DATEDIFF(hour,discharge_date_time,GETDATE())/24.00)>3 GROUP BY dept_name
-        )  C ON U.dept_name=C.dept_name
-        LEFT JOIN (
-        select s.dept_name,count(*) as checkDoctor from archive_master as s where 1=1 and s.ArchiveState='在院' GROUP BY s.dept_name
-        )  D ON U.dept_name=D.dept_name
-        LEFT JOIN (
-        select * from emr_dictionary
-        ) E ON U.dept_name=E.code
-        where 1=1
-        <if test="deptName!= null and deptName!= ''">
-            and U.dept_name in
-            <foreach item="item" collection="deptName.split(',')" open="(" separator="," close=")">
-                #{item}
-            </foreach>
-        </if>
+        select a.*,ISNULL(b.name, a.dept_name) name from(select dept_name,
+        SUM(CASE WHEN ArchiveState not IN ('在院','取消入院','作废') AND Is_Valid != 1
         <choose>
             <when test="startDateTo != null and startDateTo != '' and endDateTo != null and endDateTo != ''">
-                and CONVERT(varchar(100),U.discharge_date_time, 23) between #{startDateTo,jdbcType=NCHAR} and #{endDateTo,jdbcType=NCHAR}
+                and CONVERT(VARCHAR(10),discharge_date_time,120) between CONVERT(VARCHAR(10),#{startDateTo,jdbcType=NCHAR},120) and #{endDateTo,jdbcType=NCHAR}
             </when>
             <when test="startDateTo != null and startDateTo != ''">
-                and CONVERT(varchar(100),U.discharge_date_time, 23) >= #{startDateTo,jdbcType=NCHAR}
+                and CONVERT(VARCHAR(10),discharge_date_time,120) >= CONVERT(VARCHAR(10),#{startDateTo,jdbcType=NCHAR},120)
             </when>
             <when test="endDateTo != null and endDateTo != ''">
-                and CONVERT(varchar(100),U.discharge_date_time, 23) &lt;= #{endDateTo,jdbcType=NCHAR}
+                and CONVERT(VARCHAR(10),discharge_date_time,120) &lt;= #{endDateTo,jdbcType=NCHAR}
             </when>
         </choose>
-    </select>
-    <select id="bbSel2" parameterType="com.emr.entity.Archive_Master_Vo" resultMap="BaseResultMap">
-        select id,inp_no,visit_id,U.name,dept_name,E.name doctor_name,DOCTOR_IN_CHARGE,ArchiveState,CONVERT(varchar(100),admission_date_time, 120) admission_date_time,CONVERT(varchar(100),U.discharge_date_time, 120) discharge_date_time,GETDATE() nowt,CEILING(DATEDIFF(hour,U.discharge_date_time,GETDATE())/24.00)-3 nurse_name,bed_number
-        from archive_master U
-        LEFT JOIN (
-        select code,name from emr_dictionary
-        ) E
-        ON U.dept_name=E.code
-        where 1=1 and U.ArchiveState in('归档中','提交','主任退回','复审退回')
-        and CEILING(DATEDIFF(hour,U.discharge_date_time,GETDATE())/24.00)>3
-        <if test="deptName!= null and deptName!= ''">
-            and U.dept_name in
-            <foreach item="item" collection="deptName.split(',')" open="(" separator="," close=")">
-                #{item}
-            </foreach>
-        </if>
+        AND Is_Valid != 1 THEN 1 ELSE 0 END) as checkDoctor,
+        SUM(CASE WHEN ArchiveState IN ('归档中','提交','主任退回','复审退回')
         <choose>
             <when test="startDateTo != null and startDateTo != '' and endDateTo != null and endDateTo != ''">
-                and CONVERT(varchar(100),U.discharge_date_time, 23) between #{startDateTo,jdbcType=NCHAR} and #{endDateTo,jdbcType=NCHAR}
+                and CONVERT(VARCHAR(10),discharge_date_time,120) between CONVERT(VARCHAR(10),#{startDateTo,jdbcType=NCHAR},120) and #{endDateTo,jdbcType=NCHAR}
             </when>
             <when test="startDateTo != null and startDateTo != ''">
-                and CONVERT(varchar(100),U.discharge_date_time, 23) >= #{startDateTo,jdbcType=NCHAR}
+                and CONVERT(VARCHAR(10),discharge_date_time,120) >= CONVERT(VARCHAR(10),#{startDateTo,jdbcType=NCHAR},120)
             </when>
             <when test="endDateTo != null and endDateTo != ''">
-                and CONVERT(varchar(100),U.discharge_date_time, 23) &lt;= #{endDateTo,jdbcType=NCHAR}
+                and CONVERT(VARCHAR(10),discharge_date_time,120) &lt;= #{endDateTo,jdbcType=NCHAR}
             </when>
         </choose>
+        AND Is_Valid != 1 THEN 1 ELSE 0 END) as lockinfo,
+        SUM(CASE WHEN 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}
+            </when>
+            <when test="startDateTo != null and startDateTo != ''">
+                and CONVERT(VARCHAR(10),discharge_date_time,120) >= CONVERT(VARCHAR(10),#{startDateTo,jdbcType=NCHAR},120)
+            </when>
+            <when test="endDateTo != null and endDateTo != ''">
+                and CONVERT(VARCHAR(10),discharge_date_time,120) &lt;= #{endDateTo,jdbcType=NCHAR}
+            </when>
+        </choose>
+        AND Is_Valid != 1 THEN 1 ELSE 0 END) as inpNo,
+        SUM(CASE WHEN 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}
+            </when>
+            <when test="startDateTo != null and startDateTo != ''">
+                and CONVERT(VARCHAR(10),discharge_date_time,120) >= CONVERT(VARCHAR(10),#{startDateTo,jdbcType=NCHAR},120)
+            </when>
+            <when test="endDateTo != null and endDateTo != ''">
+                and CONVERT(VARCHAR(10),discharge_date_time,120) &lt;= #{endDateTo,jdbcType=NCHAR}
+            </when>
+        </choose>
+        AND Is_Valid != 1
+        <if test="remark!= null and remark!= ''">
+            and CEILING(DATEDIFF(hour,discharge_date_time,GETDATE())/24.00)>#{remark,jdbcType=NCHAR}
+        </if>
+        <if test="remark== null and remark== ''">
+            and CEILING(DATEDIFF(hour,discharge_date_time,GETDATE())/24.00)>3
+        </if>
+        THEN 1 ELSE 0 END) as visitId
+        FROM archive_master GROUP BY dept_name
+        ) a
+        left join(
+        select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where typeCode='dept_code' )
+        ) b
+        on a.dept_name=b.code
+        <where>
+            1=1
+        </where>
+        <if test="deptName!= null and deptName!= ''">
+            and a.dept_name in
+            <foreach item="item" collection="deptName.split(',')" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+    </select>
+    <select id="bbSel2" parameterType="com.emr.entity.Archive_Master_Vo" resultMap="BaseResultMap">
+        select id,inp_no,visit_id,U.name,dept_name,E.name doctor_name,DOCTOR_IN_CHARGE,ArchiveState,ISNULL(e.name, u.dept_name) doctorName,
+        CONVERT(varchar(100),admission_date_time, 120) admission_date_time,CONVERT(varchar(100),U.discharge_date_time, 120) discharge_date_time
+        ,bed_number,GETDATE() nowt,
+        <if test="remark!= null and remark!= ''">
+            CEILING(DATEDIFF(hour,U.discharge_date_time,GETDATE())/24.00)-#{remark,jdbcType=NCHAR} nurse_name
+        </if>
+        <if test="remark== null or remark== ''">
+            CEILING(DATEDIFF(hour,U.discharge_date_time,GETDATE())/24.00)-3 nurse_name
+        </if>
+        from archive_master U
+        LEFT JOIN (
+           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('归档中','提交','主任退回','复审退回')
+            <if test="remark!= null and remark!= ''">
+                and CEILING(DATEDIFF(hour,U.discharge_date_time,GETDATE())/24.00)>#{remark,jdbcType=NCHAR}
+            </if>
+            <if test="remark== null or remark== ''">
+                and CEILING(DATEDIFF(hour,U.discharge_date_time,GETDATE())/24.00)>3
+            </if>
+            <if test="deptName!= null and deptName!= ''">
+                and U.dept_name in
+                <foreach item="item" collection="deptName.split(',')" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <choose>
+                <when test="startDateTo != null and startDateTo != '' and endDateTo != null and endDateTo != ''">
+                    and CONVERT(varchar(100),U.discharge_date_time, 23) between #{startDateTo,jdbcType=NCHAR} and #{endDateTo,jdbcType=NCHAR}
+                </when>
+                <when test="startDateTo != null and startDateTo != ''">
+                    and CONVERT(varchar(100),U.discharge_date_time, 23) >= #{startDateTo,jdbcType=NCHAR}
+                </when>
+                <when test="endDateTo != null and endDateTo != ''">
+                    and CONVERT(varchar(100),U.discharge_date_time, 23) &lt;= #{endDateTo,jdbcType=NCHAR}
+                </when>
+            </choose>
+        </where>
     </select>
     <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
     delete from archive_master
diff --git a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp
index 24e746ef..d345980d 100644
--- a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp
+++ b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp
@@ -2854,15 +2854,15 @@
                 if (result.indexOf("成功") != -1) {
                     if (flag == 0) {
                         //$("#doctorModal").modal('hide');
-                       //$("#table").bootstrapTable("refresh");
+                        //$("#table").bootstrapTable("refresh");
                         toastr.success("归档医生提交成功!");
                     } else if (flag == 1) {
                         //$("#nursModal").modal('hide');
-                       // $("#table").bootstrapTable("refresh");
+                        // $("#table").bootstrapTable("refresh");
                         toastr.success("归档护士提交成功!");
                     }
                 } else {
-                   // $("#table").bootstrapTable("refresh");
+                    // $("#table").bootstrapTable("refresh");
                     toastr.warning(result);
                 }
             }
@@ -3010,10 +3010,10 @@
         format: "yyyy-mm-dd",
         language: "zh-CN"
     });
-   /* var currDate=getCurrDate();
-    var currDate30=getCurrDay30();
-    $('#startDateTo').val(currDate30);
-    $('#endDateTo').val(currDate);*/
+    /* var currDate=getCurrDate();
+     var currDate30=getCurrDay30();
+     $('#startDateTo').val(currDate30);
+     $('#endDateTo').val(currDate);*/
 
     $("#imgsClearBtn2").click(function () {
         //console.log("===清空删除页的图片===");
@@ -3784,8 +3784,8 @@
                         limit = currPageSize;
                         this.pageSize = currPageSize;
                     }
-                   // var url = window.location.href;
-                    //var deptName = url.substring(url.lastIndexOf('&') + 1).replace("depts=", "");
+                    var url = window.location.href;
+                    var deptName = url.substring(url.lastIndexOf('&') + 1).replace("depts=", "");
                     // if (deptName != null && deptName != "") {
                     //     //$("#deptName").hide();
                     //     deptName += "," + $("#deptName").val();
@@ -3795,7 +3795,6 @@
                     // if ($("#deptName").val() != null && $("#deptName").val() != "") {
                     //     deptName = $("#deptName").val();
                     // }
-                    var deptName="";
                     var len = ($("#deptName").val()).length;
                     if (len > 0) {
                         var deptNameT = $("#deptName").val();
@@ -3876,7 +3875,7 @@
                                             if(index.indexOf("cmtNurseBack") != -1) {
                                                 html = html + '<button type="button" class="btn btn-sm btn-warning nursInfoBack">归档护士撤回</button>';
                                             }
-                                            }
+                                        }
                                     }
                                 }
                                 if (index.indexOf("qxSel") != -1) {
@@ -4417,7 +4416,7 @@
                                 if (value == '提交') {
                                     a = '<span style="color:#269abc;"><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>';
+                                    a = '<span style="color:red;"><i class="glyphicon glyphicon-ban-circle" aria-hidden="true"></i>未提交</span>';
 
                                 }
                             } else {
@@ -4425,7 +4424,7 @@
                                     //有缺陷显示红色 #269abc;
                                     a = '<i class="glyphicon glyphicon-ok-circle" aria-hidden="true" style="color:#269abc;"></i><span style="color:red;">已提交</span>';
                                 } else {
-                                        a = '<span style="color:red;"><i class="glyphicon glyphicon-ban-circle" aria-hidden="true"></i>未提交</span>';
+                                    a = '<span style="color:red;"><i class="glyphicon glyphicon-ban-circle" aria-hidden="true"></i>未提交</span>';
 
                                 }
                             }
@@ -4444,7 +4443,7 @@
                                 if (value == '提交') {
                                     a = '<span style="color:#269abc;"><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>';
+                                    a = '<span style="color:red;"><i class="glyphicon glyphicon-ban-circle" aria-hidden="true"></i>未提交</span>';
 
                                 }
                             } else {
@@ -4453,7 +4452,7 @@
                                     //有缺陷显示红色
                                     a = '<i class="glyphicon glyphicon-ok-circle" aria-hidden="true" style="color:#269abc;"></i><span style="color:red;">已提交</span>';
                                 } else {
-                                        a = '<span style="color:red;"><i class="glyphicon glyphicon-ban-circle" aria-hidden="true"></i>未提交</span>';
+                                    a = '<span style="color:red;"><i class="glyphicon glyphicon-ban-circle" aria-hidden="true"></i>未提交</span>';
 
                                 }
                             }
@@ -4953,7 +4952,7 @@
                             var target = document.getElementById('delPdfBody');
                             spinner.spin(target);//给id为foo的div 中绑上spinner
                             var pdfPath = row.pdfPath;//.replaceAll("\\","/");
-                            //C:/Users/Administrator/Desktop/test/autoPdf/1617156631367.pdf							
+                            //C:/Users/Administrator/Desktop/test/autoPdf/1617156631367.pdf
                             //console.log( pdfPath );
                             if (pdfPath != "") {
                                 pdfPath = pdfPath.replace(/(\\)+/g, '/');
@@ -5103,7 +5102,8 @@
 
     //导出excel功能
     $("#excelBtn").click(function () {
-        var deptName="";
+        var url = window.location.href;
+        var deptName = url.substring(url.lastIndexOf('&') + 1).replace("depts=", "");
         var len = ($("#deptName").val()).length;
         if (len > 0) {
             var deptNameT = $("#deptName").val();
@@ -5124,7 +5124,7 @@
 
         window.location.href = "${path}/beHosp/exportExcel?inpNo=" + inpNo + "&visitId=" + visitId + "&name=" + name + "&archivestate=" + archivestate
             + "&deptName=" + deptName + "&emrCmit=" + emrCmit  + "&startDateTo=" + startDateTo + "&endDateTo=" + endDateTo
-             + "&bedNumber=" + bedNumber + "&printNum=" + printNum;//+ "&doctorInCharge=" + doctorInCharge
+            + "&bedNumber=" + bedNumber + "&printNum=" + printNum;//+ "&doctorInCharge=" + doctorInCharge
 
     });
 
@@ -5210,7 +5210,7 @@
                 $('#table2').bootstrapTable('refreshOptions', {limit: 1, offset: 10});
                 //刷新
                 $('#table2').bootstrapTable('refresh');
-                 idArr = [];
+                idArr = [];
             }
         }
     };
diff --git a/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp b/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp
index 6ba5c745..3a603a32 100644
--- a/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp
+++ b/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp
@@ -524,7 +524,7 @@
                 <!--通过审批且未过期的patientId集合-->
                 <form class="form-horizontal" id="form3">
                     <div class="form-inline">
-                        <div class="form-group divCss2" style="margin-right: 5px;">
+                        <div class="form-group divCss8" >
                             <label>出院日期:</label>
                             <div class="input-daterange input-group" id="datepicker4">
                                 <input type="text" class="input-sm form-control" name="start" id="startDateTo4"/>
@@ -532,6 +532,10 @@
                                 <input type="text" class="input-sm form-control" name="end" id="endDateTo4"/>
                             </div>
                         </div>
+                        <div class="form-group divCss8" style="margin-left: 30px;margin-right: 2px">
+                            <label>超期天数></label>
+                            <input type="text" class="input-sm form-control" id="overdue1" placeholder="请配置超期天数(默认3)">
+                        </div>
                         <button type="button" class="btn btn-primary btn-sm divCss" id="searchBtn4">查询</button>
                         <button type="button" class="btn btn-info btn-sm divCss" id="excelBtn4">条件导出</button>
                     </div>
@@ -576,7 +580,7 @@
                 <!--通过审批且未过期的patientId集合-->
                 <form class="form-horizontal" id="form5">
                     <div class="form-inline">
-                        <div class="form-group divCss2" style="margin-right: 5px;">
+                        <div class="form-group divCss8" >
                             <label>出院日期:</label>
                             <div class="input-daterange input-group" id="datepicker5">
                                 <input type="text" class="input-sm form-control" name="start" id="startDateTo5"/>
@@ -584,6 +588,10 @@
                                 <input type="text" class="input-sm form-control" name="end" id="endDateTo5"/>
                             </div>
                         </div>
+                        <div class="form-group divCss8" style="margin-left: 30px;margin-right: 2px">
+                            <label>超期天数></label>
+                            <input type="text" class="input-sm form-control" id="overdue2" placeholder="请配置超期天数(默认3)">
+                        </div>
                         <button type="button" class="btn btn-primary btn-sm divCss" id="searchBtn5">查询</button>
                         <button type="button" class="btn btn-info btn-sm divCss" id="excelBtn5">条件导出</button>
                     </div>
@@ -2422,14 +2430,32 @@
         format: "yyyy-mm-dd",
         language: "zh-CN"
     });
-   /* var currDate=getCurrDate();
-    var currDate30=getCurrDay30();
-    $('#startDateTo').val(currDate30);
-    $('#endDateTo').val(currDate);
-    $('#startDateTo4').val(currDate30);
-    $('#endDateTo4').val(currDate);
-    $('#startDateTo5').val(currDate30);
-    $('#endDateTo5').val(currDate);*/
+
+    var startDateTo = "";
+    var endDateTo = "";
+    if (($("#startDateTo").val() == "" && $("#endDateTo").val() == "") || ($("#startDateTo4").val() == "" && $("#endDateTo4").val() == "") ||($("#startDateTo5").val() == "" && $("#endDateTo5").val() == "") ) {
+        //获取当前日期
+        var myDate = new Date();
+        var nowY = myDate.getFullYear();
+        var nowM = myDate.getMonth() + 1;
+        var nowD = myDate.getDate();
+        endDateTo = nowY + "-" + (nowM < 10 ? "0" + nowM : nowM) + "-" + (nowD < 10 ? "0" + nowD : nowD);//当前日期
+
+        //获取三十天前日期
+        var lw = new Date(myDate - 1000 * 60 * 60 * 24 * 31);//最后一个数字30可改，30天的意思
+        var lastY = lw.getFullYear();
+        var lastM = lw.getMonth() + 1;
+        var lastD = lw.getDate();
+        startDateTo = lastY + "-" + (lastM < 10 ? "0" + lastM : lastM) + "-" + (lastD < 10 ? "0" + lastD : lastD);//三十天之前日期
+        // console.log(endDateTo);
+        // console.log(startDateTo);
+        $('#startDateTo4').val(startDateTo);
+        $('#endDateTo4').val(endDateTo);
+        $("#startDateTo5").val(startDateTo);
+        $("#endDateTo5").val(endDateTo);
+        $('#startDateTo').val(startDateTo);
+        $('#endDateTo').val(endDateTo);
+    }
 
     $("#imgsClearBtn2").click(function () {
         //console.log("===清空删除页的图片===");
@@ -3522,7 +3548,7 @@
                             return html;
                         }
                     }, {
-                        title: '状态',
+                        title: '归档状态',
                         field: 'archivestate',
                         align: 'center',
                         valign: 'middle',
@@ -4525,32 +4551,15 @@
                 var url = window.location.href;
                 var deptName = url.substring(url.lastIndexOf('&') + 1).replace("depts=", "");
                 //console.log(deptName);
-                var startDateTo = $("#startDateTo4").val();
-                var endDateTo = $("#endDateTo4").val();
-                if (startDateTo == "" && endDateTo == "") {
-                    //获取当前日期
-                    var myDate = new Date();
-                    var nowY = myDate.getFullYear();
-                    var nowM = myDate.getMonth() + 1;
-                    var nowD = myDate.getDate();
-                    endDateTo = nowY + "-" + (nowM < 10 ? "0" + nowM : nowM) + "-" + (nowD < 10 ? "0" + nowD : nowD);//当前日期
-
-                    //获取三十天前日期
-                    var lw = new Date(myDate - 1000 * 60 * 60 * 24 * 31);//最后一个数字30可改，30天的意思
-                    var lastY = lw.getFullYear();
-                    var lastM = lw.getMonth() + 1;
-                    var lastD = lw.getDate();
-                    startDateTo = lastY + "-" + (lastM < 10 ? "0" + lastM : lastM) + "-" + (lastD < 10 ? "0" + lastD : lastD);//三十天之前日期
-                    // console.log(endDateTo);
-                    // console.log(startDateTo);
-                }
+
                 var temp = {
                     limit: limit,     //页面大小
                     offset: offset,   //页码
                     order: params.order,      //排位命令（desc，asc）
                     deptName: deptName.toString(),
-                    startDateTo: startDateTo,
-                    endDateTo: endDateTo
+                    remark:""+$("#overdue1").val(),
+                    startDateTo: $("#startDateTo4").val(),
+                    endDateTo: $("#endDateTo4").val()
                 };
                 return temp;
             },
@@ -4581,6 +4590,7 @@
                     field: 'name',
                     align: 'left',
                     valign: 'middle',
+                    width: 200,
                 },
 
                 {
@@ -4588,27 +4598,28 @@
                     field: 'checkDoctor',
                     align: 'left',
                     valign: 'middle',
+                    width: 150
                 },
                 {
                     title: '已初审病历数',
                     field: 'lockinfo',
                     align: 'left',
                     valign: 'middle',
-                    width: 150, // 定义列的宽度，单位为像素px
+                    width: 150 // 定义列的宽度，单位为像素px
                 },
                 {
                     title: '未初审病历数',
                     field: 'inpNo',
                     align: 'center',
                     valign: 'middle',
-                    width: 50, // 定义列的宽度，单位为像素px
+                    width: 150 // 定义列的宽度，单位为像素px
                 },
                 {
                     title: '超期未初审病历数',
                     field: 'visitId',
                     align: 'center',
                     valign: 'middle',
-                    width: 80,
+                    width: 150,
                     cellStyle: function (value, row, index) {
                         return {classes: 'success'}
 
@@ -4686,32 +4697,15 @@
                 var url = window.location.href;
                 var deptName = url.substring(url.lastIndexOf('&') + 1).replace("depts=", "");
                 //console.log(deptName);
-                var startDateTo = $("#startDateTo5").val();
-                var endDateTo = $("#endDateTo5").val();
-                if (startDateTo == "" && endDateTo == "") {
-                    //获取当前日期
-                    var myDate = new Date();
-                    var nowY = myDate.getFullYear();
-                    var nowM = myDate.getMonth() + 1;
-                    var nowD = myDate.getDate();
-                    endDateTo = nowY + "-" + (nowM < 10 ? "0" + nowM : nowM) + "-" + (nowD < 10 ? "0" + nowD : nowD);//当前日期
-
-                    //获取三十天前日期
-                    var lw = new Date(myDate - 1000 * 60 * 60 * 24 * 31);//最后一个数字30可改，30天的意思
-                    var lastY = lw.getFullYear();
-                    var lastM = lw.getMonth() + 1;
-                    var lastD = lw.getDate();
-                    startDateTo = lastY + "-" + (lastM < 10 ? "0" + lastM : lastM) + "-" + (lastD < 10 ? "0" + lastD : lastD);//三十天之前日期
-                    // console.log(endDateTo);
-                    // console.log(startDateTo);
-                }
+
                 var temp = {
                     limit: limit,     //页面大小
                     offset: offset,   //页码
                     order: params.order,      //排位命令（desc，asc）
                     deptName: deptName.toString(),
-                    startDateTo: startDateTo,
-                    endDateTo: endDateTo
+                    remark:""+$("#overdue2").val(),
+                    startDateTo: $("#startDateTo5").val(),
+                    endDateTo: $("#endDateTo5").val()
                 };
                 return temp;
             },
@@ -4777,27 +4771,57 @@
                     field: 'archivestate',
                     align: 'left',
                     valign: 'middle',
+                    width: 150,
+                    formatter: function (value, row, index) {
+                        //在院  未归档  归档中  初审 已归档 已认证
+                        var a = '';
+                        var days;//= daysBetween('2016-12-01', '2016-11-02');
+                        //console.log(days+"============相差天数"+show()+row.dischargeDateTime.split(" ")[0]);
+                        if (row.dischargeDateTime != null && row.dischargeDateTime != "") {
+                            days = daysBetween(show(), row.dischargeDateTime.split(" ")[0]);
+                        }
+                       if (value == "初审") {
+                            //获取properties配置文件中的属性值
+                            var expired = <%=res.getString("expired")%>;
+                            if (days > expired) {
+                                a = '<span style="color:#8FBC8F"><i class="fa fa-check-circle-o" aria-hidden="true"></i>' + value + '<span style="color:red">(超期)</span></span>';
+                            } else {
+                                a = '<span style="color:#8FBC8F"><i class="fa fa-check-circle-o" aria-hidden="true"></i>' + value + '</span>';
+                            }
+                        } else if (value == "已认证") {
+                            a = '<span style="color:#FF7F24"><i class="fa fa-check-circle-o" aria-hidden="true"></i>' + value + '</span>';
+                        } else if (value == "复审退回") {
+                            a = '<span style="color:red"><i class="fa fa-check-circle-o" aria-hidden="true"></i>' + value + '</span>';
+                        } else if (value == "提交") {
+                            a = '<span style="color:blue"><i class="fa fa-check-circle-o" aria-hidden="true"></i>' + value + '</span>';
+                        } else if (value == "主任退回") {
+                            a = '<span style="color:#FF73FD"><i class="fa fa-check-circle-o" aria-hidden="true"></i>' + value + '</span>';
+                        }else{
+                           a = '<span style="color:#5d9c0a"><i class="fa fa-check-circle-o" aria-hidden="true"></i>' + value + '</span>';
+                       }
+                        return a;
+                    }
                 },
                 {
                     title: '主管医生',
                     field: 'doctorInCharge',
                     align: 'left',
                     valign: 'middle',
-                    width: 150, // 定义列的宽度，单位为像素px
+                    width: 150 // 定义列的宽度，单位为像素px
                 },
                 {
                     title: '入院时间',
                     field: 'admissionDateTime',
                     align: 'center',
                     valign: 'middle',
-                    width: 50, // 定义列的宽度，单位为像素px
+                    width: 260 // 定义列的宽度，单位为像素px
                 },
                 {
                     title: '超期天数',
                     field: 'nurseName',
                     align: 'center',
                     valign: 'middle',
-                    width: 80,
+                    width: 200,
                     cellStyle: function (value, row, index) {
                         return {classes: 'success'}
 
@@ -4863,6 +4887,7 @@
         var deptName = url.substring(url.lastIndexOf('&') + 1).replace("depts=", "");
         var startDateTo = $("#startDateTo4").val();
         var endDateTo = $("#endDateTo4").val();
+        var remark=""+$("#overdue1").val();
 
         if (startDateTo == "" && endDateTo == "") {
             //获取当前日期
@@ -4889,7 +4914,7 @@
             }
         }
         //deptName是否为空
-        window.location.href = "${path}/commCtr/exportBbSelExcel?deptName=" + deptName + "&startDateTo=" + startDateTo + "&endDateTo=" + endDateTo;
+        window.location.href = "${path}/commCtr/exportBbSelExcel?deptName=" + deptName + "&startDateTo=" + startDateTo + "&endDateTo=" + endDateTo+ "&remark=" + remark;
     });
 
     //导出当前科室超期excel功能
@@ -4963,8 +4988,9 @@
                 return;
             }
         }
+        var remark=""+$("#overdue2").val();
         //deptName是否为空
-        window.location.href = "${path}/commCtr/exportBbSel2Excel?deptName=" + deptName + "&startDateTo=" + startDateTo + "&endDateTo=" + endDateTo;
+        window.location.href = "${path}/commCtr/exportBbSel2Excel?deptName=" + deptName + "&startDateTo=" + startDateTo + "&endDateTo=" + endDateTo+ "&remark=" + remark;
     });
 
     var zNodes = [];
diff --git a/src/main/webapp/WEB-INF/views/medicalOverdueDir/medicalOverdueList.jsp b/src/main/webapp/WEB-INF/views/medicalOverdueDir/medicalOverdueList.jsp
index 6d49547f..786789d3 100644
--- a/src/main/webapp/WEB-INF/views/medicalOverdueDir/medicalOverdueList.jsp
+++ b/src/main/webapp/WEB-INF/views/medicalOverdueDir/medicalOverdueList.jsp
@@ -138,7 +138,7 @@
                         </div>
                         <div class="form-group divCss">
                             <label>超期天数>=</label>
-                            <input type="text" class="input-sm form-control" id="overdueDays" placeholder="请输入配置超期天数">
+                            <input type="text" class="input-sm form-control" id="overdueDays" placeholder="请配置超期天数(默认3)">
                         </div>
                         <%--<div class="form-group divCss">
                             <label>是否死亡:</label>
@@ -231,7 +231,7 @@
                         </div>
                         <div class="form-group divCss">
                             <label>超期天数>=</label>
-                            <input type="text" class="input-sm form-control" id="overdueDays2" placeholder="请输入配置超期天数">
+                            <input type="text" class="input-sm form-control" id="overdueDays2" placeholder="请配置超期天数(默认3)">
                         </div>
                         <%--<div class="form-group divCss">
                             <label>是否死亡:</label>