diff --git a/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp b/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp
index ceef06a7..c269ca60 100644
--- a/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp
+++ b/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp
@@ -282,6 +282,19 @@
 
     getFaultType();
     var pageVal=0;
+    var startDate2="",endDate2="",inpNo2="",visitId2="",name2="",doctorInCharge2="",archivestate2="",deptName2="",typeFlag2="",creater2="";
+    var backIdArr=[];
+    var backIndex=0;
+    function initParmFun(){
+        startDate2=$("#startDate").val();
+        endDate2=$("#endDate").val();
+        inpNo2=$("#inpNo").val();
+        visitId2=$("#visitId").val();
+        name2=$("#name").val();
+        doctorInCharge2=$("#doctorInCharge").val();
+        archivestate2=$("#archivestate").val();
+        deptName2=$("#deptName").val();
+    }
     function initTable() {
         if(tipLoad==1){
             $("#table").bootstrapTable({ // 对应table标签的id
@@ -356,8 +369,8 @@
                         deptName = $("#deptName").val().toString();
                     }
 
-
-
+                    //查询时的初始化值
+                    initParmFun();
                     var temp = {
                         limit: limit,     //页面大小
                         offset: offset,   //页码
@@ -571,6 +584,7 @@
                     tipLoad = 0;
                 },onExpandRow: function (index, row, $detail) {
                     InitSubTable(index, row, $detail);
+                    //backIdArr.push($detail);
                 }
             });
 
@@ -583,7 +597,8 @@
                     return;
                 }
                 var archiveDetailId = row.archiveDetailId;
-                var cur_table = $detail.html('<table id="backTable"></table>').find('table');
+                var cur_table = $detail.html('<table id="backTable" class="backTable"></table>').find('table');
+
                 //console.log(endDateTo+"========================"+startDateTo);
 
                 $(cur_table).bootstrapTable({
@@ -735,9 +750,10 @@
                 var archiveDetailId = row.archiveDetailId;
                 var startDateTo=row.startDateTo;
                 var endDateTo=row.endDateTo;
-                var cur_table2 = $detail.html('<table id="faultTable"></table>').find('table');
+                var cur_table2 = $detail.html('<table id="faultTable'+backIndex+'"></table>').find('table');
                 //console.log(archiveDetailId+"========"+archiveDetailId+"====="+startDateTo+"======="+endDateTo);
-
+                backIdArr.push(backIndex);
+                backIndex++;
                 $(cur_table2).bootstrapTable({
                     //method: 'POST',
                     url: "${path}/fault/faultListByTj", // 获取表格数据的url
@@ -894,45 +910,107 @@
                             }
                         }
                     ],  //无线循环取子表，直到子表里面没有记录
-                    //onExpandRow: function (index, row, $Subdetail) {
-                    //InitSubTable2(index, row, $Subdetail);
-                    //}
+                    onExpandRow: function (index, row, $Subdetail) {
+                      InitSubTable2(index, row, $Subdetail);
+                    }
                 });
             }
         }
     }
 
