diff --git a/src/main/resources/mapper/approve/Emr_Apply_ApproveMapper.xml b/src/main/resources/mapper/approve/Emr_Apply_ApproveMapper.xml
index 75bab3f..176bd5f 100644
--- a/src/main/resources/mapper/approve/Emr_Apply_ApproveMapper.xml
+++ b/src/main/resources/mapper/approve/Emr_Apply_ApproveMapper.xml
@@ -657,11 +657,14 @@
         approve_state = 1
     </select>
     <select id="selectCountByApproveStateIsNull" resultMap="BaseResultMap">
-        SELECT *
+        SELECT
+            emr_apply_approve.patient_id
         FROM
-        dbo.emr_apply_approve
+            dbo.emr_apply_approve
+            LEFT JOIN emr_lock ON emr_apply_approve.patient_id = emr_lock.patient_id
         WHERE
-       effe_time >= CONVERT ( VARCHAR ( 100 ), GETDATE (), 23 )
-AND ( approve_state IS NULL OR approve_state = '' )
+            effe_time >= CONVERT ( VARCHAR ( 100 ), GETDATE (), 23 )
+            AND ( approve_state IS NULL OR approve_state = '' )
+            AND ( emr_lock.lock_state = 1 OR emr_lock.lock_state IS NULL )
     </select>
 </mapper>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/approveManage/approveManageList/approveManageList174.jsp b/src/main/webapp/WEB-INF/views/approveManage/approveManageList/approveManageList174.jsp
index 6bb0fc3..5614fdb 100644
--- a/src/main/webapp/WEB-INF/views/approveManage/approveManageList/approveManageList174.jsp
+++ b/src/main/webapp/WEB-INF/views/approveManage/approveManageList/approveManageList174.jsp
@@ -233,7 +233,7 @@
                         <div class="form-group">
                             <label class="col-sm-4 control-label">有效时间：</label>
                             <div class="col-sm-7">
-                                <input type="text" class="form-control input-sm input" readonly id="effeTime">
+                                <input type="text" class="form-control input-sm input" id="effeTime" name="effeTime">
                             </div>
                             <div class="col-sm-1"></div>
                         </div>
@@ -242,7 +242,7 @@
                         <div class="form-group">
                             <label class="col-sm-4 control-label">申请天数：</label>
                             <div class="col-sm-7">
-                                <input type="number" class="form-control input-sm input" readonly id="effeDays"
+                                <input type="number" class="form-control input-sm input" id="effeDays" name="effeDays"
                                        oninput="if(value.length>4)value=value.slice(0,4)">
                             </div>
                             <div class="col-sm-1"></div>
@@ -385,6 +385,32 @@
         </div>
     </div>
 </div>
+<!-- 模态框3修改过有效日期（Modal） -->
+<div class="modal fade" id="myModal3" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
+                    &times;
+                </button>
+                <h4 class="modal-title" id="myModalLabel">
+                    确认是否修改申请者的有效日期
+                </h4>
+            </div>
+            <div class="modal-body">
+                有效日期有改动,请确认是否修改
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-primary" onclick="saveMethod('y')">
+                    确认修改
+                </button>
+                <button type="button" class="btn btn-primary" onclick="saveMethod('n')">
+                    取消修改
+                </button>
+            </div>
+        </div>
+    </div>
+</div>
 <script>
     $(function () {
         $(".modal-dialog").draggable();//为模态对话框添加拖拽
@@ -392,6 +418,7 @@
 </script>
 <script src="${path}/static/js/approveManage/approveManageList/approveManageList174.js?t=1"></script>
 <script src="${path}/static/js/commom.js"></script>
+<script src="${path}/static/js/approveManage/approveList/approveDateCommmomMethod.js"></script>
 <script src="${path}/static/js/dateUtil.js"></script>
 </body>
 </html>
diff --git a/src/main/webapp/WEB-INF/views/approveManage/collection/collectManage174.jsp b/src/main/webapp/WEB-INF/views/approveManage/collection/collectManage174.jsp
index 8a3baa7..d517c3c 100644
--- a/src/main/webapp/WEB-INF/views/approveManage/collection/collectManage174.jsp
+++ b/src/main/webapp/WEB-INF/views/approveManage/collection/collectManage174.jsp
@@ -433,7 +433,7 @@
                         <div class="form-group">
                             <label class="col-sm-4 control-label">有效时间：</label>
                             <div class="col-sm-7">
-                                <input type="text" class="form-control input" id="effeTime" name="effeTime" maxlength="10">
+                                <input type="text" class="form-control input" id="effeTime" name="effeTime" maxlength="10" autocomplete="off">
                             </div>
                             <div class="col-sm-1"></div>
                         </div>
diff --git a/src/main/webapp/WEB-INF/views/distributionManage/userDistributionManage.jsp b/src/main/webapp/WEB-INF/views/distributionManage/userDistributionManage.jsp
index 4ac43bc..623eda1 100644
--- a/src/main/webapp/WEB-INF/views/distributionManage/userDistributionManage.jsp
+++ b/src/main/webapp/WEB-INF/views/distributionManage/userDistributionManage.jsp
@@ -89,7 +89,7 @@
             <div class="col-md-3 leftDiv">
                 <div class="searcDiv">
                     <input type="text" id="key" value="" class="form-control input-sm"
-                           placeholder="工号/用户名" maxlength="16"/><br/>
+                           placeholder="用户名-姓名" maxlength="16"/><br/>
                 </div>
                 <div class="zTreeDemo">
                     <ul id="ztree" class="ztree"></ul>
diff --git a/src/main/webapp/static/js/approveManage/approveManageList/approveManageList174.js b/src/main/webapp/static/js/approveManage/approveManageList/approveManageList174.js
index 55c0b1c..792f173 100644
--- a/src/main/webapp/static/js/approveManage/approveManageList/approveManageList174.js
+++ b/src/main/webapp/static/js/approveManage/approveManageList/approveManageList174.js
@@ -232,6 +232,9 @@ function refreshTable(){
     })
 }
 
