diff --git a/src/main/java/com/emr/controller/lastVerifyController.java b/src/main/java/com/emr/controller/lastVerifyController.java
index fe6531e6..e426a2bd 100644
--- a/src/main/java/com/emr/controller/lastVerifyController.java
+++ b/src/main/java/com/emr/controller/lastVerifyController.java
@@ -76,8 +76,8 @@ public class lastVerifyController {
     @RequestMapping(value = "/exportExcel")
     public void exportExcel(HttpServletResponse response, Archive_Master_Vo archiveMasterVo) throws Exception {
         response.setContentType("application/vnd.ms-excel;charset=UTF-8");
-        String[] header = {"病历清单id","住院号","住院次数","名字","性别","身份证","出院科室","出院日期","主管医生","状态","医生是否提交","医生","医生提交日期","护士是否提交","护士","护士提交日期","电子病历医生提交","电子病历护士提交","是否死亡","是否签收","签收人","签收时间"};
-        String[] fileNames = {"id","inpNo","visitId","name","sex","idNo","deptName","dischargeDateTime","doctorInCharge","archivestate","cmtDoctor","doctorName","cmtDoctorDate","cmtNurse","nurseName","cmtDurseDate","emrDoctorCmt","emrNureCmt","deathFlag","is_sign","signer","sign_time"};
+        String[] header = {"病案清单id","住院号","住院次数","名字","性别","出院科室","出院日期","主管医生","状态","医生是否提交","医生","医生提交日期","护士是否提交","护士","护士提交日期","电子病历医生提交","电子病历护士提交","是否死亡","是否有纸质补充资料送病案室","是否签收","是否扫描","是否打印","初审人"};
+        String[] fileNames = {"id","inpNo","visitId","name","sex","deptName","dischargeDateTime","doctorInCharge","archivestate","cmtDoctor","doctorName","cmtDoctorDate","cmtNurse","nurseName","cmtNurseDate","emrDoctorCmt","emrNureCmt","deathFlag","isscaned","isSign","isScanning","printNum","firstInstance"};
         //文件名
         String fileName = "病案室终审" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + ".xls";
         //构造excel的数据
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 be02596b..1a58651a 100644
--- a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java
+++ b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java
@@ -74,27 +74,30 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
     public OffsetLimitPage selectByCol(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit) {
         PageHelper.offsetPage(offset, limit);
         List<Archive_Master> list= archiveMasterMapper.selectByCol(archiveMasterVo);
-        JSONArray powerUsers = powerUserService.getPowerUserList("1");
-        List<JSONObject> powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), JSONObject.class);
-        if (powerUserList != null){
-            Map<String,JSONObject> mappedMovies = Maps.uniqueIndex(powerUserList, new Function<JSONObject,String>() {
-                @Override
-                public String apply(JSONObject temp) {
-                    return temp.getString("userName");
-                }});
-            for (Archive_Master archiveMaster : list) {
-                JSONObject userInfo = mappedMovies.get(archiveMaster.getDoctorName());
-                if (userInfo==null){
-                    archiveMaster.setDoctorName(archiveMaster.getDoctorName());
-                }else {
-                    archiveMaster.setDoctorName(userInfo.getString("name"));
-                }
+        if(list!=null && list.size()>0) {
+            JSONArray powerUsers = powerUserService.getPowerUserList("1");
+            List<JSONObject> powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), JSONObject.class);
+            if (powerUserList != null) {
+                Map<String, JSONObject> mappedMovies = Maps.uniqueIndex(powerUserList, new Function<JSONObject, String>() {
+                    @Override
+                    public String apply(JSONObject temp) {
+                        return temp.getString("userName");
+                    }
+                });
+                for (Archive_Master archiveMaster : list) {
+                    JSONObject userInfo = mappedMovies.get(archiveMaster.getDoctorName());
+                    if (userInfo == null) {
+                        archiveMaster.setDoctorName(archiveMaster.getDoctorName());
+                    } else {
+                        archiveMaster.setDoctorName(userInfo.getString("name"));
+                    }
 
-                userInfo = mappedMovies.get(archiveMaster.getNurseName());
-                if (userInfo==null){
-                    archiveMaster.setNurseName(archiveMaster.getNurseName());
-                }else {
-                    archiveMaster.setNurseName(userInfo.getString("name"));
+                    userInfo = mappedMovies.get(archiveMaster.getNurseName());
+                    if (userInfo == null) {
+                        archiveMaster.setNurseName(archiveMaster.getNurseName());
+                    } else {
+                        archiveMaster.setNurseName(userInfo.getString("name"));
+                    }
                 }
             }
         }
@@ -103,12 +106,42 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
 
     @Override
     public List<Archive_Master> selectByCol(Archive_Master_Vo archiveMasterVo) {
-        return archiveMasterMapper.selectByCol(archiveMasterVo);
+        List<Archive_Master> list=archiveMasterMapper.selectByCol(archiveMasterVo);
+        if(list!=null && list.size()>0) {
+            JSONArray powerUsers = powerUserService.getPowerUserList("1");
+            List<JSONObject> powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), JSONObject.class);
+            if (powerUserList != null) {
+                Map<String, JSONObject> mappedMovies = Maps.uniqueIndex(powerUserList, new Function<JSONObject, String>() {
+                    @Override
+                    public String apply(JSONObject temp) {
+                        return temp.getString("userName");
+                    }
+                });
+                for (Archive_Master archiveMaster : list) {
+                    JSONObject userInfo = mappedMovies.get(archiveMaster.getDoctorName());
+                    if (userInfo == null) {
+                        archiveMaster.setDoctorName(archiveMaster.getDoctorName());
+                    } else {
+                        archiveMaster.setDoctorName(userInfo.getString("name"));
+                    }
+
+                    userInfo = mappedMovies.get(archiveMaster.getNurseName());
+                    if (userInfo == null) {
+                        archiveMaster.setNurseName(archiveMaster.getNurseName());
+                    } else {
+                        archiveMaster.setNurseName(userInfo.getString("name"));
+                    }
+                }
+            }
+        }
+        return list;
     }
 
     @Override
     public List<Archive_Master_Vo> selectByColumn(Archive_Master_Vo archiveMasterVo) {
-        return archiveMasterMapper.selectByColumn(archiveMasterVo);
+        List<Archive_Master_Vo> list=archiveMasterMapper.selectByColumn(archiveMasterVo);
+        setDoctorAndNurseName(list);
+        return list;
     }
 
    /*   @Override
diff --git a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp
index a80c7530..a9f7bf6b 100644
--- a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp
+++ b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp
@@ -3271,7 +3271,7 @@
                         offset: offset,   //页码
                         order: params.order,      //排位命令（desc，asc）
                         //id: $("#id").val(),
-                        idNo: $("#idNo").val(),
+                       // idNo: $("#idNo").val(),
                         inpNo: "" + $("#inpNo").val(),
                         visitId: "" + $("#visitId").val(),
                         name: "" + $("#name").val(),
@@ -3283,8 +3283,8 @@
                         isScanning: $("#isScanning").val(),
 
                         /*signer: "" + $("#signer").val(),*/