+    function getFlagTableFun(){
+        var flag=0;
+        if(startDate2!=$("#startDate").val() && flag==0){
+            startDate2=$("#startDate").val();
+            flag=1;
+        }
+        //console.log("===flag0==="+flag);
+        if(endDate2!=$("#endDate").val() && flag==0){
+            endDate2= $("#endDate").val();
+            flag=1;
+        }
+        //console.log("===flag1==="+flag );
+        if(inpNo2!=$("#inpNo").val() && flag==0){
+            inpNo2="" + $("#inpNo").val();
+            flag=1;
+        }
+        //console.log("===flag2==="+flag );
+        if(visitId2!=$("#visitId").val() && flag==0){
+            visitId2=""+$("#visitId").val();
+            flag=1;
+        }
+        //console.log("===flag3==="+flag);
+        if(name2!=$("#name").val()&& flag==0){
+            name2=""+$("#name").val();
+            flag=1;
+        }
+        //console.log("===flag4==="+flag);
+        if(doctorInCharge2!=(""+$("#doctorInCharge").val())&& flag==0){
+            doctorInCharge2=""+(""+$("#doctorInCharge").val());
+            flag=1;
+        }
+        //console.log("===flag5==="+flag);
+        if(archivestate2!=("" + $("#archivestate").val())&& flag==0){
+            archivestate2="" + ("" + $("#archivestate").val());
+            flag=1;
+        }
+        //console.log("===flag6==="+flag);
+        var deptName3 = $("#deptName").val();
+        if (deptName3.indexOf("") != -1) {
+            deptName3 = "";
+        } else {
+            deptName3 = $("#deptName").val().toString();
+        }
+        //console.log("===flag7==="+flag);
+        if(deptName2!=deptName3 && flag==0){
+            deptName2= deptName3;
+            flag=1;
+        }
+        //console.log("===flag8==="+flag);
+        return flag;
+    }
+
+    function getFlagFaultTableFun(){
+        var faultFlag=0;
+
+        if(typeFlag2==$("#typeFlag").val() && faultFlag==0){
+            faultFlag=0;
+        }else{
+            typeFlag2 = $("#typeFlag").val();
+            faultFlag=1;
+        }
+        //console.log("===faultFlag9==="+faultFlag);
+        if(creater2==$("#creater").val() && faultFlag==0){
+            faultFlag=0;
+        }else{
+            creater2=""+$("#creater").val();
+            faultFlag=1;
+        }
+        //console.log("===faultFlag10==="+faultFlag);
+        return faultFlag;
+    }
     //查询
     $('#searchBtn').click(function () {
         //查询之后重新从第一页算起
         if (tipLoad == 0) {
-
-            var startDate2=$("#startDate").val(),
-                endDate2= $("#endDate").val(),
-                inpNo2="" + $("#inpNo").val(),
-                visitId2=""+$("#visitId").val(),
-                name2=""+$("#name").val(),
-                doctorInCharge2=""+$("#doctorInCharge").val(),
-                typeFlag2 = $("#typeFlag").val(),
-                creater2=""+$("#creater").val(),
-                //backer2=""+$("#backer").val(),
-                archivestate2="" + $("#archivestate").val(),
-                deptName2= $("#archivestate").val();
-
-            if((startDate2==null || startDate2=="") && (endDate2==null || endDate2=="")&& (inpNo2==null || inpNo2=="") && (visitId2==null || visitId2=="")
-                && (name2==null || name2=="") && (doctorInCharge2==null || doctorInCharge2=="") && (archivestate2==null || archivestate2=="") && (deptName2==null || deptName2=="")){
-                if((typeFlag2!=null && typeFlag2!="")  || (creater2!=null && creater2!="")  ){
-                    $("#faultTable").bootstrapTable("refreshOptions", {pageNumber: 1});          //刷新
+            //判断第一次和第二次传参的对比
+             //backer2=""+$("#backer").val();
+            var flag=getFlagTableFun();
+            if(flag==1) {
+                $("#table").bootstrapTable("refreshOptions", {pageNumber: 1});
+            }else{
+                var faultFlag=getFlagFaultTableFun();
+                if(faultFlag==1) {
+                    $("#backTable").bootstrapTable("refresh", {pageNumber: 1});
+                    if(backIdArr.length>0){
+                        for(var i=0;i<backIdArr.length;i++){
+                            $("#faultTable"+backIdArr[i]).bootstrapTable("refresh", {pageNumber: 1});
+                        }
+                    }
                 }else{
-                    $("#table").bootstrapTable("refreshOptions", {pageNumber: 1});        //刷新
-                    //$("#backTable").bootstrapTable("refreshOptions", {pageNumber: 1});          //刷新
+                    //查询条件无更改，不刷新
                 }
-            }else{
-                $("#table").bootstrapTable("refreshOptions", {pageNumber: 1});        //刷新
             }
-
-
-            //$('#table').bootstrapTable('refresh');
         } else {
             toastr.warning("正在查询，请稍等...");
         }