+//定义临时接收申请者的申请天数，用于判断是否申请天数有改动
+var applyDay = 0;
+var applyDate = '';
 //借阅审批
 function showApprove(id){
     //加载申请类型
@@ -257,6 +260,9 @@ function showApprove(id){
                 $("#inpatientNo").val(data.inpatientNo);
                 $("#admissTimes").val(data.admissTimes);
                 $("#name").val(data.name);
+                pickTime("effeTime",data.effeTime);
+                applyDay = data.effeDays;
+                applyDate = data.effeTime;
             }
         }
     })
@@ -286,6 +292,9 @@ function updateApprove(id){
                 $("#admissTimes").val(data.admissTimes);
                 $("#name").val(data.name);
                 $("#approveNotes").val(data.approveNotes);
+                pickTime("effeTime",data.effeTime);
+                applyDay = data.effeDays;
+                applyDate = data.effeTime;
             }
         }
     })
@@ -293,11 +302,34 @@ function updateApprove(id){
 
 //封装模态框保存公共方法，applyState:提交状态1保存未提交2已提交.msg:操作后提示信息
 function add(flag){
+    //判断是否有
     if(flag == 1){
         $("#approveState").val(1);
     }else if(flag == 2){
         $("#approveState").val(2);
     }
+    //判断申请天数是否有修改
+    var effeDays = $("#effeDays").val();
+    if(applyDay != effeDays){
+        //有改动弹窗确认是否修改有效日期
+        $('.approveBtns').attr("data-toggle", "modal");
+        $('.approveBtns').attr("data-target", "#myModal3");
+    }else{
+        //未改动直接提交
+        saveMethod('y');
+        $('.approveBtns').removeAttr("data-toggle", "modal");
+        $('.approveBtns').removeAttr("data-target", "#myModal3");
+    }
+}
+
+//封装提交审批方法
+function saveMethod(flag){
+    debugger
+    if(flag == 'n'){
+        $("#effeTime").val(applyDate);
+        $("#effeDays").val(applyDay);
+    }
+    var approveState = $("#approveState").val();
     $.ajax({
         type:'post',
         url:path+'/approve/updateApprove',
@@ -305,7 +337,7 @@ function add(flag){
         dataType:'json',
         success:function(data){
             if(data!=null && data.code == 0){
-                if(flag == 1){
+                if(approveState == 1){
                     toastr.success("批准成功!");
                 }else{
                     toastr.success("驳回成功!");
@@ -313,6 +345,7 @@ function add(flag){
                 refreshTable();
                 $('#myModal1').modal('hide');
                 $('#mytab').bootstrapTable('selectPage', pageNumber);
+                $('#myModal3').modal('hide');
             }else{
                 toastr.warning(data.msg);
             }
diff --git a/src/main/webapp/static/js/approveManage/collection/collectManage174.js b/src/main/webapp/static/js/approveManage/collection/collectManage174.js
index 6b2b33b..431e143 100644
--- a/src/main/webapp/static/js/approveManage/collection/collectManage174.js
+++ b/src/main/webapp/static/js/approveManage/collection/collectManage174.js
@@ -549,6 +549,7 @@ function loadApplyType(){
 }
 //重新申请借阅
 function borrowings(){
+    pickTime("effeTime", null);
     loadApplyType();
     setFormToken();
     $('#myModal2').modal('hide');
diff --git a/src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethodqf.js b/src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethodqf.js
index 0735230..2b3c38f 100644
--- a/src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethodqf.js
+++ b/src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethodqf.js
@@ -658,6 +658,7 @@ function loadApplyType(type){
 
 //单个申请借阅
 function borrowing(patientId){
+	pickTime("effeTime", null);
 	$("#typeId").val('approves');
 	//加载申请借阅类型
 	loadApplyType(1);