diff --git a/src/main/java/com/emr/controller/DeathRecordsController.java b/src/main/java/com/emr/controller/DeathRecordsController.java
new file mode 100644
index 00000000..ad305a20
--- /dev/null
+++ b/src/main/java/com/emr/controller/DeathRecordsController.java
@@ -0,0 +1,50 @@
+package com.emr.controller;
+
+import com.emr.entity.Archive_Master_Vo;
+import com.emr.entity.OffsetLimitPage;
+import com.emr.service.Archive_MasterService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+/**
+ * @ClassName DeathRecords
+ * @Description 死亡病历页面接口
+ * @Author linjj
+ * @Date 2025/1/8 15:32
+ * @Version 1.0
+ */
+@Controller
+@RequestMapping("/death")
+public class DeathRecordsController {
+
+
+    @Autowired
+    private Archive_MasterService archiveMasterService;
+
+
+    /**
+     * @description: 前端映射接口
+     * @author linjj
+     * @date: 2025/1/8 15:33
+     */
+    @RequestMapping(value = "/deathRecords")
+    public String faults(Model model) {
+        return "deathRecordsDir/deathRecords";
+    }
+    /**
+     * @description: 死亡病历查询接口
+     * @params:
+     * @return:
+     * @author linjj
+     * @date: 2025/1/8 15:38
+     */
+    @ResponseBody
+    @RequestMapping(value = "/deathRecordList")
+    public OffsetLimitPage deathRecordList(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit) {
+        OffsetLimitPage result = archiveMasterService.deathRecordList(archiveMasterVo, offset, limit);
+        return result;
+    }
+}
diff --git a/src/main/java/com/emr/controller/signListController.java b/src/main/java/com/emr/controller/signListController.java
index 0b079615..81169acd 100644
--- a/src/main/java/com/emr/controller/signListController.java
+++ b/src/main/java/com/emr/controller/signListController.java
@@ -11,13 +11,11 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.emr.entity.*;
 import com.emr.service.*;
-import com.emr.util.HttpClientTool;
-import com.emr.util.IDHelper;
-import com.emr.util.ThreadExcelUtils;
-import com.emr.util.XMLUtil;
+import com.emr.util.*;
 import com.emr.vo.CollectionVo;
 import com.emr.webservice.MedicalRecordShowBackContent.MR_FILE_CALLBACK_RECORD;
 import com.emr.webservice.MedicalRecordShowBackContent.MR_FILE_INDEX_CALLBACK;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.axis.client.Call;
 import org.apache.axis.client.Service;
 import org.apache.axis.encoding.XMLType;
@@ -44,9 +42,10 @@ import javax.xml.namespace.QName;
 import javax.xml.rpc.ParameterMode;
 import javax.xml.rpc.ServiceException;
 import java.io.*;
-import java.math.BigDecimal;
+import java.net.InetAddress;
 import java.net.URL;
 import java.net.URLConnection;