-                        startSignDate: $("#startSignDate").val(),
-                        endSignDate: $("#endSignDate").val(),
+                        //startSignDate: $("#startSignDate").val(),
+                        //endSignDate: $("#endSignDate").val(),
                         isSign: $("#isSign").val(),
                         printNum:$("#printNum").val()
                     };
@@ -4826,10 +4826,6 @@
 
     //导出excel功能
     $("#excelBtn").click(function () {
-        // var id = "" + $("#id").val();
-        var inpNo = "" + $("#inpNo").val();
-        var visitId = "" + $("#visitId").val();
-        var name = "" + $("#name").val();
         //var idNo = "" + $("#idNo").val();
         //var state = "" + $("#state").val();
         // var archivestate = "" + $("#archivestate").val();
@@ -4840,28 +4836,26 @@
         // } else {
         //     deptName = $("#deptName").val();
         // }
-        var printNum = $("#printNum").val();
+
         var deptName = $("#deptName").val();
         if (deptName.indexOf("") != -1) {
             deptName = "";
         } else {
             deptName = $("#deptName").val().toString();
         }
-        var startDateTo = $("#startDateTo").val();
-        var endDateTo = $("#endDateTo").val();
-
-        //2021-05-13
-        var idNo=$("#idNo").val();
-        var isScanning= $("#isScanning").val();
-        var isSign = $("#isSign").val();
-        var isscaned = $("#isscaned").val();
-        //var signer = $("#signer").val();
-        var startSignDate = $("#startSignDate").val();
-        var endSignDate = $("#endSignDate").val();
+        var inpNo = "" + $("#inpNo").val();
+        var visitId = "" + $("#visitId").val();
+        var name = "" + $("#name").val();
+        var startDateTo= $("#startDateTo").val();
+        var endDateTo= $("#endDateTo").val();
+        var isscaned= $("#isscaned").val();
+        var isScanning=$("#isScanning").val();
+        var isSign=$("#isSign").val();
+        var printNum=$("#printNum").val();
+
         window.location.href = "${path}/lastVerify/exportExcel?inpNo=" + inpNo + "&visitId=" + visitId +
             "&name=" + name + "&deptName=" + deptName  + "&startDateTo=" + startDateTo + "&endDateTo=" + endDateTo
-            + "&isscaned=" + isscaned + "&isSign=" + isSign + "&signer=" + signer+ "&startSignDate=" + startSignDate
-            + "&endSignDate=" + endSignDate+ "&idNo=" + idNo+ "&isScanning=" + isScanning + "&printNum=" + printNum;
+            + "&isscaned=" + isscaned + "&isSign=" + isSign + "&isScanning=" + isScanning + "&printNum=" + printNum;
 
     });