diff --git a/src/main/java/com/emr/controller/faultController.java b/src/main/java/com/emr/controller/faultController.java
index fb39222f..80d7531a 100644
--- a/src/main/java/com/emr/controller/faultController.java
+++ b/src/main/java/com/emr/controller/faultController.java
@@ -50,13 +50,12 @@ public class faultController {
         return "faultDir/faultList";
     }
 
-    @ResponseBody
+    /*@ResponseBody
     @RequestMapping(value = "/faultList")
     public OffsetLimitPage faultList(HttpServletRequest request, HttpServletResponse response, Emr_Fault_Vo emrFaultVo, Integer offset, Integer limit) {
         OffsetLimitPage result = emrFaultDetailService.selectByCol(emrFaultVo, offset, limit);
         return result;
-    }
-
+    }*/
 
     @ResponseBody
     @RequestMapping(value = "/exportExcel")
diff --git a/src/main/java/com/emr/controller/lastVerifyController.java b/src/main/java/com/emr/controller/lastVerifyController.java
index e426a2bd..aad14c44 100644
--- a/src/main/java/com/emr/controller/lastVerifyController.java
+++ b/src/main/java/com/emr/controller/lastVerifyController.java
@@ -255,17 +255,23 @@ public class lastVerifyController {
             emrFaultDetail.setCreateTime(nowTime);
             emrFaultDetail.setState("未召回");
             //判断是否已经有召回记录
-            Emr_Fault_Vo vo=new Emr_Fault_Vo();
-            vo.setArchiveDetailId(emrFaultDetail.getArchiveDetailId());
-            List<Emr_Fault_Vo> list = emrFaultDetailService.selectByCol(vo);
+            /*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);
             if(list.size()>0){
+                //存在归档记录
                 bol = emrFaultDetailService.delbyCol(emrFaultDetail);
                 if(bol==1){
                      emrFaultDetailService.insertSel(emrFaultDetail);
                 }
             }else{
                 emrFaultDetailService.insertSel(emrFaultDetail);
-            }
+            }*/
             //获取留观标识，“LG”
             String lgFlag = inpatientNo.substring(0,2);
             if(!"LG".equals(lgFlag)) {
diff --git a/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp b/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp
index 460623c6..f44dee05 100644
--- a/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp
+++ b/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp
@@ -97,26 +97,17 @@
             </div>
             <div class="form-group divCss8" id="deptDiv" style="height: 18px;margin-top: -7px;">
                 <label >出院科室:</label>
-                <%--<select class="input-sm form-control" id="deptName">--%>
-                <%--<option value="">全部</option>--%>
-                <%--&lt;%&ndash;<option value="在院">在院</option>&ndash;%&gt;--%>
-                <%--&lt;%&ndash;<option value="未归档">未归档</option>&ndash;%&gt;--%>
-                <%--&lt;%&ndash;<option value="归档中">归档中</option>&ndash;%&gt;--%>
-                <%--&lt;%&ndash;<option value="初审">初审</option>&ndash;%&gt;--%>
-                <%--&lt;%&ndash;<option value="已认证">已认证</option>&ndash;%&gt;--%>
-                <%--&lt;%&ndash;<option value="已归档">已归档</option>&ndash;%&gt;--%>
-                <%--</select>--%>
                 <select class="selectpicker bla bla bli" multiple data-live-search="true" name="deptName"
                         id="deptName"  data-actions-box="true" data-deselect-all-text="取消全选" data-select-all-text="全选"
                         title="请输入出院科室"  data-none-results-text="没找到相应记录{0}">
-                    <option value="">全部</option>
+                    <%--<option value="">全部</option>--%>
                 </select>
             </div>
             <div class="form-group divCss8">
                 <label for="name">主管医生:</label>
                 <select class="selectpicker bla bla bli" multiple data-live-search="true" name="doctorInCharge" id="doctorInCharge" title="请输入主管医生"
                         data-actions-box="true" data-deselect-all-text="取消全选" data-select-all-text="全选" data-none-results-text="没找到相应记录{0}">
-                    <option value="--">全部</option>
+                    <%--<option value="">全部</option>--%>
                 </select>
                 <%--                    <input type="text" class="input-sm form-control" id="doctorInCharge" placeholder="请输入主管医生">--%>
             </div>
@@ -132,25 +123,13 @@
                 <label for="name">创建人:</label>
                 <select class="selectpicker bla bla bli" multiple data-live-search="true" name="creater" id="creater" title="请输入创建人"
                         data-actions-box="true" data-deselect-all-text="取消全选" data-select-all-text="全选" data-none-results-text="没找到相应记录{0}">
-                    <option value="--">全部</option>
+                    <%--<option value="">全部</option>--%>
                 </select>
                 <%--<input type="text" class="input-sm form-control" id="creater" placeholder="请输入创建人">--%>
             </div>
-            <label class="form-group">缺陷选项：</label>
             <div class="form-group divCss8">
-                <%-- <label for="name">缺陷选项:</label>
-                 <select  id="typeFlag" multiple="multiple" title="请输入选项" name="typeFlag" >
-                     <option value="">全部</option>
-                 </select>--%>
-
-                <%--<div class="col-lg-3 form-group divCss8" ><label>缺陷选项：</label></div>--%>
-                <div  id="mulDiv">
-                </div>
-            </div>
-
-            <div class="form-group divCss">
                 <label for="archivestate">归档状态 :</label>
-                <select class="selectpicker bla bla bli" multiple data-live-search="true" name="doctorInCharge" id="archivestate" title="请输入归档状态"
+                <select class="selectpicker bla bla bli" multiple data-live-search="true" name="archivestate" id="archivestate" title="请输入归档状态"
                         data-actions-box="true" data-deselect-all-text="取消全选" data-select-all-text="全选" data-none-results-text="没找到相应记录{0}">
                     <%--<option value="">全部</option>--%>
                     <option value="在院">在院</option>
@@ -164,6 +143,19 @@
                     <option value="复审退回">复审退回</option>
                 </select>
             </div>
+            <label class="form-group">缺陷选项：</label>
+            <div class="form-group divCss">
+                <%-- <label for="name">缺陷选项:</label>
+                 <select  id="typeFlag" multiple="multiple" title="请输入选项" name="typeFlag" >
+                     <option value="">全部</option>
+                 </select>--%>
+
+                <%--<div class="col-lg-3 form-group divCss8" ><label>缺陷选项：</label></div>--%>
+                <div  id="mulDiv">
+                </div>
+            </div>
+
+
             <button type="button" class="btn btn-primary btn-sm divCss" id="searchBtn">查询</button>
             <button type="button" class="btn btn-info btn-sm divCss" id="excelBtn">条件导出</button>
         </div>
@@ -1017,6 +1009,7 @@
                     }
                 }else{
                     //查询条件无更改，不刷新
+                    toastr.warning("查询条件无更改，已查询!");
                 }
             }
         } else {