diff --git a/src/main/java/com/emr/controller/medicalOverdueController.java b/src/main/java/com/emr/controller/medicalOverdueController.java
index 9db11161..fcf69ab4 100644
--- a/src/main/java/com/emr/controller/medicalOverdueController.java
+++ b/src/main/java/com/emr/controller/medicalOverdueController.java
@@ -341,7 +341,6 @@ public class medicalOverdueController {
    @RequestMapping(value = "/getTimeoutDay")
     public long getWorkDayBetweenStartAndEnd(GetTime getTime) throws ParseException {
        int i = archiveMasterService.selectWorkDateNum(getTime);
-       System.out.println("i:::::::::"+i);
        return i;
    }
 
diff --git a/src/main/java/com/emr/dao/Archive_MasterMapper.java b/src/main/java/com/emr/dao/Archive_MasterMapper.java
index 0e43f619..107ea887 100644
--- a/src/main/java/com/emr/dao/Archive_MasterMapper.java
+++ b/src/main/java/com/emr/dao/Archive_MasterMapper.java
@@ -156,10 +156,17 @@ public interface Archive_MasterMapper {
      */
     List<Archive_Master_Vo> selectOverdue2(Archive_Master_Vo record);
 
+    Archive_Master_Vo againTime(String masterId);
+
+//    Archive_Master_Vo againOverdueTime(String masterId);
+
 
     //封存日志
     List<Archive_Master_Vo> selectByFollowinglog(Archive_Master_Vo record);
 
+
+
+
     /**
      * 查询病案是否存在
      * */
diff --git a/src/main/java/com/emr/entity/Archive_Master_Vo.java b/src/main/java/com/emr/entity/Archive_Master_Vo.java
index e18d94b7..c0529a21 100644
--- a/src/main/java/com/emr/entity/Archive_Master_Vo.java
+++ b/src/main/java/com/emr/entity/Archive_Master_Vo.java
@@ -17,6 +17,8 @@ import java.util.List;
 public class Archive_Master_Vo {
     private String id;
 
+    private String masterId;
+
     private String patientId;
 
     private String inpNo;
@@ -104,6 +106,8 @@ public class Archive_Master_Vo {
 
     private String handleName;//handle_name
 
+    private String againTime;
+
     private String handleTime;//handle_time
 
     private String startHandleTime;
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 2b520b23..6421699d 100644
--- a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java
+++ b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java
@@ -554,6 +554,16 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
         Date date1=null;
         Date date2=null;
         Date date3=null;
+        String overdueDaysTwo = archiveMasterVo.getOverdueDaysTwo();
+        if (overdueDaysTwo.equals("")){
+            archiveMasterVo.setOverdueDaysTwo("4");
+        }else {
+            int inum = Integer.parseInt(overdueDaysTwo);
+            int inum2=inum+1;
+            String s=String.valueOf(inum2);
+            archiveMasterVo.setOverdueDaysTwo(s);
+        }
+
         List<Archive_Master_Vo> list = archiveMasterMapper.selectOverdue(archiveMasterVo);
         if(list!=null && list.size()>0) {
             //查询用户集合
@@ -581,12 +591,12 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
                     } catch (ParseException e) {
                         e.printStackTrace();
                     }
-                    System.out.println("date3::::"+date3);
                         Calendar ca1 = Calendar.getInstance();
                         Calendar ca2 = Calendar.getInstance();
                         ca1.setTime(date1);
                         ca2.setTime(date2);
                         long distanceMin =( ca2.getTimeInMillis()- ca1.getTimeInMillis())/(1000*60*60*24);
+
                         int i= (int)distanceMin;
                     archiveMasterVo.setDischargeDateTime1(date3);
 //                    Integer integer = archiveMasterMapper.selectTime1(archiveMasterVo);
@@ -661,7 +671,19 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
 
     @Override
     public OffsetLimitPage selectOverdue2(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit) {
+        DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+        Date date1=null;
+        Date date2=null;
         PageHelper.offsetPage(offset, limit);
+        String overdueDaysTwo = archiveMasterVo.getOverdueDaysTwo();
+        if (overdueDaysTwo.equals("")){
+            archiveMasterVo.setOverdueDaysTwo("4");
+        }else {
+            int inum = Integer.parseInt(overdueDaysTwo);
+            int inum2=inum+1;
+            String s=String.valueOf(inum2);
+            archiveMasterVo.setOverdueDaysTwo(s);
+        }
         List<Archive_Master_Vo> list = archiveMasterMapper.selectOverdue2(archiveMasterVo);
         if(list!=null && list.size()>0) {
             //查询用户集合
@@ -673,6 +695,27 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
             }
             //遍历赋值
             for (Archive_Master_Vo archiveMaster : list) {
+
+//                Archive_Master_Vo archive_master_vo = archiveMasterMapper.againTime(masterId);
+                String overTime1 = archiveMaster.getOverTime1();
+                String handleTime = archiveMaster.getAgainTime();
+                try {
+                    date1=format.parse(overTime1);
+                    date2=format.parse(handleTime);
+                } catch (ParseException e) {
+                    e.printStackTrace();
+                }
+                Calendar ca1 = Calendar.getInstance();
+                Calendar ca2 = Calendar.getInstance();
+                ca1.setTime(date1);
+                ca2.setTime(date2);
+                long distanceMin =( ca2.getTimeInMillis()- ca1.getTimeInMillis())/(1000*60*60*24);
+                int i= (int)distanceMin;
+                if (i>0){
+                    archiveMaster.setOverTime(i);
+                }else {
+                    archiveMaster.setOverTime(0);
+                }
                 if (null != powerUserList) {
                     //获取主管医生
                     String doctorInCharge = archiveMaster.getDoctorInCharge();
diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml
index 1d45939e..cff32a83 100644
--- a/src/main/resources/mapper/Archive_MasterMapper.xml
+++ b/src/main/resources/mapper/Archive_MasterMapper.xml
@@ -74,6 +74,7 @@
         <result column="cmt_doctor" jdbcType="INTEGER" property="cmtDoctor"/>
         <result column="cmt_nurse" jdbcType="INTEGER" property="cmtNurse"/>
         <result column="doctor_name" jdbcType="NVARCHAR" property="doctorName"/>
+        <result column="master_id" jdbcType="NVARCHAR" property="masterId"/>
         <result column="nurse_name" jdbcType="NVARCHAR" property="nurseName"/>
         <result column="cmt_doctor_date" jdbcType="NVARCHAR" property="cmtDoctorDate"/>
         <result column="cmt_nurse_date" jdbcType="NVARCHAR" property="cmtNurseDate"/>
@@ -1472,7 +1473,7 @@
         f.id,f.handle_name,f.handle_id,f.handle_time,ISNULL(DATEDIFF(dd,CONVERT(VARCHAR(20),m.discharge_date_time,23),CONVERT(VARCHAR(20),f.handle_time,23)),
         0) diffDay,
         (SELECT max(b.date)
-        FROM (select top 4 date from emr_holiday_set where date >= CONVERT (
+        FROM (select top ${overdueDaysTwo} date from emr_holiday_set where date >= CONVERT (
         VARCHAR (10),
         m.discharge_date_time,
         120
@@ -1508,12 +1509,15 @@
         LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where typeCode='dept_code' )) e
         on m.dept_admission_to=e.code
         <where> 1=1 and m.master_id!='' and m.master_id is not null
-            <if test="(overdueDaysTwo != null and overdueDaysTwo != '') and (overdueDays != null and overdueDays != '')">
-                and ISNULL( datediff(day,convert(varchar(100),m.mid_date,23),convert(varchar(100),f.handle_time,23)),0)+ISNULL(m.dayOne,0)-1-cast(#{overdueDays,jdbcType=NCHAR} as int)>=#{overdueDaysTwo,jdbcType=NCHAR}
-            </if>
-            <if test="(overdueDaysTwo != null and overdueDaysTwo != '') and (overdueDays == null or overdueDays == '')">
-                and ISNULL( datediff(day,convert(varchar(100),m.mid_date,23),convert(varchar(100),f.handle_time,23)),0)+ISNULL(m.dayOne,0)-1-3>=#{overdueDaysTwo,jdbcType=NCHAR}
-            </if>
+            <!--<if test="(overdueDaysTwo != null and overdueDaysTwo != '') ">-->
+                <!--and-->
+                <!--DATEDIFF(dd,(SELECT max(b.date)-->
+                <!--FROM (select top 4 date from emr_holiday_set where date >= CONVERT (-->
+                <!--VARCHAR (10),-->
+                <!--m.discharge_date_time,-->
+                <!--120-->
+                <!--) and flag= 1 order by date asc) as b), CONVERT(VARCHAR(20),f.handle_time,23)) >=#{overdueDaysTwo,jdbcType=NCHAR}-->
+            <!--</if>-->
             <if test="id != null and id != ''">
                 and m.id = #{id,jdbcType=NVARCHAR}
             </if>
@@ -1565,7 +1569,13 @@
     </select>
     <!-- 住院返修病历 -->
     <select id="selectOverdue2" parameterType="com.emr.entity.Archive_Master_Vo" resultMap="BaseResultMap2">
-        select f1.id,f1.following_content,f1.handle_name,CONVERT(VARCHAR(20),f1.handle_time,120) handle_time,ISNULL(DATEDIFF(dd,CONVERT(VARCHAR(20),f1.handle_time,23),CONVERT(VARCHAR(20),f2.handle_time,23)), 0) diffDay,
+        select f1.id,f1.following_content,f1.handle_name,CONVERT(VARCHAR(20),f1.handle_time,120) handle_time,ISNULL(DATEDIFF(dd,CONVERT(VARCHAR(20),f1.handle_time,23),CONVERT(VARCHAR(20),f2.handle_time,23)), 0) diffDay,f2.handle_time as againTime,
+        (SELECT max(b.date)
+        FROM (select top ${overdueDaysTwo} date from emr_holiday_set where date >= CONVERT (
+        VARCHAR (10),
+        f1.handle_time,
+        120
+        ) and flag= 1 order by date asc) as b) as overTime1,
         <if test="overdueDays != null and overdueDays != ''">
             case
             when ISNULL( datediff(day,convert(varchar(100),f2.mid_date,23),convert(varchar(100),f1.handle_time,23)),0)&lt;=0
@@ -1617,12 +1627,15 @@
         LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where typeCode='dept_code' )) e
         on m.dept_admission_to=e.code
         <where> 1=1 and m.master_id!='' and m.master_id is not null and f2.handle_time is not null
-            <if test="(overdueDaysTwo != null and overdueDaysTwo != '') and (overdueDays != null and overdueDays != '')">
-                and ISNULL( datediff(day,convert(varchar(100),f2.mid_date,23),convert(varchar(100),f1.handle_time,23)),0)+ISNULL(f2.dayOne,0)-1-cast(#{overdueDays,jdbcType=NCHAR} as int)>=#{overdueDaysTwo,jdbcType=NCHAR}
-            </if>
-            <if test="(overdueDaysTwo != null and overdueDaysTwo != '') and (overdueDays == null or overdueDays == '')">
-                and ISNULL( datediff(day,convert(varchar(100),f2.mid_date,23),convert(varchar(100),f1.handle_time,23)),0)+ISNULL(f2.dayOne,0)-1-3>=#{overdueDaysTwo,jdbcType=NCHAR}
-            </if>
+            <!--<if test="(overdueDaysTwo != null and overdueDaysTwo != '') ">-->
+                <!--and-->
+                <!--DATEDIFF(dd,(SELECT max(b.date)-->
+                <!--FROM (select top 4 date from emr_holiday_set where date >= CONVERT (-->
+                <!--VARCHAR (10),-->
+                <!--f1.handle_time,-->
+                <!--120-->
+                <!--) and flag= 1 order by date asc) as b), CONVERT(VARCHAR(20),f2.handle_time,23)) >=#{overdueDaysTwo,jdbcType=NCHAR}-->
+            <!--</if>-->
             <if test="id != null and id != ''">
                 and m.id = #{id,jdbcType=NVARCHAR}
             </if>
@@ -2191,4 +2204,18 @@
     <select id="selectTime1" resultType="java.lang.Integer" parameterType="com.emr.entity.Archive_Master_Vo">
         select  flag from emr_holiday_set where  date =#{dischargeDateTime1}
     </select>
+    <select id="againTime" resultType="com.emr.entity.Archive_Master_Vo" parameterType="java.lang.String">
+     (SELECT max(b.date)
+        FROM (select top 4 date from emr_holiday_set where date >= CONVERT (
+        VARCHAR (10),
+        ( select Max (handle_time) from Archive_Master_Following where
+        Archive_Master_Following.following_type='9' and Archive_Master_Following.master_id=#{masterId}),
+        120
+        ) and flag= 1 order by date asc) as b) as overTime1
+    from Archive_Master_Following where Archive_Master_Following.following_type='5' and Archive_Master_Following.master_id=#{masterId}
+ GROUP BY master_id
+    </select>
+
+
+
 </mapper>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp b/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp
index e88f598c..12f08e59 100644
--- a/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp
+++ b/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp
@@ -532,10 +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>
+                        <%--<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>
@@ -588,10 +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>
+                        <%--<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>
diff --git a/src/main/webapp/WEB-INF/views/medicalOverdueDir/medicalOverdueList.jsp b/src/main/webapp/WEB-INF/views/medicalOverdueDir/medicalOverdueList.jsp
index d794d0b6..e4e4ef67 100644
--- a/src/main/webapp/WEB-INF/views/medicalOverdueDir/medicalOverdueList.jsp
+++ b/src/main/webapp/WEB-INF/views/medicalOverdueDir/medicalOverdueList.jsp
@@ -228,10 +228,10 @@
                             <label>超期天数(查)>=</label>
                             <input type="text" class="input-sm form-control" id="overdueDays3" placeholder="请输入超期天数">
                         </div>
-                        <div class="form-group divCss">
-                            <label>超期天数>=</label>
-                            <input type="text" class="input-sm form-control" id="overdueDays2" placeholder="请配置超期天数(默认3)">
-                        </div>
+                        <%--<div class="form-group divCss">--%>
+                            <%--<label>超期天数>=</label>--%>
+                            <%--<input type="text" class="input-sm form-control" id="overdueDays2" placeholder="请配置超期天数(默认3)">--%>
+                        <%--</div>--%>
                         <%--<div class="form-group divCss">
                             <label>是否死亡:</label>
                             <select class="input-sm form-control" id="deathFlag">
@@ -844,6 +844,12 @@
                              return result;
                          }*/
                     },
+                    {
+                        title: '再次提交时间',
+                        field: 'againTime',
+                        align: 'center',
+                        valign: 'middle',
+                    },
                     {
                         title: '退回人',
                         field: 'handleName',
@@ -890,7 +896,7 @@
                     },
                     {
                         title: '超期天数',
-                        field: 'overdue',
+                        field: 'overTime',
                         align: 'center',
                         valign: 'middle',
                         /* formatter: function (value, row, index) {