+import java.net.UnknownHostException;
 import java.rmi.RemoteException;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -60,7 +59,7 @@ public class signListController {
     private String EMRQualityControl;
     @Value("${EMRQualityControlParamName}")
     private String EMRQualityControlParamName;
-
+    private static Logger logger = new Logger();
     @Autowired
     private Sign_ListService signListService;
 
@@ -875,20 +874,55 @@ public class signListController {
     @ResponseBody
     @RequestMapping(value = "/collection")
     public JSONObject collection(HttpServletRequest request, HttpServletResponse response, String flagNum, String id) throws Exception {
-//        String taskId = afCollectTaskService.getTaskId(flagNum, id);
-//        String url="http://127.0.0.1:9296/api/noviewtask/UrgentMakeUp";
-//        String s = sendGet(url, taskId);
+        // 从session获取用户名
+        Power_User user = (Power_User) request.getSession().getAttribute("CURRENT_USER");
+        String username = user.getUserName();//获取前面登录的用户名
+        //获取ip来源
+        String ipAddress = getAddressIp(request);
+        logger.log("按需采集用户名："+username+"接口来源ip："+ipAddress);
         CollectionVo collectionVo = new CollectionVo();
         List<String> patientIds=new ArrayList<>();
         patientIds.add(id);
         collectionVo.setPatientIds(patientIds);
         collectionVo.setSysCodes(flagNum);
+        collectionVo.setCaller("guidang");
+        logger.log("本次参数为："+collectionVo.toString());
         String url="http://10.6.1.127:9295/api/NoViewCollect/generateTaskByPatientIdAndSysCodes";
         JSONObject jsonParam= (JSONObject) JSONObject.toJSON(collectionVo);
         JSONObject jsonObject = httpPost(url, jsonParam);
-        //查询新任务表id
         return jsonObject;
     }
+    private String getAddressIp( HttpServletRequest request){
+        // 获取访问真实IP
+        String ipAddress = request.getHeader("x-forwarded-for");
+        if(ipAddress == null || ipAddress.length() == 0 || "unknown".equalsIgnoreCase(ipAddress)) {
+            ipAddress = request.getHeader("Proxy-Client-IP");
+        }
+        if(ipAddress == null || ipAddress.length() == 0 || "unknown".equalsIgnoreCase(ipAddress)) {
+            ipAddress = request.getHeader("WL-Proxy-Client-IP");
+        }
+        if(ipAddress == null || ipAddress.length() == 0 || "unknown".equalsIgnoreCase(ipAddress)) {
+            ipAddress = request.getRemoteAddr();
+            if(ipAddress.equals("127.0.0.1") || ipAddress.equals("0:0:0:0:0:0:0:1")){
+                //根据网卡取本机配置的IP
+                InetAddress inet=null;
+                try {
+                    inet = InetAddress.getLocalHost();
+                } catch (UnknownHostException e) {
+                    e.printStackTrace();
+                }
+                ipAddress= inet.getHostAddress();
+            }
+        }
+        //对于通过多个代理的情况，第一个IP为客户端真实IP,多个IP按照','分割
+        if(ipAddress!=null && ipAddress.length()>15){ //"***.***.***.***".length() = 15
+            if(ipAddress.indexOf(",")>0){
+                ipAddress = ipAddress.substring(0,ipAddress.indexOf(","));
+            }
+        }
+        return ipAddress;
+    }
+
 
     public static JSONObject httpPost(String url, JSONObject jsonParam) {
         // post请求返回结果
diff --git a/src/main/java/com/emr/dao/Archive_MasterMapper.java b/src/main/java/com/emr/dao/Archive_MasterMapper.java
index 25cc48dc..03994c2e 100644
--- a/src/main/java/com/emr/dao/Archive_MasterMapper.java
+++ b/src/main/java/com/emr/dao/Archive_MasterMapper.java
@@ -277,4 +277,12 @@ public interface Archive_MasterMapper  {
      * @date: 2023/6/29 17:17
      */
     List<Archive_Master_Vo> getNurseDefectNum(@Param(value = "ids")String ids);
+    /**
+     * @description: 查询死亡病历
+     * @params:  archiveMasterVo
+     * @return: Archive_Master_Vo
+     * @author linjj
+     * @date: 2025/1/8 15:41
+     */
+    List<Archive_Master> getDeathRecordList(Archive_Master_Vo archiveMasterVo);
 }
\ No newline at end of file
diff --git a/src/main/java/com/emr/service/Archive_MasterService.java b/src/main/java/com/emr/service/Archive_MasterService.java
index d10bb83d..74f38801 100644
--- a/src/main/java/com/emr/service/Archive_MasterService.java
+++ b/src/main/java/com/emr/service/Archive_MasterService.java
@@ -386,6 +386,17 @@ public interface Archive_MasterService {
      * @return
      */
     Integer selectCountNum(Archive_Master_Vo archiveMasterVo);
+
+    /**
+     * @description: 查询死亡病历接口
+     * @params: record
+     * @params: offset
+     * @params: limit
+     * @author linjj
+     * @date: 2025/1/8 15:40
+     */
+    OffsetLimitPage deathRecordList(Archive_Master_Vo record, Integer offset, Integer limit);
+
 }
  
 
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 14aa6ff0..39af86ef 100644
--- a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java
+++ b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java
@@ -1836,6 +1836,34 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
     public Integer selectCountNum(Archive_Master_Vo archiveMasterVo) {
         return archiveMasterMapper.selectCountNum(archiveMasterVo);
     }
+
+    @Override
+    public OffsetLimitPage deathRecordList(Archive_Master_Vo record, Integer offset, Integer limit) {
+        PageHelper.offsetPage(offset, limit);
+        List<Archive_Master> list = archiveMasterMapper.getDeathRecordList(record);
+        if(list!=null && list.size()>0) {
+            //获取科室列表
+            Emr_Dictionary dic = new Emr_Dictionary();
+            dic.setEffective(1);
+            dic.setTypecode("dept_code");
+            List<Emr_Dictionary> dicList = emrDictionaryService.dicByTypeCode(dic);
+            //转换科室
+            Map<String, Emr_Dictionary> codeMap = ListUtil.toMap(dicList, Emr_Dictionary::getCode);
+                Setters.<Archive_Master>instance().list(list).cycleSetProperties(p -> {
+                String deptCode = p.getDeptName();
+                String deptAdmissionCode = p.getDeptAdmissionTo();
+                if(StringUtils.isNotBlank(deptCode) && codeMap.containsKey(deptCode)){
+                    String deptName = codeMap.get(deptCode).getName();
+                    p.setDeptName(deptName);
+                }
+                if(StringUtils.isNotBlank(deptAdmissionCode) && codeMap.containsKey(deptAdmissionCode)){
+                    String deptAdmissionTo = codeMap.get(deptAdmissionCode).getName();
+                    p.setDeptAdmissionTo(deptAdmissionTo);
+                }
+            });
+        }
+        return  new OffsetLimitPage((Page) list);
+    }
 }
  
 
diff --git a/src/main/java/com/emr/util/Logger.java b/src/main/java/com/emr/util/Logger.java
index abf83316..e0a59fb8 100644
--- a/src/main/java/com/emr/util/Logger.java
+++ b/src/main/java/com/emr/util/Logger.java
@@ -10,6 +10,7 @@ import java.util.Date;
 public class Logger {
     public void log(String info) {
         SimpleDateFormat dateFormat = new SimpleDateFormat ("yyyy-MM-dd");
+        SimpleDateFormat dateFormat1 = new SimpleDateFormat ("yyyy-MM-dd HH:mm:ss");
         String format = dateFormat.format (new Date());
         File file = new File ("D:\\emr_medical_record\\logs\\"+format);
         if(!file.isDirectory ()){
@@ -18,6 +19,8 @@ public class Logger {
         OutputStream out = null;
         try {
             out = getOutputStream(file.getAbsolutePath ()+"\\log.log");
+            // 写入日期和日志信息
+            out.write(dateFormat1.format(new Date()).getBytes("utf-8")); // 添加
             out.write(info.getBytes("utf-8"));
             out.write("\r\n".getBytes());
             out.close();
diff --git a/src/main/java/com/emr/vo/CollectionVo.java b/src/main/java/com/emr/vo/CollectionVo.java
index f0383404..e882dc47 100644
--- a/src/main/java/com/emr/vo/CollectionVo.java
+++ b/src/main/java/com/emr/vo/CollectionVo.java
@@ -17,4 +17,14 @@ public class CollectionVo {
     private List<String> patientIds;
 
     private String sysCodes;
+    private String caller;
+
+    @Override
+    public String toString() {
+        return "CollectionVo{" +
+                "patientIds=" + patientIds +
+                ", sysCodes='" + sysCodes + '\'' +
+                ", caller='" + caller + '\'' +
+                '}';
+    }
 }
diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml
index d12b87b9..3f5288b5 100644
--- a/src/main/resources/mapper/Archive_MasterMapper.xml
+++ b/src/main/resources/mapper/Archive_MasterMapper.xml
@@ -2514,4 +2514,52 @@
         </foreach>
           AND RowNum = 1
     </select>
+    <select id="getDeathRecordList" resultType="com.emr.entity.Archive_Master" resultMap="BaseResultMap">
+      select * from Archive_Master
+        <where>
+            inp_no  like 'SW%'
+            <if test="inpNo != null and inpNo != ''">
+                AND inp_no LIKE '%' + #{inpNo} + '%'
+            </if>
+            <if test="name != null and name != ''">
+                AND name LIKE '%' + #{name} + '%'
+            </if>
+            <if test="visitId != null and visitId != ''">
+                AND visit_id LIKE '%' + #{visitId} + '%'
+            </if>
+            <if test="dischargeDateTime != null">
+                and discharge_date_time = #{dischargeDateTime,jdbcType=NVARCHAR}
+            </if>
+            <if test="deptName!= null and deptName!= ''">
+                and dept_name in
+                <foreach item="item" collection="deptName.split(',')" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="deptAdmissionTo != null and deptAdmissionTo!=''">
+                and dept_admission_to in
+                <foreach item="item" collection="deptAdmissionTo.split(',')" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="archivestate != null and archivestate!=''">
+                and ArchiveState in
+                <foreach item="item" collection="archivestate.split(',')" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <choose>
+                <when test="startDateTo != null and startDateTo != '' and endDateTo != null and endDateTo != ''">
+                    and discharge_date_time between CONVERT(VARCHAR(10),#{startDateTo,jdbcType=NCHAR},120) and
+                    #{endDateTo,jdbcType=NCHAR}+ ' 23:59:59'
+                </when>
+                <when test="startDateTo != null and startDateTo != ''">
+                    and discharge_date_time >= CONVERT(VARCHAR(10),#{startDateTo,jdbcType=NCHAR},120)
+                </when>
+                <when test="endDateTo != null and endDateTo != ''">
+                    and discharge_date_time &lt;= #{endDateTo,jdbcType=NCHAR}+ ' 23:59:59'
+                </when>
+            </choose>
+        </where>
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/deathRecordsDir/deathRecords.jsp b/src/main/webapp/WEB-INF/views/deathRecordsDir/deathRecords.jsp
new file mode 100644
index 00000000..cf582c2d
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/deathRecordsDir/deathRecords.jsp
@@ -0,0 +1,1318 @@
+
+<%@ page contentType="text/html;charset=UTF-8" language="java" import="java.util.*" %>
+<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+<c:set value="${pageContext.request.contextPath}" var="path" scope="page"/>
+<%
+    ResourceBundle res = ResourceBundle.getBundle("config.jdbc");
+%>
+<html>
+<head>
+    <title>死亡病历页面</title>
+    <meta http-equiv="Content-Type"  content="text/html;charset=utf-8">
+    <meta name="referrer" content="never">
+    <!-- 解决部分兼容性问题，如果安装了GCF，则使用GCF来渲染页面，如果未安装GCF，则使用最高版本的IE内核进行渲染。 -->
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <!-- 页面按原比例显示 -->
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <%@include file="../../jspf/comm.jspf" %>
+    <%@include file="../../jspf/ztreeCommom.jsp" %>
+    <script type="text/javascript"
+            src="${path}/static/bootstrap-3.3.7/bootstrap-table-fixed-columns.js?time=2019-12-25"></script>
+    <link rel="stylesheet" href="${path}/static/bootstrap-3.3.7/bootstrap-table-fixed-columns.css" type="text/css">
+    <script src="${path}/static/js/loadAssortDetailCommom.js"></script>
+    <style>
+        .modal-header2 {
+            height: 30px;
+            text-align: center !important;
+            vertical-align: middle !important;
+            background-color: #3c8dbc !important;
+            color: #fff;
+            font-size: 16px;
+            font-weight: bold;
+            padding: 5px 5px 5px 5px !important;
+        }
+
+        .modal-footer {
+            padding: 5px;
+        }
+
+        .divCss {
+            margin-top: 5px;
+        }
+
+        .divCss2 {
+            margin-top: 5px;
+            margin-left: 20px;
+        }
+
+        .divCss8 {
+            margin-top: 5px;
+            margin-right: 20px;
+        }
+
+        .divCss3 {
+            margin-top: 5px;
+            margin-left: 20px;
+            color: blue;
+        }
+
+        .divCss7 {
+            margin-top: 15px;
+            margin-left: 0px;
+        }
+
+        .modal-content {
+            width: calc(210%); /*width: 1300px;*/
+            overflow-x: hidden;
+            overflow-y: auto;
+        }
+
+        .modal {
+            margin-left: -45%;
+            overflow-x: auto;
+            /*z-index: 1049;*/
+        }
+
+        .divCss4 {
+            border-top: 1px solid #e5e5e5;
+            width: 97.5%;
+            margin-top: 10px;
+            margin-bottom: 5px;
+            color: blue;
+            margin-left: 20px;
+        }
+
+
+        #wzContent {
+            margin-left: 30px;
+            margin-right: 30px;
+            /*height: 60px;*/
+            overflow-x: hidden;
+            overflow-y: hidden;
+        }
+
+        .labCss {
+            /*color: gainsboro;*/
+            color: #c1c3c4;
+        }
+
+        .titleCss {
+            text-align: left;
+            vertical-align: middle;
+            background-color: #3c8dbc;
+            color: #fff;
+            font-size: 19px;
+            font-weight: bold;
+            height: 30px;
+            margin-bottom: 10px;
+        }
+
+        .treeBtn1 {
+            margin-top: 10px;
+            margin-right: 10px;
+            width: 42%;
+        }
+
+        .treeBtn {
+            margin-top: 10px;
+            margin-left: 10px;
+            margin-right: 10px;
+            width: 42%;
+        }
+
+        #key {
+            width: 70%;
+        !important;
+        }
+
+        #searchBtn1 {
+            width: 20%;
+        !important;
+        }
+
+        .zTreeDemo {
+            height: auto;
+            min-height: 350px;
+            margin-left: -10px;
+        }
+
+        #ztree {
+            overflow-x: hidden;
+            overflow-y: auto;
+            max-height: calc(60vh);
+        !important;
+        }
+
+        .toolbarCss {
+            margin-right: 20px;
+            margin-bottom: 0px;
+        !important;
+        }
+
+        .fixed-table-toolbar .bs-bars .pull-right {
+            height: 20px;
+        !important;
+        }
+
+        #maxImg > div > div {
+            width: calc(210%);
+        }
+
+
+        #delPdfPageModal .modal-header2 {
+            width: calc(210%); /*margin-left:-15%;*/
+        }
+
+        #delPdfPageModal .modal-content {
+            width: calc(210%); /*margin-left:-15%;*/
+            height: calc(100vh - 100px);
+            overflow: hidden;
+        !important;
+        }
+
+        #signModal .modal-content {
+            margin-left: calc(60%);
+            width: 500px; /*width: 1300px;*/
+            overflow: hidden;
+        }
+
+        #archiveIdSign {
+            margin-left: 8px;
+            width: 450px;
+        }
+
+        #infoDiv {
+            width: 18%;
+            height: 98%;
+            float: right;
+            overflow-y: hidden;
+            overflow-x: hidden;
+        }
+
+        #pdf_page {
+            width: 100%;
+            height: 95%;
+        !important;
+        }
+
+        #imglist {
+            text-align: center;
+            margin-left: 0px;
+            margin-bottom: 5px;
+            width: 98%;
+            height: 80%;
+            overflow-y: auto;
+            overflow-x: hidden;
+        }
+
+        .divCss5 {
+            border-left: 2px solid #e5e5e5;
+            height: auto;
+            min-height: 350px;
+        }
+
+        .btnGroupCss {
+            text-align: right;
+        }
+
+        /* dataTables表头居中 */
+        .table > thead:first-child > tr:first-child > th {
+            text-align: center !important;
+        }
+
+        #assortModal > div > div {
+            margin-top: 30%;
+            margin-left: 60%;
+            width: 500px;
+        !important;
+        }
+
+        #exampleModal > div > div {
+            margin-top: 30%;
+            margin-left: 60%;
+            width: 400px;
+        !important;
+        }
+
+        #delPdfModal > div > div {
+            margin-top: 30%;
+            margin-left: 60%;
+            width: 400px;
+        !important;
+        }
+
+        #tsPdfModal > div > div {
+            margin-top: 40%;
+            margin-left: 70%;
+            width: 400px;
+        !important;
+        }
+
+        .imgDivCss {
+            min-height: 400px !important;
+        }
+
+        .showImg {
+            width: 100%;
+            /*height: 100%*/
+        }
+
+        .shadeImg {
+            height: 100%;
+        }
+
+        #returnModal .modal-content {
+            margin-left: 0%;
+            margin-top: 5%;
+            width: calc(210%);
+        }
+
+        #firstModal .modal-content {
+            margin-left: 20%;
+            margin-top: 0%;
+            width: calc(180%);
+        }
+
+        #verifyModal .modal-content {
+            margin-left: 20%;
+            margin-top: 5%;
+            width: calc(150%);
+        }
+
+        #verinfyQZModal .modal-content {
+            margin-left: 50%;
+            margin-top: 10%;
+            width: 450px;
+        }
+
+        #delPdfPageModal2 > div > div {
+            margin-top: 20%;
+            margin-left: 60%;
+            width: 400px;
+        !important;
+        }
+
+        #timeLineModal .modal-content {
+            margin-left: 50%;
+            margin-top: 0%;
+            width: 100%;
+        }
+
+        /**固定列样式*/
+        .fixed-table-body-columns {
+            top: 40px !important;
+            /*height:226px!important;*/
+        }
+
+        #mb {
+            display: none;
+            height: 120%;
+            width: 100%;
+            /*position: fixed;*/
+            position: absolute;
+            z-index: 1200;
+            /*height: 1380px;*/
+            background: #FFF;
+            top: 0;
+            left: 0;
+            opacity: 0.6;
+        }
+
+        #arrow {
+            color: #fff;
+            background: #000;
+            width: 20px;
+            height: 90px;
+            line-height: 90px;
+            font-size: 12px;
+            font-family: "宋体";
+            text-align: center;
+            font-weight: bold;
+            float: left;
+        }
+
+        /*.panel-primary > .panel-heading{*/
+        /*background-color: #3c8dbc;*/
+        /*border-color: #3c8dbc;*/
+        /*}*/
+        .showDelDiv {
+            margin-left: 0px;
+            border: 1px solid #e5e5e5;
+            width: 90%;
+            margin-bottom: 5px;
+        }
+
+        .showImg2 {
+            margin-left: 2%;
+            margin-bottom: 2px;
+            width: 95%;
+            height: 200px;
+        }
+
+        .returnPageCls {
+            margin-right: 2px;
+        }
+
+        #addDelDiv {
+            width: 85%;
+            background-color: #0b93d5;
+            text-align: center;
+            color: red;
+        }
+
+        #upLoadImgBtn {
+            width: 35%;
+            text-align: left;
+        }
+
+        #delAllImgBtn {
+            width: 35%;
+        }
+
+        #addPdfPageBtn {
+            width: 40%;
+        }
+
+        #delImgPageModal > div > div {
+            width: 400px;
+            margin-left: 55%;
+            margin-top: 20%;
+        }
+
+        .img_div {
+            overflow-y: auto;
+            overflow-x: hidden;
+            height: calc(75vh);
+        !important;
+        }
+
+        .img_div2 {
+            overflow-y: auto;
+            overflow-x: hidden;
+            height: calc(75vh);
+        !important;
+        }
+
+        #imgDelPageModal .modal-content {
+            margin-left: 5%;
+            width: calc(200%); /*margin-left:-15%;*/
+            height: calc(90vh);
+            overflow-x: hidden;
+            overflow-y: auto;
+        !important;
+        }
+
+        #QXInfoModal .modal-header2 {
+            width: calc(210%);
+        }
+
+        #titleSearch {
+            align: left;
+            margin-left: 5px;
+            height: 34px;
+            width: 300px;
+        !important;
+        }
+
+        #assortNameQX {
+            width: 600px;
+        !important;
+        }
+
+        /*选中行颜色*/
+        .fixed-table-container tbody .selected td {
+            background-color: #9acfea;
+        }
+
+        .formCss {
+            margin-top: 20px;
+            margin-left: 20px;
+        }
+
+        .tjCss {
+            margin-left: 10px;
+            margin-right: 20px;
+            height: auto;
+        }
+    </style>
+</head>
+<body>
+<input type="text" value="" id="collectionID" hidden>
+<input type="text" value="" id="pid" hidden>
+<input type="text" id="tableId" hidden/>
+<input type="text" id="inpatientNo" hidden/>
+<div id="mb"></div>
+<div  class="tjCss">
+    <!--搜索-->
+    <form class="formCss">
+        <div class="form-inline">
+            <div class="form-group divCss8">
+                <label for="inpNo">住院号:</label>
+                <input type="text" class="input-sm form-control" id="inpNo" placeholder="请输入住院号">
+            </div>
+            <div class="form-group divCss8">
+                <label for="visitId">住院次数:</label>
+                <input type="number" class="input-sm form-control" id="visitId" placeholder="请输入次数">
+            </div>
+            <div class="form-group divCss8">
+                <label for="name">姓名:</label>
+                <input type="text" class="input-sm form-control" id="name" placeholder="请输入姓名">
+            </div>
+            <div class="form-group divCss8" id="deptDiv" style="height: 18px;margin-top: -7px;">
+                <label>入院科室 :</label>
+                <select class="selectpicker bla bla bli" multiple data-live-search="true"   data-actions-box="true" data-deselect-all-text="取消全选" data-select-all-text="全选"
+                        data-none-results-text="没找到相应记录{0}" name="deptAdmissionTo" id="deptAdmissionTo" title="请输入科室">
+                </select>
+            </div>
+            <div class="form-group divCss8" id="deptDiv2" style="height: 18px;margin-top: -7px;">
+                <label>出院科室 :</label>
+                <select class="selectpicker bla bla bli" multiple data-live-search="true"   data-actions-box="true" data-deselect-all-text="取消全选" data-select-all-text="全选"
+                        data-none-results-text="没找到相应记录{0}" name="deptName" id="deptName" title="请输入科室">
+                </select>
+            </div>
+            <div class="form-group divCss8">
+                <label>出院日期:</label>
+                <div class="input-daterange input-group" id="datepicker">
+                    <input type="text" class="input-sm form-control" name="start" id="startDate"/>
+                    <span class="input-group-addon">-</span>
+                    <input type="text" class="input-sm form-control" name="end" id="endDate"/>
+                </div>
+            </div>
+            <div class="form-group divCss8">
+                <label for="archivestate">归档状态 :</label>
+                <select class="input-sm form-control" id="archivestate">
+                    <option value="">全部</option>
+                    <option value="初审">初审</option>
+                    <option value="复审退回">复审退回</option>
+                    <option value="已归档">已归档</option>
+                </select>
+            </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>
+    </form>
+    <!--数据表格-->
+    <table id="table" class="table text-nowrap table-striped" ></table>
+    <div id="toolbar" class="btn-group pull-right toolbarCss" >
+        <div class="columns columns-right btn-group pull-right" style="margin-top:0px;">
+            <div class="btn-group btn-info">
+                <select id="sel_exportoption" class="form-control">                
+                    <option value="">导出当前页面数据</option>                                       
+                    <option value="all">导出全部数据</option>                                     
+                    <option value="selected">导出选中数据</option>
+                </select>
+            </div>
+            <button class=" btn btn-success btn-sm" style="height: 34px" type="button" id="refreshBtn" name="refresh" aria-label="Refresh"
+                    title="Refresh">
+                <i class="glyphicon glyphicon-refresh icon-refresh"></i>
+            </button>
+        </div>
+    </div>
+</div>
+
+
+
+<!-- 模态框3（Modal）查看档案 -->
+<div class="modal fade" id="selModal" tabindex="1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header2">
+                <button type="button" class="close" id="closeBtn">
+                    &times;
+                </button>
+                <h4 class="modal-title">
+                    病历清单
+                </h4>
+            </div>
+            <div class="modal-body divCss2">
+                <!--通过审批且未过期的patientId集合-->
+                <form class="form-horizontal" id="form1">
+                    <div class="row">
+                        <div class="row divCss3">病历信息</div>
+                        <div class="seal-result" style="display:none;" id="printTableFlag">已打印</div>
+                        <label id="assortId" hidden></label>
+                        <label id="source" hidden></label>
+                        <input type="text" id="outDateLab" hidden/>
+                        <label id="patientId" hidden></label>
+                        <label id="idLab" class="labCss" hidden></label>
+                        <div id="tableDiag">
+                            <div class="row divCss2">
+                                <div class="col-sm-4">
+                                    住院号：<label id="inLab" class="labCss"></label>
+                                </div>
+                                <div class="col-sm-4">
+                                    住院次数：<label id="inTimeLab" class="labCss"></label>
+                                </div>
+                                <div class="col-sm-3">
+                                    姓名：<label id="nameLab" class="labCss"></label>
+                                </div>
+                            </div>
+                            <div class="row divCss2">
+                                <div class="col-sm-4">
+                                    入院科室：<label id="deptToLab" class="labCss"></label>
+                                </div>
+                                <div class="col-sm-4">
+                                    入院日期：<label id="inDateLab" class="labCss"></label>
+                                </div>
+                                <div class="col-sm-3" id="firstDiv">
+                                    初审管理:
+                                    <button type="button" class="btn btn-danger btn-sm" id="getFirstBtn">初审查看
+                                    </button>
+                                </div>
+                                <div class="col-sm-3" id="recallDiv">
+                                    缺陷管理:
+                                    <button type="button" class="btn btn-danger btn-sm" id="getRecallBtn">缺陷查看
+                                    </button>
+                                </div>
+                                <div class="col-sm-4"><input type="text" id="outDeptLab" hidden/>
+                                    出院科室：<label id="outDeptToLab" class="labCss"></label>
+                                </div>
+                                <div class="col-sm-4">
+                                    出院日期：<label id="outDeptDateLab" class="labCss"></label>
+                                </div>
+                                <div class="col-sm-3" id="timeLine">
+                                    跟踪管理:
+                                    <button type="button" class="btn btn-info btn-sm" id="getTimeline">跟踪查看</button>
+                                </div>
+                            </div>
+                        </div>
+                        <div id="tableLgDiag">
+                            <div class="row divCss2">
+                                <div class="col-sm-4">
+                                    患者ID：<label id="patientIdLab" class="labCss"></label>
+                                </div>
+                                <div class="col-sm-4">
+                                    留观号：<label id="inLab1" class="labCss"></label>
+                                </div>
+                                <div class="col-sm-4">
+                                    留观次数：<label id="inTimeLab1" class="labCss"></label>
+                                </div>
+                            </div>
+                            <div class="row divCss2">
+                                <div class="col-sm-4">
+                                    姓名：<label id="nameLab1" class="labCss"></label>
+                                </div>
+                                <div class="col-sm-4">
+                                    留观开始日期：<label id="deptToLab1" class="labCss"></label>
+                                </div>
+                                <div class="col-sm-4">
+                                    留观结束日期：<label id="inDateLab1" class="labCss"></label>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="row divCss4">完整性审核:
+                            <button type="button" class="btn btn-warning btn-sm" id="getReloadWz">校验完整性</button>
+                        </div>
+                        <div id="wzContent"></div>
+                    </div>
+
+                    <div class="divCss4"></div>
+                    <div class="row">
+                        <%--<div class="row divCss3 ">病历清单</div>--%>
+                        <div class="col-sm-3 divCss2">
+                            <div class="row titleCss"></div>
+                            <div class="row form-inline">
+                                <input type="text" id="key" value="" class="input-sm form-control empty"
+                                       placeholder="分段名称"/>
+                                <button type="button" class="btn btn-primary btn-sm" id="searchBtn1">查询</button>
+                            </div>
+                            <div class="row">
+                                <button type="button" class="btn  btn-success btn-sm treeBtn1" onclick="expandAll();">
+                                    全部展开
+                                </button>
+                                <button type="button" class="btn  btn-success btn-sm treeBtn" onclick="collapseAll();">
+                                    全部收缩
+                                </button>
+                            </div>
+                            <div class="row">
+                                <!--树-->
+                                <div class="zTreeDemo" id="foo">
+                                    <ul id="ztree" class="ztree"></ul>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-sm-8 divCss5">
+                            <div class="row ">
+                                <div class="col-sm-3 " style="margin-top: 5px;">
+                                    <input type="checkbox" id="flag" value="1">只显示作废</input>
+                                </div>
+                                <div class="col-sm-9 btnGroupCss">
+                                    <button type="button" class="btn btn-primary btn-sm" id="collectionBtn">按需采集
+                                    </button>
+                                    <button type="button" class="btn btn-primary btn-sm" id="viewBtn">患者统一视图
+                                    </button>
+                                    <button type="button" class="btn btn-danger btn-sm" id="addPdfBtn">添加pdf</button>
+                                    <button type="button" class="btn btn-default btn-sm" id="uploadBtn">上传文件
+                                    </button>
+                                    <button type="button" class="btn btn-info btn-sm" id="pdfBtn">查看分段PDF</button>
+                                    <button type="button" class="btn btn-success btn-sm" id="pdfBtn2">查看PDF</button>
+                                    <%-- <button type="button" class="btn btn-info btn-sm" id="pdfBtn3">查看扫描PDF</button>--%>
+                                    <%--<button type="button" class="btn btn-primagetAssortdetailry btn-sm" id="addBtn">添加清单</button>--%>
+                                    <button type="button" class="btn btn-warning btn-sm" id="updateStateBtn">选中作废
+                                    </button>
+                                    <button type="button" class="btn btn-primary btn-sm" id="updateStateBtn2">选中使用
+                                    </button>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <!--数据表格-->
+                                <table id="table2" class="table  text-nowrap  table-striped"></table>
+                                <div id="toolbar2" class="btn-group pull-left toolbarCss">
+                                    <div class=" row columns  btn-group pull-right " style="margin-top:0px;">
+                                        <div class="row form-inline" style="margin-left: 10px">标题:
+                                            <input class="input-sm form-control form-inline" type="text"
+                                                   id="titleSearch" name="titleSearch" aria-label="Refresh"
+                                                   title="Refresh" placeholder="请输入pdf相关标题"/>
+                                            <select class="selectpicker bla bla bli" data-live-search="true"
+                                                    name="sourceSearch" id="sourceSearch" title="来源">
+                                            </select>
+                                            <button type="button" class="btn btn-primary btn-sm" id="titleSearchBtn">
+                                                查询
+                                            </button>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+</div>
+
+
+<%--时间轴弹窗--%>
+<div class="modal fade" id="timeLineModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content ">
+            <div class="modal-header2">
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">×</span>
+                </button>
+                <h4 class="modal-title">流转节点时间轴</h4>
+            </div>
+            <div class="modal-body" style="height:500px;overflow:auto">
+                <div class="cx-time-main" id="cxTime">
+
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-default btn-sm" data-dismiss="modal">返回</button>
+                <%--<button type="button" class="btn btn-primary btn-sm" id="verifyBtn">通过</button>--%>
+            </div>
+        </div>
+    </div>
+</div>
+</body>
+<script>
+    var tipLoad = 1;
+
+    $(function () {
+
+
+        var url = window.location.href;
+        var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", "");
+        if (index != null && index != "" && index.indexOf("excel") != -1) {
+            $("#excelBtn").show();
+            $("#toolbar").show();
+        } else {
+            $("#excelBtn").hide();
+            $(".columns-right").hide();
+        }
+
+        function getDept() {
+            //获取科室列表
+            $.ajax({
+                url: "${path}/inHosp/getDept",
+                type: "POST",
+                data: {effective: 1, typecode: "dept_code"},
+                success: function (result) {
+                    if (result != null) {
+                        for (var i = 0; i < result.length; i++) {
+                            $("#deptName").append("<option value=" + result[i].code + ">" + result[i].name + "</option>");
+                            $("#deptAdmissionTo").append("<option value=" + result[i].code + ">" + result[i].name + "</option>");
+                        }
+                    }
+                    $('#deptName').selectpicker('refresh');
+                    $('#deptAdmissionTo').selectpicker('refresh');
+                }
+            });
+        }
+
+        getDept();
+    });
+
+    //日期控件
+    $(".input-daterange").datepicker({
+        format: "yyyy-mm-dd",
+        language: "zh-CN"
+    });
+    var scollPostion1 = null;
+    var editSelRow = [];
+    var isscanedVal = "";
+    var isSignVal = "";
+    function initTable() {
+        if(tipLoad == 1){
+            $("#table").bootstrapTable({ // 对应table标签的id
+                //method: 'POST',
+                url: "${path}/death/deathRecordList", // 获取表格数据的url
+                contentType: "application/x-www-form-urlencoded",//一种编码。好像在post请求的时候需要用到。这里用的get请求，注释掉这句话也能拿到数据
+                //dataField: "data",//这是返回的json数组的key.默认是"rows".这里只有前后端约定好就行
+                cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true
+                striped: true,  //表格显示条纹，默认为false
+                pagination: true, // 在表格底部显示分页组件，默认false
+                paginationShowPageGo: true,
+                pageList: [10, 20, 50, 100], // 如果设置了分页，设置可供选择的页面数据条数。设置为All 则显示所有记录。
+                smartDisplay: false,
+                pageSize: 2, // 页面数据条数
+                pageNumber: 1, // 初始化加载第一页，默认第一页
+                sidePagination: 'server', // 设置为服务器端分页     客户端：client
+                search: false,
+                showColumns: true,
+                // sortable: true,
+                // sortOrder: "asc",
+                toolbar: '#toolbar',//指定工具栏
+                searchOnEnterKey: true, //设置为 true时，按回车触发搜索方法，否则自动触发搜索方法
+                undefinedText: '---', //当数据为 undefined 时显示的字符
+                singleSelect: false,//设置True 将禁止多选
+                clickToSelect: true,//设置true 将在点击行时，自动选择rediobox 和 checkbox
+                //height: 560,     //定义表格的高度。
+                searchTimeOut: 500,// 默认500  设置搜索超时时间。
+                toolbarAlign: 'right',// 指定 toolbar 水平方向的位置。'left' 或 'right'
+                paginationDetailHAlign: 'left',//指定 分页详细信息 在水平方向的位置。'left' 或 'right'。
+                showHeader: true,//是否显示列头。
+                trimOnSearch: true,//设置为 true 将自动去掉搜索字符的前后空格。
+                //是否显示导出按钮
+                showExport: true,
+                //导出表格方式（默认basic：只导出当前页的表格数据；all：导出所有数据；selected：导出选中的数据）
+                exportDataType: "basic",
+                //导出文件类型
+                exportTypes: ['json', 'xml', 'csv', 'txt', 'sql', 'excel'],
+                exportOptions: {
+                    fileName: document.title
+                },
+                queryParams: function (params) {
+                    var currPageSize = this.pageSize;
+                    if (currPageSize == 2) {
+                        currPageSize = 10;
+                    }
+
+                    var limit= null;
+                    var offset= params.offset;
+                    //判断是否导出全部all
+                    if ($("#sel_exportoption").val() == "all") {
+                        offset=0;
+                        limit=this.totalRows;
+                        this.pageSize= limit;
+                    }else{
+                        limit = currPageSize;
+                        this.pageSize = currPageSize;
+                    }
+
+                    var archivestate="";
+                    if($("#archivestate").val()!=null && $("#archivestate").val()!=""){
+                        archivestate="" + $("#archivestate").val();
+                    }else{
+                        archivestate="已归档,已认证,初审";
+                    }
+
+                    var temp = {
+                        limit: limit,     //页面大小
+                        offset: offset,   //页码
+                        order: params.order,      //排位命令（desc，asc）
+                        idNo: $("#idNo").val(),
+                        inpNo: "" + $("#inpNo").val(),
+                        visitId:""+$("#visitId").val(),
+                        name:""+$("#name").val(),
+                        archivestate: archivestate,
+                        state:"" + $("#state").val(),
+                        startDateTo: $("#startDate").val(),
+                        endDateTo: $("#endDate").val(),
+                        deptName: $("#deptName").val().toString(),
+                        deptAdmissionTo: $("#deptAdmissionTo").val().toString()
+                    };
+                    return temp;
+                },
+                sortName: 'id', // 要排序的字段
+                sortOrder: 'desc', // 排序规则
+                columns: [{
+                    title: '全选',
+                    field: 'select',   //复选框
+                    checkbox: true,
+                    width: 25,
+                    align: 'center',
+                    valign: 'middle',
+
+                },
+                    {
+                        title: '序号',
+                        field: 'id',
+                        align: 'center',
+                        valign: 'middle',
+                        //sortable: true,
+                        visible: false,
+                        formatter: function (value, row, index) {
+                            return index + 1;
+                        }
+                    },
+                    {
+                        title: '病案清单id',
+                        field: 'archiveDetailId',
+                        align: 'left',
+                        valign: 'middle',
+                        visible: false
+                    },
+                    {
+                        title: '住院号',
+                        field: 'inpNo',
+                        align: 'left',
+                        valign: 'middle'
+                    },
+                    {
+                        title: '住院次数',
+                        field: 'visitId',
+                        align: 'center',
+                        valign: 'middle'
+                    },
+                    {
+                        title: '姓名',
+                        field: 'name',
+                        align: 'left',
+                        valign: 'middle'
+                    },
+                    {
+                        title: '性别',
+                        field: 'sex',
+                        align: 'center',
+                        valign: 'middle'
+                    },
+                    {
+                        title: '入院科室',
+                        field: 'deptAdmissionTo',
+                        align: 'left',
+                        valign: 'middle'
+                    },
+                    {
+                        title: '入院日期',
+                        field: 'admissionDateTime',
+                        align: 'center'
+                    },
+                    {
+                        title: '出院科室',
+                        field: 'deptName',
+                        align: 'left',
+                        valign: 'middle'
+                    },
+                    {
+                        title: '出院日期',
+                        field: 'dischargeDateTime',
+                        align: 'center',
+                        valign: 'middle'
+                    },
+                    {
+                        title: '归档状态',
+                        field: 'archivestate',
+                        align: 'center',
+                        valign: 'middle',
+                        formatter: function (value, row, index) {
+                            //在院  未归档  归档中  初审 已归档 已认证
+                            //在院  未归档  归档中  初审 已归档 已认证 复审退回
+                            var a = '';
+                            if (value == "未归档") {
+                                a = '<span style="color:#c0c0c0;"><i class="fa fa-times-circle-o" aria-hidden="true"></i>' + value + '</span>';
+                            } else if (value == "已归档") {
+                                a = '<span style="color:#030378"><i class="fa fa-check-circle-o" aria-hidden="true"></i>' + value + '</span>';
+                            } else if (value == "在院") {
+                                a = '<span style="color:#bfa200"><i class="fa fa-check-circle-o" aria-hidden="true"></i>' + value + '</span>';
+                            } else if (value == "归档中") {
+                                a = '<span style="color:#5d9c0a"><i class="fa fa-check-circle-o" aria-hidden="true"></i>' + value + '</span>';
+                            } else if (value == "初审") {
+                                a = '<span style="color:#8FBC8F"><i class="fa fa-check-circle-o" aria-hidden="true"></i>' + value + '</span>';
+                            } else if (value == "已认证") {
+                                a = '<span style="color:#FF7F24"><i class="fa fa-check-circle-o" aria-hidden="true"></i>' + value + '</span>';
+                            } else if (value == "复审退回") {
+                                a = '<span style="color:red"><i class="fa fa-check-circle-o" aria-hidden="true"></i>' + value + '</span>';
+                            } else if (value == "提交") {
+                                a = '<span style="color:blue"><i class="fa fa-check-circle-o" aria-hidden="true"></i>' + value + '</span>';
+                            } else if (value == "主任退回") {
+                                a = '<span style="color:#0000FF"><i class="fa fa-check-circle-o" aria-hidden="true"></i>' + value + '</span>';
+                            }
+                            return a;
+                        }
+                    },
+                    {
+                        title: "操作",
+                        align: 'left',
+                        valign: 'middle',
+                        width: 100, // 定义列的宽度，单位为像素px
+                        formatter: function (value, row, index) {
+                            var html = "";
+                            html += '<button type="button" class="btn btn-danger btn-sm selInfo">查看</button>';// '<a href="javascript:;" class="delete">删除</a>';
+                            if (row.archivestate == '初审') {
+                                html += '<button type="button" class="btn btn-sm btn-primary verifyInfo">审核</button>';
+                            }
+                            return html;
+                        },
+                        events: {
+                            'click .selInfo': function (e, value, row, index) {
+                                selIno(row, 'table');
+                                $("#nameLab").html(row.name);
+                                if (row.admissionDateTime != null && row.admissionDateTime != '') {
+                                    $("#inDateLab").html(row.admissionDateTime.substring(0, 10));
+                                }
+                                $("#chargeLab").html(row.doctorInCharge);
+                                $("#deptToLab").html(row.deptAdmissionTo);
+                                $("#outDeptToLab").html(row.deptName);
+                                $("#outDeptDateLab").html(row.dischargeDateTime);
+                                $("#outHospLab").html(row.dischargeDisposition);
+                                $("#inLab").html(row.inpNo);
+                                $("#inTimeLab").html(row.visitId);
+                            },
+                            'click .verifyInfo': function (e, value, row, index) {
+                                lashVerifyApprove(row, 'table');
+                            }
+                        },
+                        cellStyle: function (value, row, index) {
+                            return {classes: 'success'}
+
+                        }
+                    }
+                ],
+                onLoadSuccess: function (result) {  //加载成功时执行
+                    // console.info("加载成功");
+                    tipLoad = 0;
+                    $('#table').bootstrapTable('scrollTo', scollPostion1);
+                    //console.info(editSelRow);
+                    if (editSelRow != []) {
+                        //对刷新表格的数据选中之前选的id行
+                        $('#table').bootstrapTable("checkBy", {field: 'id', values: editSelRow});
+                    }
+                }, onCheckAll: function (rows) { //点击全选框时触发的操作
+                    if (rows != null && rows.length) {
+                        for (var i = 0; i < rows.length; i++) {
+                            if (editSelRow.indexOf(row.id) == -1) {
+                                editSelRow.push(rows[i].id);
+                            }
+                        }
+                    }
+                }, onCheck: function (row) {//点击每一个单选框时触发的操作
+                    scollPostion1 = $('#table').bootstrapTable('getScrollPosition');
+                    if (editSelRow.indexOf(row.id) == -1) {
+                        editSelRow.push(row.id);
+                    }
+                }, onUncheck: function (row) {//取消每一个单选框时对应的操作；
+                    var index = editSelRow.indexOf(row.id);
+                    if (index > -1) {
+                        editSelRow.splice(index, 1);
+                    }
+                }, onUncheckAll: function (row) {//取消每一个单选框时对应的操作；
+                    editSelRow = [];
+                },
+                onLoadError: function () {  //加载失败时执行
+                    //console.info("加载数据失败");
+                    tipLoad = 0;
+                }
+            });
+        }
+    }
+
+    //查看方法
+    function selIno(row, tableId) {
+        showDiag(tableId);
+        $("#printTableFlag").hide();
+        //ID供按需采集使用
+        $("#collectionID").val(row.id);
+        $("#pid").val(row.patientId);
+        if (row.printNum == '已打印') {
+            $("#printTableFlag").show();
+        }
+        //实时获取完整性
+        getWzxFun(row.id);
+        $('#selModal').modal({
+            backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
+            keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
+            show: true//弹出对话框
+        });
+
+
+        if (row.archivestate != '复审退回') {
+            $("#recallDiv").hide();
+        } else {
+            $("#recallDiv").show();
+        }
+        if (row.archivestate == '初审') {
+            $("#firstDiv").show();
+        } else {
+            $("#firstDiv").hide();
+        }
+        //同步
+        isscanedVal = row.isscaned;
+        isSignVal = row.isSign;
+        $("#patientId").html(row.patientId);
+        $("#idLab").html(row.id);
+        //入/出院年+出院月+住院号+住院次数
+        var outDate = "";
+        if (row.dischargeDateTime != null && row.dischargeDateTime != "") {
+            outDate = row.dischargeDateTime.split("-");
+        } else if (row.admissionDateTime != null && row.admissionDateTime != "") {
+            outDate = row.admissionDateTime.split("-");
+        }
+        $("#outDateLab").val(outDate[0] + "" + outDate[1] + "" + row.inpNo.trim() + "" + row.visitId + "");
+
+        initTree(row.id);
+        //获取来源下拉框
+        getSourceFun();
+    }
+
+
+    function getWzxFun(archiveDetailId) {
+        //实时获取完整性
+        $.ajax({
+            url: "${path}/beHosp/wzByArchivId",
+            type: "POST",
+            data: {archiveDetailId: archiveDetailId},
+            success: function (resultWz) {
+                $("#wzContent").empty();
+                $("#wzContent").html(resultWz);
+            }
+        });
+    }
+
+    //查看方法的清单显示方法
+    function showDiag(tableId) {
+        $("#tableDiag").hide();
+        $("#tableLgDiag").hide();
+        if ('table' == tableId) {
+            $("#tableDiag").show();
+        } else if ('tableLg' == tableId) {
+            $("#tableLgDiag").show();
+        }
+    }
+
+    //审核方法
+    function lashVerifyApprove(row, tableId) {
+        $("#inpatientNo").val(row.inpNo);
+        //赋值表id
+        $("#tableId").val(tableId);
+        if (row.id != null && row.id != "") {
+            $.ajax({
+                url: "${path}/beHosp/getMaster",
+                type: "get",
+                data: {"id": row.id},
+                success: function (result) {
+                    if (result != null) {
+                        if (result.id != null) {
+                            if (result.archivestate == '初审') {
+                                //生成表单token,防止表单重复提交
+                                setFormToken();
+                                // console.log("====审核====");
+                                $('#verifyModal').modal({
+                                    backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
+                                    keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
+                                    show: true//弹出对话框
+                                });
+                                $("#archiveId").val(row.id);
+                                $("#isScaned2").val(row.isscaned);
+                                $("#isSign2").val(row.isSign);
+                                $("#verifyText").val("");
+
+                            } else {
+                                toastr.warning("病案室已经审核!");
+                                //刷新
+                                $('#' + tableId).bootstrapTable('refresh');
+                            }
+
+                        } else {
+                            toastr.warning("病案号不存在!");
+                        }
+                    } else {
+                        toastr.warning("病案不存在!");
+                    }
+                }, error: function () {
+                    toastr.error("操作失败!");
+                }
+            });
+        } else {
+            toastr.warning("病案号不存在!");
+        }
+    }
+
+
+    var oTimeAxiosFun = null;
+    function getTimeLine(archiveDetailId) {
+        $('#timeLineModal').modal({
+            backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
+            keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
+            show: true//弹出对话框
+        });
+        var param = {
+            data: "", // 数据
+            id: 'cxTime', //dom节点ID
+            index: 0, // 选中时间节点
+            sort: 'just', // 正序just，反序back, 其他表示不排序
+            sortKey: 'handleTime', //排序的参数key
+            // activeColor: '#26a69a', // 选中颜色
+            props: ['handleName', 'handleTime', 'followingContent'], //展示的key
+        }
+        $.ajax({
+            url: "${path}/medicalHandle/getTimeLine?masterId=" + archiveDetailId,
+            type: "GET",
+            success: function (result) {
+                param.data = result;
+                oTimeAxiosFun = new oTimeAxios(param);
+            }, error: function () {
+                toastr.error("操作失败!");
+            }
+        });
+    }
+
+
+    function logFun(id, archiveDetailId, recallReason) {
+        $('#logModal').modal({
+            backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
+            keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
+            show: true//弹出对话框
+        });
+        $("#archiveDetailId").val(archiveDetailId);
+        if (recallReason!= "null") {
+            $("#recallReason").html(recallReason);
+        }
+        //获取最后一次操作召回日志记录
+        $.ajax({
+            url: "${path}/recallDate/lastBylogTitle",
+            type: "POST",
+            data: {"logTitle": id},
+            success: function (result) {
+                $("#creater").val(result.creater);
+                $("#ip").val(result.ip);
+            }, error: function () {
+                toastr.error("召回失败！")
+            }
+        });
+
+    }
+
+    function recallFun(id, archiveDetailId,inpNo,vprintinfoId){
+        //生成表单token,防止表单重复提交
+        setFormToken();
+
+        $('#exampleModal').modal({
+            backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
+            keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
+            show: true//弹出对话框
+        });
+        $("#recallReason2").val("");
+        $("#inpatientNo").val(inpNo)
+        //$("#id").val(id);
+        $("#danganhao").html(archiveDetailId);
+
+        //提醒是否使用
+        if (vprintinfoId != null && vprintinfoId != "" && vprintinfoId != "null"){
+            alert("已使用");
+        }
+    }
+
+    var value = [];
+    //查询
+    $('#searchBtn').click(function () {
+        if ($("#deptName").val().length > 0){
+            value = $("#deptName").val();
+        }
+        if ($("#deptAdmissionTo").val().length > 0){
+            value = $("#deptAdmissionTo").val();
+        }
+        if (tipLoad == 0) {
+            $("#table").bootstrapTable("refreshOptions", {pageNumber: 1});
+        } else {
+            toastr.warning("正在查询，请稍等...");
+        }
+        //$("#deptName").val([]);
+    });
+
+    //获取table的高度
+    function getHeight() {
+        return $(window).height() - 100;
+    }
+
+    initTable();
+
+    //2.初始化select的change事件
+    $("#sel_exportoption").change(function () {
+        $('#table').bootstrapTable('refreshOptions', {
+            exportDataType: $(this).val()
+        });
+    });
+    $("#refreshBtn").click(function () {
+        //刷新
+        $('#table').bootstrapTable('refresh');
+    });
+
+    //导出excel功能
+    $("#excelBtn").click(function () {
+        toastr.warning("正在导出，请稍等...");
+        var inpNo = "" + $("#inpNo").val();
+        var visitId = "" + $("#visitId").val();
+        var name = "" + $("#name").val();
+        var idNo = "" + $("#idNo").val();
+        var state = "" + $("#state").val();
+        var deptName = $("#deptName").val();
+        var deptAdmissionTo = $("#deptAdmissionTo").val();
+        var archivestate="";
+        if($("#archivestate").val()!=null && $("#archivestate").val()!=""){
+            archivestate="" + $("#archivestate").val();
+        }else{
+            archivestate="已归档,已认证,初审";
+        }
+
+        //var url = window.location.href;
+        // var deptName = url.substring(url.lastIndexOf('&') + 1).replace("depts=", "");
+        // var len = ($("#deptName").val()).length;
+        // if (len > 0) {
+        //     var deptNameT = $("#deptName").val();
+        //     if (deptNameT.indexOf("") == -1) {
+        //         deptName = $("#deptName").val().toString();
+        //     }
+        // }
+        window.location.href = "${path}/medicalRecall/exportExcel?inpNo=" + inpNo + "&visitId=" + visitId +
+            "&name=" + name + "&state=" + state + "&idNo=" + idNo + "&archivestate=" + archivestate + "&deptName=" + deptName + "&deptAdmissionTo=" + deptAdmissionTo;
+
+    });
+
+    $("#stateBtn").click(function () {
+        $('#exampleModal').modal('hide');  //手动关闭
+        //console.log("===召回事件======="+ $("#id").val()+":"+ $("#danganhao").html());
+        var archiveDetailId=$("#danganhao").html();
+        var id = archiveDetailId;
+        var recallReason= $("#recallReason2").val();
+        $.ajax({
+            url: "${path}/medicalRecall/updateState",
+            type: "POST",
+            data: {
+                "state": "已召回",
+                "archiveDetailId": archiveDetailId,
+                recallReason: recallReason,
+                content: $("#inpatientNo").val(),
+                formToken: $("#formToken").val()
+            },
+            success: function (result) {
+                $('#table').bootstrapTable('refresh');
+                //刷新
+                if (result.indexOf("成功") != -1) {
+                    toastr.success(result);
+                } else {
+                    toastr.warning(result);
+                }
+            }, error: function () {
+                //刷新
+                // $('#table').bootstrapTable('refresh');
+                toastr.error("召回失败！")
+            }
+        });
+
+    });
+
+</script>
+<script src="${path}/static/js/lastVerify/observationRecordList.js?time=2022-02-25"></script>
+</html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp
index 006e28a4..525e0182 100644
--- a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp
+++ b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp
@@ -3983,7 +3983,6 @@
                                 $("#isScaned2").val(row.isscaned);
                                 $("#isSign2").val(row.isSign);
                                 $("#verifyText").val("");
-
                             } else {
                                 toastr.warning("病案室已经审核!");
                                 //刷新