diff --git a/src/main/java/com/emr/controller/ScientificResearchController.java b/src/main/java/com/emr/controller/ScientificResearchController.java
index 4f72d085..f061d0d7 100644
--- a/src/main/java/com/emr/controller/ScientificResearchController.java
+++ b/src/main/java/com/emr/controller/ScientificResearchController.java
@@ -23,4 +23,15 @@ public class ScientificResearchController {
     public String scientificTemplate(Model model) {
         return "scientificResearch/scientificTemplate";
     }
+
+
+    @RequestMapping(value = "/researchList")
+    public String researchList(Model model) {
+        return "scientificResearch/research";
+    }
+
+    @RequestMapping(value = "/scientificRecord")
+    public String scientificRecord(Model model) {
+        return "scientificResearch/scientificRecord";
+    }
 }
diff --git a/src/main/java/com/emr/controller/beHospitaledController.java b/src/main/java/com/emr/controller/beHospitaledController.java
index c5918db8..692c5756 100644
--- a/src/main/java/com/emr/controller/beHospitaledController.java
+++ b/src/main/java/com/emr/controller/beHospitaledController.java
@@ -155,7 +155,11 @@ public class beHospitaledController {
         Date doctorTime=null;
         Date nurseTime=null;
         Date lastTime=null;
-          String MID = entityFault.getArchiveDetailId();
+        String result1="";
+        String result2="";
+        String result3="";
+          String MID = emrFaultDetail.getArchiveDetailId();
+        System.out.println("病案号"+MID);
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         List<ArchiveOtherExt> archiveOtherExts = archiveOtherExtService.selectExtTime(MID);
         if (!CollectionUtils.isEmpty(archiveOtherExts)) {
@@ -184,107 +188,117 @@ public class beHospitaledController {
                     doctorTime = (Date) map.get("FINISHED_DATE_TIME");
                     nurseTime = (Date) map.get("MR_COMMIT_NURSE_DATE_TIME");
                     lastTime = (Date) map.get("FIRST_PAGE_FINISHED_SAVE_TIME");
+                    System.out.println("医生文书提交时间(视图)"+doctorTime);
+                    System.out.println("医生文书提交时间(提交)"+c1);
+                    System.out.println("护士文书提交时间(视图)"+nurseTime);
+                    System.out.println("医生文书提交时间(提交)"+c2);
+                    System.out.println("首页文书提交时间(视图)"+lastTime);
+                    System.out.println("医生文书提交时间(提交)"+c9);
+                    if (doctorTime!=null && nurseTime!=null && lastTime!=null ) {
+                        if (c1.compareTo(doctorTime) < 0) {
+                            result1 = "①检查文书有过修改，麻烦医生在电子病历系统重新提交医生文书";
+                        }
+                        if (c2.compareTo(nurseTime) < 0) {
+                            result2 = "②检查文书有过修改，麻烦护士在电子病历系统重新提交护士文书";
+                        }
+                        if (c9.compareTo(lastTime) < 0) {
+                            result3 = "③检查首页有过修改，麻烦医生在电子病历系统重新提交首页";
+                        }
+                        result = result1 + result2 + result3;
+                        System.out.println("result1"+result1);
+                        System.out.println("result2"+result2);
+                        System.out.println("result3"+result3);
+                        System.out.println("医生文书"+c2.compareTo(nurseTime));
+                        System.out.println("护士文书"+c2.compareTo(nurseTime));
+                        System.out.println("首页"+c9.compareTo(lastTime));
+                        if (result.equals("")) {
+                            if (flagNum == 0) {
+                                try {
+                                    String endpoint = HomepageDictionary;
+                                    //String endpoint = "http://localhost:8080/ca3/services/caSynrochnized?wsdl";
+                                    String method = HomepageMethod;
+                                    JaxWsDynamicClientFactory factory = JaxWsDynamicClientFactory.newInstance();
+                                    Client client = factory.createClient(endpoint);
+                                    String temp = emrFaultDetail.getArchiveDetailId();
+                                    Object[] res = null;
+                                    res = client.invoke(method, temp);
+                                    result = (String) res[0];
+                                    //给方法传递参数，并且调用方法
+                                    //System.out.println("result is " + result);
+                                } catch (Exception e) {
+                                    System.err.println(e.toString());
+                                    return "连接不到完整性接口!";
+                                }
+                                if (result.equals("完整")) {
+                                    //修改病案归档状态
+                                    Archive_Master archiveMaster = new Archive_Master();
+                                    archiveMaster.setId(emrFaultDetail.getArchiveDetailId());
+                                    archiveMaster.setArchivestate(emrFaultDetail.getState());
+                                    archiveMaster.setLockinfo(result);
+                                    archiveMaster.setCmtDoctor(1);
+                                    archiveMaster.setCmtNurse(1);
+                                    int bol = archiveMasterService.updateByClo(archiveMaster);
+                                    //添加初审内容
+                                    if (bol == 1) {
+                                        //参数输入
+                                        archiveMaster.setFirstInstance(username);
+                                        emrFaultDetail.setCreater(username);
+                                        emrFaultDetail.setCreateTime(nowTime);
+                                        emrFaultDetail.setState("未召回");
+                                        bol = emrFaultDetailService.insertSel(emrFaultDetail);
+
+                                        //初审成功日志
+                                        String handleName = user.getUserPosition();//姓名
+                                        Archive_Master_Following archive_master_following = new Archive_Master_Following();
+                                        archive_master_following.setMasterId(emrFaultDetail.getArchiveDetailId());
+                                        //following表中添加科主任审核操作记录
+                                        archive_master_following.setFollowingType("5");
+                                        archive_master_following.setFollowingContent("科主任审核");
+                                        archive_master_following.setHandleTime(nowTime);
+                                        archive_master_following.setHandleId(username);
+                                        archive_master_following.setHandleName(handleName);
+                                        archive_master_followingService.insertSelective(archive_master_following);
+                                    }
+                                } else {
+                                    //修改病案归档完整内容Lockinfo
+                                    Archive_Master archiveMaster = new Archive_Master();
+                                    emrFaultDetail.setCreater(username);
+                                    emrFaultDetail.setCreateTime(nowTime);
+                                    archiveMaster.setFirstInstance(username);
+                                    //archiveMaster.setArchivestate(emrFaultDetail.getState());
+                                    archiveMaster.setId(emrFaultDetail.getArchiveDetailId());
+                                    archiveMaster.setLockinfo("强制提交，" + result);
+                                    archiveMaster.setCmtDoctor(1);
+                                    archiveMaster.setCmtNurse(1);
+                                    archiveMasterService.updateByClo(archiveMaster);
+                                }
+                            } else {
+                                result = "提交失败,存在缺陷未处理!";
+                            }
+                        }
+                    }
                 }
             }
         } catch (Exception e) {
             e.printStackTrace();
         }
     }
-        String result1="";
-        String result2="";
-        String result3="";
-        if (doctorTime!=null || nurseTime!=null || lastTime!=null ) {
-            if (c1.compareTo(doctorTime) < 0) {
-                result1 = "①检查文书有过修改，麻烦医生在电子病历系统重新提交医生文书";
-            }
-            if (c2.compareTo(nurseTime) < 0) {
-                result2 = "②检查文书有过修改，麻烦护士在电子病历系统重新提交护士文书";
-            }
-            if (c9.compareTo(lastTime) < 0) {
-                result3 = "③检查首页有过修改，麻烦医生在电子病历系统重新提交首页";
-            }
-            if (result1 != "" || result2 != "" || result3 != "") {
-                result = result1 + result2 + result3;
-            }
-         if (c1.compareTo(doctorTime)>=0 && c2.compareTo(nurseTime)>=0 && c9.compareTo(lastTime)>=0 ){
-           if(flagNum==0) {
-            try {
-                String endpoint = HomepageDictionary;
-                //String endpoint = "http://localhost:8080/ca3/services/caSynrochnized?wsdl";
-                String method = HomepageMethod;
-                JaxWsDynamicClientFactory factory = JaxWsDynamicClientFactory.newInstance();
-                Client client = factory.createClient(endpoint);
-                String temp = emrFaultDetail.getArchiveDetailId();
-                Object[] res = null;
-                res = client.invoke(method, temp);
-                result = (String) res[0];
-                //给方法传递参数，并且调用方法
-                //System.out.println("result is " + result);
-            } catch (Exception e) {
-                System.err.println(e.toString());
-                return "连接不到完整性接口!";
-            }
-            if (result.equals("完整")) {
-                //修改病案归档状态
-                Archive_Master archiveMaster = new Archive_Master();
-                archiveMaster.setId(emrFaultDetail.getArchiveDetailId());
-                archiveMaster.setArchivestate(emrFaultDetail.getState());
-                archiveMaster.setLockinfo(result);
-                archiveMaster.setCmtDoctor(1);
-                archiveMaster.setCmtNurse(1);
-                int bol = archiveMasterService.updateByClo(archiveMaster);
-                //添加初审内容
-                if (bol == 1) {
-                    //参数输入
-                    archiveMaster.setFirstInstance(username);
-                    emrFaultDetail.setCreater(username);
-                    emrFaultDetail.setCreateTime(nowTime);
-                    emrFaultDetail.setState("未召回");
-                    bol = emrFaultDetailService.insertSel(emrFaultDetail);
-
-                    //初审成功日志
-                    String handleName = user.getUserPosition();//姓名
-                    Archive_Master_Following archive_master_following = new Archive_Master_Following();
-                    archive_master_following.setMasterId(emrFaultDetail.getArchiveDetailId());
-                    //following表中添加科主任审核操作记录
-                    archive_master_following.setFollowingType("5");
-                    archive_master_following.setFollowingContent("科主任审核");
-                    archive_master_following.setHandleTime(nowTime);
-                    archive_master_following.setHandleId(username);
-                    archive_master_following.setHandleName(handleName);
-                    archive_master_followingService.insertSelective(archive_master_following);
-                }
-            } else {
-                //修改病案归档完整内容Lockinfo
-                Archive_Master archiveMaster = new Archive_Master();
-                emrFaultDetail.setCreater(username);
-                emrFaultDetail.setCreateTime(nowTime);
-                archiveMaster.setFirstInstance(username);
-                //archiveMaster.setArchivestate(emrFaultDetail.getState());
-                archiveMaster.setId(emrFaultDetail.getArchiveDetailId());
-                archiveMaster.setLockinfo("强制提交，" + result);
-                archiveMaster.setCmtDoctor(1);
-                archiveMaster.setCmtNurse(1);
-                archiveMasterService.updateByClo(archiveMaster);
-            }
-        }else{
-            result = "提交失败,存在缺陷未处理!";
-        }
-        }
-        }else {
-            if (doctorTime==null) {
-                result1 = "①文书提交时间为空，麻烦医生在电子病历系统重新提交医生文书";
-            }
-            if (nurseTime==null) {
-                result2 = "②文书提交时间为空，麻烦护士在电子病历系统重新提交护士文书";
-            }
-            if (lastTime==null) {
-                result3 = "③首页提交时间为空，麻烦医生在电子病历系统重新提交首页";
-            }
-            if (result1 != "" || result2 != "" || result3 != "") {
-                result = result1 + result2 + result3;
-            }
-        }
+
+
+//        }else {
+//            if (doctorTime==null ) {
+//                result1 = "①文书提交时间为空，麻烦医生在电子病历系统重新提交医生文书";
+//            }
+//            if (nurseTime==null) {
+//                result2 = "②文书提交时间为空，麻烦护士在电子病历系统重新提交护士文书";
+//            }
+//            if (lastTime==null) {
+//                result3 = "③首页提交时间为空，麻烦医生在电子病历系统重新提交首页";
+//            }
+//            if (result1 != "" || result2 != "" || result3 != "") {
+//                result = result1 + result2 + result3;
+//            }
+//        }
         return result;
     }
 
diff --git a/src/main/resources/mapper/ArchiveOtherExtMapper.xml b/src/main/resources/mapper/ArchiveOtherExtMapper.xml
index a167f75d..b50fc3fd 100644
--- a/src/main/resources/mapper/ArchiveOtherExtMapper.xml
+++ b/src/main/resources/mapper/ArchiveOtherExtMapper.xml
@@ -98,7 +98,7 @@
     where ID = #{id,jdbcType=BIGINT}
   </select>
     <select id="selectExtTime" resultType="com.emr.entity.ArchiveOtherExt" parameterType="java.lang.String">
-      select * from archive_other_ext where MID=#{MID}
+      select * from archive_other_ext where MID=#{MID} and sysFlag=-300
     </select>
     <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
     delete from archive_other_ext
diff --git a/src/main/webapp/WEB-INF/views/followDir/followDetailst.jsp b/src/main/webapp/WEB-INF/views/followDir/followDetailst.jsp
index 0deec6b4..aaa94fcd 100644
--- a/src/main/webapp/WEB-INF/views/followDir/followDetailst.jsp
+++ b/src/main/webapp/WEB-INF/views/followDir/followDetailst.jsp
@@ -114,6 +114,7 @@
                 </select>
             </div>
             <button type="button" class="btn btn-primary btn-sm divCss"id="searchBtn">查询</button>
+            <button type="button" class="btn btn-primary btn-sm divCss"id="searchBtn1">导出</button>
             <button type="button" class="btn btn-info btn-sm divCss" id="excelBtn">条件导出</button>
         </div>
     </form>
@@ -135,6 +136,41 @@
         </div>
     </div>
 </div>
+
+
+
+<!-- 模态框（Modal） -->
+<div class="modal fade" id="genjin" tabindex="-1" role="dialog" aria-labelledby="myModalgenjin" aria-hidden="true" data-backdrop="static" data-keyboard="false">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                <h4 class="modal-title" id="myModalgenjin">新增项目</h4>
+            </div>
+            <div class="modal-body" style="height:auto">
+                <form id="genjinform">
+                    <div class="formDiv">
+                        <label class="control-label left">随访方式：</label>
+                        <input type="hidden" id="followMode" name="userId">
+                        <input type="text" class="form-control input input-sm" id="followMode1" name="userName" maxlength="15">
+                    </div>
+                    <div class="formDiv" id="genjinTime">
+                        <label  class="control-label left">随访时间：</label>
+                        <input type="password" class="form-control input input-sm" readonly onfocus="this.removeAttribute('readonly');" id="re_userPwd" name="userPwd" maxlength="15" autocomplete="new-password">
+                    </div>
+                    <div class="formDiv">
+                        <label class="control-label left">文件上传：</label>
+                        <input type="file" id="followName" name="name" maxlength="15">
+                    </div>
+                </form>
+            </div>
+            <div class="modelBtns">
+                <button type="button" class="btn btn-primary btn-sm modelBtn" id="follow_submit">提交</button>
+                <button type="button" class="btn btn-default btn-sm modelBtn" onclick="clearForm()">清空</button>
+            </div>
+        </div><!-- /.modal-content -->
+    </div><!-- /.modal-dialog -->
+</div>
 </body>
 <script type="text/javascript">
     var tipLoad = 1;
@@ -362,8 +398,9 @@
                         width: 100, // 定义列的宽度，单位为像素px
                         formatter: function (value, row, index) {
                             var html = "";
-                            html += '<button type="button" class="btn btn-danger btn-sm qxInfo" >跟进 </button>';
-                            html += '<button type="button" class="btn btn-danger btn-sm qxInfo" >查看详情 </button>';
+                            html += '<button type="button" class="btn btn-danger btn-sm qxInfo"onclick="followUp()" >随访 </button>';
+                            html += '<button type="button" class="btn btn-danger btn-sm qxInfo" >打印信件 </button>';
+                            html += '<button type="button" class="btn btn-danger btn-sm qxInfo" >删除 </button>';
                             return html;
                         }
                     }
@@ -382,7 +419,15 @@
         }
     }
 
-
+    //新增框
+    function followUp() {
+        $("#re_userName").prop("readOnly",false);
+        $("#userId").val("");
+        $("#deptIds").val("");
+        $('.selectpicker').selectpicker('val','1');
+        $('#genjin').modal('show');
+        $("#passwordDiv").show();
+    }
     //查询
     $('#searchBtn').click(function () {
         if (tipLoad == 0) {
diff --git a/src/main/webapp/WEB-INF/views/followDir/followList.jsp b/src/main/webapp/WEB-INF/views/followDir/followList.jsp
index 59882105..58b44c2e 100644
--- a/src/main/webapp/WEB-INF/views/followDir/followList.jsp
+++ b/src/main/webapp/WEB-INF/views/followDir/followList.jsp
@@ -102,6 +102,7 @@
                 <input type="text" class="input-sm form-control" id="creater1" placeholder="请输入相关科室">
             </div>
             <button type="button" class="btn btn-primary btn-sm divCss"id="searchBtn">查询</button>
+            <button type="button" class="btn btn-primary btn-sm divCss"id="searchBtn1">导出</button>
             <button type="button" class="btn btn-info btn-sm divCss" onclick="add()" id="increaseBtn" >新增项目</button>
         </div>
     </form>
diff --git a/src/main/webapp/WEB-INF/views/followDir/followPaper.jsp b/src/main/webapp/WEB-INF/views/followDir/followPaper.jsp
index beaf316f..86ee4a1d 100644
--- a/src/main/webapp/WEB-INF/views/followDir/followPaper.jsp
+++ b/src/main/webapp/WEB-INF/views/followDir/followPaper.jsp
@@ -88,6 +88,7 @@
     <!--搜索-->
     <form class="formCss">
         <div class="form-inline">
+            <button type="button" class="btn btn-primary btn-sm divCss"id="searchBtn1">导出</button>
             <button type="button" class="btn btn-info btn-sm divCss" onclick="add()" id="increaseBtn" >新增问卷</button>
             <button type="button" class="btn btn-primary btn-sm divCss"id="searchBtn">导入问卷</button>
         </div>
diff --git a/src/main/webapp/WEB-INF/views/followDir/followUpStatistics.jsp b/src/main/webapp/WEB-INF/views/followDir/followUpStatistics.jsp
index 4589cb63..d9f33cb2 100644
--- a/src/main/webapp/WEB-INF/views/followDir/followUpStatistics.jsp
+++ b/src/main/webapp/WEB-INF/views/followDir/followUpStatistics.jsp
@@ -449,6 +449,7 @@
                 <input type="text" class="input-sm form-control" id="inpNo" placeholder="请输入标题">
             </div>
             <button type="button" class="btn btn-primary btn-sm divCss" id="searchBtn">查询</button>
+            <button type="button" class="btn btn-primary btn-sm divCss"id="searchBtn1">导出</button>
         </div>
     </form>
     <!--数据表格-->
diff --git a/src/main/webapp/WEB-INF/views/scientificResearch/research.jsp b/src/main/webapp/WEB-INF/views/scientificResearch/research.jsp
new file mode 100644
index 00000000..ad937501
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/scientificResearch/research.jsp
@@ -0,0 +1,551 @@
+<%@ page import="java.util.ResourceBundle" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<c:set value="${pageContext.request.contextPath}" var="path" scope="page"/>
+<%
+    ResourceBundle res = ResourceBundle.getBundle("config.jdbc");
+%>
+<%--<%@ include file="/WEB-INF/jspf/common.jspf" %>--%>
+<html>
+<head>
+    <title>科研研究库</title>
+    <meta charset="utf-8">
+    <!-- 解决部分兼容性问题，如果安装了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" %>
+</head>
+<style>
+    .modal-header2 {
+        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-header {*/
+    /*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;
+    }
+
+    /* dataTables表头居中 */
+    .table > thead:first-child > tr:first-child > th {
+        text-align: center !important;
+    }
+    .enterCss2{
+        height: 160px;
+        width: 500px;
+    }
+
+    .toolbarCss {
+        margin-right: 20px;
+        margin-bottom: 0px;
+    !important;
+    }
+
+    .fixed-table-toolbar .bs-bars .pull-right{
+        height: 20px;
+    !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>
+<body>
+<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>病案号:</label>
+                <input type="text" class="input-sm form-control" id="creater" placeholder="请输入病案号">
+            </div>
+            <div class="form-group divCss8">
+                <label>患者姓名:</label>
+                <input type="text" class="input-sm form-control" id="creater1" placeholder="请输入患者姓名">
+            </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" id="deptDiv" style="height: 18px;margin-top: -7px;">
+                <label >出院科室:</label>
+                <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>--%>
+                </select>
+            </div>
+            <button type="button" class="btn btn-primary btn-sm divCss"id="searchBtn">查询</button>
+            <button type="button" class="btn btn-primary btn-sm divCss"id="searchBtn1">导出</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>
+<!-- 模态框（Modal） -->
+<div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" data-backdrop="static" data-keyboard="false">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                <h4 class="modal-title" id="myModalLabel">新增项目</h4>
+            </div>
+            <div class="modal-body" style="height:auto">
+                <form id="updateaddform">
+                    <div class="formDiv">
+                        <label class="control-label left">模板名称：</label>
+                        <input type="hidden" id="userId" name="userId">
+                        <input type="text" class="form-control input input-sm" id="re_userName" name="userName" maxlength="15">
+                    </div>
+                    <div class="formDiv" id="passwordDiv">
+                        <label  class="control-label left">负责人：</label>
+                        <input type="password" class="form-control input input-sm" readonly onfocus="this.removeAttribute('readonly');" id="re_userPwd" name="userPwd" maxlength="15" autocomplete="new-password">
+                    </div>
+                    <div class="formDiv">
+                        <label class="control-label left">模板要求：</label>
+                        <input type="text" class="form-control input input-sm" id="name" name="name" maxlength="15">
+                    </div>
+                    <div class="formDiv">
+                        <label  class="control-label left">参与人员：</label>
+                        <input type="text" class="form-control input input-sm" id="re_userTel1" name="userTel" oninput="if(value.length>11)value=value.slice(0,11)">
+                    </div>
+                    <div class="formDiv">
+                        <label  class="control-label left">科研术称：</label>
+                        <input type="text" class="form-control input input-sm" id="re_userTel" name="userTel" oninput="if(value.length>11)value=value.slice(0,11)">
+                    </div>
+                    <div class="formDiv">
+                        <label  class="control-label left">科研病历：</label>
+                        <input type="text" class="form-control input input-sm" id="re_userEmail" name="userEmail" maxlength="25">
+                    </div>
+                </form>
+            </div>
+            <div class="modelBtns">
+                <button type="button" class="btn btn-primary btn-sm modelBtn" id="btn_submit">提交</button>
+                <button type="button" class="btn btn-default btn-sm modelBtn" onclick="clearForm()">清空</button>
+            </div>
+        </div><!-- /.modal-content -->
+    </div><!-- /.modal-dialog -->
+</div>
+
+
+
+
+
+
+<div class="modal fade" id="myModal1" tabindex="-1" role="dialog" aria-labelledby="myModalLabel1" aria-hidden="true" data-backdrop="static" data-keyboard="false">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                <h4 class="modal-title" id="myModalLabel1">编辑模板</h4>
+            </div>
+            <div class="modal-body" style="height:auto">
+                <form id="updateaddform1">
+                    <div class="formDiv">
+                        <label class="control-label left">模板名称：</label>
+                        <input type="hidden" id="userId1" name="userId">
+                        <input type="text" class="form-control input input-sm" id="re_userName1" name="userName" maxlength="15">
+                    </div>
+                    <div class="formDiv" id="passwordDiv1">
+                        <label  class="control-label left">负责人：</label>
+                        <input type="password" class="form-control input input-sm" readonly onfocus="this.removeAttribute('readonly');" id="re_userPwd1" name="userPwd" maxlength="15" autocomplete="new-password">
+                    </div>
+                    <div class="formDiv">
+                        <label class="control-label left">模板要求：</label>
+                        <input type="text" class="form-control input input-sm" id="name1" name="name" maxlength="15">
+                    </div>
+                    <div class="formDiv">
+                        <label  class="control-label left">参与人员：</label>
+                        <input type="text" class="form-control input input-sm" id="re_userTel111" name="userTel" oninput="if(value.length>11)value=value.slice(0,11)">
+                    </div>
+                    <div class="formDiv">
+                        <label  class="control-label left">科研术称：</label>
+                        <input type="text" class="form-control input input-sm" id="re_userTel11" name="userTel" oninput="if(value.length>11)value=value.slice(0,11)">
+                    </div>
+                    <div class="formDiv">
+                        <label  class="control-label left">科研病历：</label>
+                        <input type="text" class="form-control input input-sm" id="re_userEmail1" name="userEmail" maxlength="25">
+                    </div>
+                </form>
+            </div>
+            <div class="modelBtns">
+                <button type="button" class="btn btn-primary btn-sm modelBtn" id="btn_submit1">提交</button>
+                <button type="button" class="btn btn-default btn-sm modelBtn" onclick="clearForm()">清空</button>
+            </div>
+        </div><!-- /.modal-content -->
+    </div><!-- /.modal-dialog -->
+</div>
+</body>
+<script type="text/javascript">
+    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();
+        }
+
+    });
+
+    //日期控件
+    $(".input-daterange").datepicker({
+        format: "yyyy-mm-dd",
+        language: "zh-CN"
+    });
+    /* var currDate=getCurrDate();
+     var currDate30=getCurrDay30();
+     $('#startDate').val(currDate30);
+     $('#endDate').val(currDate);*/
+
+    //处理导出内容,这个方法可以自定义某一行、某一列、甚至某个单元格的内容,也就是将其值设置为自己想要的内容
+    function DoOnCellHtmlData(cell, row, col, data) {
+        if (row == 0) {
+            return data;
+        }
+
+        //由于备注列超过6个字的话,通过span标签处理只显示前面6个字,如果直接导出的话会导致内容不完整,因此要将携带完整内容的span标签中title属性的值替换
+        if (col == 4 || col == 11 || col == 7) {
+            var spanObj = $(data);//将带 <span title="val"></span> 标签的字符串转换为jQuery对象
+            var title = spanObj.attr("title");//读取<span title="val"></span>中title属性的值
+            //var span = cell[0].firstElementChild;//读取cell数组中的第一个值下的第一个元素
+            if (typeof (title) != 'undefined') {
+                return title;
+            }
+        }
+
+        return data;
+    }
+    var data=[{patientId:"381116",inpNo:"1",deptName:"陈敏",visitId:"耳鼻喉科",name:"2022-08-10",scientiTime:"王梦洁",sex:"2022-08-10",sex1:"庞龙英,黄秀芳,吴雄秋",sex2:"000188286300,000579294100"},]
+    function initTable() {
+        if(tipLoad == 1){
+            $("#table").bootstrapTable({ // 对应table标签的id
+                //method: 'POST',
+                <%--url: "${path}/scanInfo/scanDetailPage", // 获取表格数据的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: 10, // 页面数据条数
+                pageNumber: 1, // 初始化加载第一页，默认第一页
+                sidePagination: 'client', // 设置为服务器端分页     客户端：client
+                search: false,
+                data:data,
+                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
+                },
+                // showToggle: false,                    //是否显示详细视图和列表视图的切换按钮
+                // cardView: false,                    //是否显示详细视图
+                // detailView: false,                   //是否显示父子表
+                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 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();
+                    //     }
+                    // }
+
+
+                    var temp = {
+                        limit: limit,     //页面大小
+                        offset: offset,   //页码
+                        order: params.order,      //排位命令（desc，asc）
+                        inpNo: "" + $("#inpNo").val(),
+                        creater:""+$("#creater").val(),
+                        startDate: $("#startDate").val(),
+                        endDate: $("#endDate").val(),
+                        lockinfo: "" + $("#copyTimeType").val()
+                    };
+                    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: '病案号',
+                        field: 'patientId',
+                        align: 'left',
+                        valign: 'middle',
+                        width: 300
+                    },
+                    {
+                        title: '住院次数',
+                        field: 'inpNo',
+                        align: 'center',
+                        valign: 'middle'
+                    },
+                    {
+                        title: '患者姓名',
+                        field: 'deptName',
+                        align: 'center',
+                        width: 200
+                    },
+                    {
+                        title: '出院科室',
+                        field: 'visitId',
+                        align: 'center',
+                        valign: 'middle',
+                        width: 120
+                    },
+                    {
+                        title: '出院日期',
+                        field: 'sex',
+                        align: 'center',
+                        valign: 'middle'
+                    },
+                    {
+                        title: '主管医生',
+                        field: 'sex1',
+                        align: 'center',
+                        valign: 'middle'
+                    },
+                    {
+                        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 qxInfo" onclick="selecrt()">查看详情 </input>';
+                            html += '<button type="button" class="btn btn-warning btn-sm dealInfo">加入研究库 </button>';
+                            return html;
+                        }
+                    }
+                ],
+                onLoadSuccess: function (result) {  //加载成功时执行
+                    //console.info("加载成功");
+                    console.log(result)
+                    tipLoad = 0;
+                },
+                onLoadError: function () {  //加载失败时执行
+                    //console.info("加载数据失败");
+                    tipLoad = 0;
+                }
+
+            });
+        }
+    }
+
+
+    //查询
+    $('#searchBtn').click(function () {
+        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');
+    });
+
+    function selecrt() {
+        $.ajax({
+            type : "POST",
+            url : "${path}/scientific/scientificDetailst",
+            success : function(data) {
+                window.location.href =  'scientificDetailst';
+            },
+        })
+    }
+
+
+    //新增框
+    function followUp() {
+        $("#re_userName").prop("readOnly",false);
+        clearForm();
+        $("#userId").val("");
+        $("#deptIds").val("");
+        $('.selectpicker').selectpicker('val','1');
+        $('#genjin').modal('show');
+        $("#passwordDiv").show();
+    }
+
+    //新增框
+    function update() {
+        $("#re_userName").prop("readOnly",false);
+        clearForm();
+        $("#userId").val("");
+        $("#deptIds").val("");
+        $('.selectpicker').selectpicker('val','1');
+        $('#myModal1').modal('show');
+        $("#passwordDiv").show();
+    }
+
+
+    //新增框
+    function add() {
+        $("#re_userName").prop("readOnly",false);
+        clearForm();
+        $("#userId").val("");
+        $("#deptIds").val("");
+        $('.selectpicker').selectpicker('val','1');
+        $('#myModal').modal('show');
+        $("#passwordDiv").show();
+    }
+    //清空
+    function clearForm(){
+        $("#updateaddform")[0].reset();
+        //loadTree();
+        $("#deptIds").val("");
+    }
+
+    //导出excel功能
+    $("#excelBtn").click(function () {
+        toastr.warning("正在导出，请稍等...");
+        var inpNo = "" + $("#inpNo").val();
+        var creater=""+$("#creater").val();//扫描人
+        var startDate= $("#startDate").val();
+        var endDate= $("#endDate").val();
+        var lockinfo= "" + $("#copyTimeType").val();
+        window.location.href = "${path}/scanInfo/exportExcel?inpNo=" + inpNo + "&startDate=" + startDate +
+            "&endDate=" + endDate + "&lockinfo=" + lockinfo+ "&creater=" + creater;
+
+    });
+
+
+</script>
+
+</html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/scientificResearch/scientificList.jsp b/src/main/webapp/WEB-INF/views/scientificResearch/scientificList.jsp
index 00745d65..3d57aab4 100644
--- a/src/main/webapp/WEB-INF/views/scientificResearch/scientificList.jsp
+++ b/src/main/webapp/WEB-INF/views/scientificResearch/scientificList.jsp
@@ -102,6 +102,7 @@
                 <input type="text" class="input-sm form-control" id="creater1" placeholder="请输入相关科室">
             </div>
             <button type="button" class="btn btn-primary btn-sm divCss"id="searchBtn">查询</button>
+            <button type="button" class="btn btn-primary btn-sm divCss"id="searchBtn1">导出</button>
             <button type="button" class="btn btn-info btn-sm divCss" onclick="add()" id="increaseBtn" >新增项目</button>
         </div>
     </form>
diff --git a/src/main/webapp/WEB-INF/views/scientificResearch/scientificRecord.jsp b/src/main/webapp/WEB-INF/views/scientificResearch/scientificRecord.jsp
new file mode 100644
index 00000000..83a9e836
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/scientificResearch/scientificRecord.jsp
@@ -0,0 +1,568 @@
+<%@ page import="java.util.ResourceBundle" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<c:set value="${pageContext.request.contextPath}" var="path" scope="page"/>
+<%
+    ResourceBundle res = ResourceBundle.getBundle("config.jdbc");
+%>
+<%--<%@ include file="/WEB-INF/jspf/common.jspf" %>--%>
+<html>
+<head>
+    <title>科研记录</title>
+    <meta charset="utf-8">
+    <!-- 解决部分兼容性问题，如果安装了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" %>
+</head>
+<style>
+    .modal-header2 {
+        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-header {*/
+    /*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;
+    }
+
+    /* dataTables表头居中 */
+    .table > thead:first-child > tr:first-child > th {
+        text-align: center !important;
+    }
+    .enterCss2{
+        height: 160px;
+        width: 500px;
+    }
+
+    .toolbarCss {
+        margin-right: 20px;
+        margin-bottom: 0px;
+    !important;
+    }
+
+    .fixed-table-toolbar .bs-bars .pull-right{
+        height: 20px;
+    !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>
+<body>
+<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>病案号:</label>
+                <input type="text" class="input-sm form-control" id="creater" placeholder="请输入病案号">
+            </div>
+            <div class="form-group divCss8">
+                <label>患者姓名:</label>
+                <input type="text" class="input-sm form-control" id="creater1" placeholder="请输入患者姓名">
+            </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" id="deptDiv" style="height: 18px;margin-top: -7px;">
+                <label >出院科室:</label>
+                <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>--%>
+                </select>
+            </div>
+            <div class="form-group divCss8">
+                <label>记录者:</label>
+                <input type="text" class="input-sm form-control" id="creater4" placeholder="请输入记录者">
+            </div>
+            <button type="button" class="btn btn-primary btn-sm divCss"id="searchBtn">查询</button>
+            <button type="button" class="btn btn-primary btn-sm divCss"id="searchBtn1">导出</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>
+<!-- 模态框（Modal） -->
+<div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" data-backdrop="static" data-keyboard="false">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                <h4 class="modal-title" id="myModalLabel">新增项目</h4>
+            </div>
+            <div class="modal-body" style="height:auto">
+                <form id="updateaddform">
+                    <div class="formDiv">
+                        <label class="control-label left">模板名称：</label>
+                        <input type="hidden" id="userId" name="userId">
+                        <input type="text" class="form-control input input-sm" id="re_userName" name="userName" maxlength="15">
+                    </div>
+                    <div class="formDiv" id="passwordDiv">
+                        <label  class="control-label left">负责人：</label>
+                        <input type="password" class="form-control input input-sm" readonly onfocus="this.removeAttribute('readonly');" id="re_userPwd" name="userPwd" maxlength="15" autocomplete="new-password">
+                    </div>
+                    <div class="formDiv">
+                        <label class="control-label left">模板要求：</label>
+                        <input type="text" class="form-control input input-sm" id="name" name="name" maxlength="15">
+                    </div>
+                    <div class="formDiv">
+                        <label  class="control-label left">参与人员：</label>
+                        <input type="text" class="form-control input input-sm" id="re_userTel1" name="userTel" oninput="if(value.length>11)value=value.slice(0,11)">
+                    </div>
+                    <div class="formDiv">
+                        <label  class="control-label left">科研术称：</label>
+                        <input type="text" class="form-control input input-sm" id="re_userTel" name="userTel" oninput="if(value.length>11)value=value.slice(0,11)">
+                    </div>
+                    <div class="formDiv">
+                        <label  class="control-label left">科研病历：</label>
+                        <input type="text" class="form-control input input-sm" id="re_userEmail" name="userEmail" maxlength="25">
+                    </div>
+                </form>
+            </div>
+            <div class="modelBtns">
+                <button type="button" class="btn btn-primary btn-sm modelBtn" id="btn_submit">提交</button>
+                <button type="button" class="btn btn-default btn-sm modelBtn" onclick="clearForm()">清空</button>
+            </div>
+        </div><!-- /.modal-content -->
+    </div><!-- /.modal-dialog -->
+</div>
+
+
+
+
+
+
+<div class="modal fade" id="myModal1" tabindex="-1" role="dialog" aria-labelledby="myModalLabel1" aria-hidden="true" data-backdrop="static" data-keyboard="false">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                <h4 class="modal-title" id="myModalLabel1">编辑模板</h4>
+            </div>
+            <div class="modal-body" style="height:auto">
+                <form id="updateaddform1">
+                    <div class="formDiv">
+                        <label class="control-label left">模板名称：</label>
+                        <input type="hidden" id="userId1" name="userId">
+                        <input type="text" class="form-control input input-sm" id="re_userName1" name="userName" maxlength="15">
+                    </div>
+                    <div class="formDiv" id="passwordDiv1">
+                        <label  class="control-label left">负责人：</label>
+                        <input type="password" class="form-control input input-sm" readonly onfocus="this.removeAttribute('readonly');" id="re_userPwd1" name="userPwd" maxlength="15" autocomplete="new-password">
+                    </div>
+                    <div class="formDiv">
+                        <label class="control-label left">模板要求：</label>
+                        <input type="text" class="form-control input input-sm" id="name1" name="name" maxlength="15">
+                    </div>
+                    <div class="formDiv">
+                        <label  class="control-label left">参与人员：</label>
+                        <input type="text" class="form-control input input-sm" id="re_userTel111" name="userTel" oninput="if(value.length>11)value=value.slice(0,11)">
+                    </div>
+                    <div class="formDiv">
+                        <label  class="control-label left">科研术称：</label>
+                        <input type="text" class="form-control input input-sm" id="re_userTel11" name="userTel" oninput="if(value.length>11)value=value.slice(0,11)">
+                    </div>
+                    <div class="formDiv">
+                        <label  class="control-label left">科研病历：</label>
+                        <input type="text" class="form-control input input-sm" id="re_userEmail1" name="userEmail" maxlength="25">
+                    </div>
+                </form>
+            </div>
+            <div class="modelBtns">
+                <button type="button" class="btn btn-primary btn-sm modelBtn" id="btn_submit1">提交</button>
+                <button type="button" class="btn btn-default btn-sm modelBtn" onclick="clearForm()">清空</button>
+            </div>
+        </div><!-- /.modal-content -->
+    </div><!-- /.modal-dialog -->
+</div>
+</body>
+<script type="text/javascript">
+    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();
+        }
+
+    });
+
+    //日期控件
+    $(".input-daterange").datepicker({
+        format: "yyyy-mm-dd",
+        language: "zh-CN"
+    });
+    /* var currDate=getCurrDate();
+     var currDate30=getCurrDay30();
+     $('#startDate').val(currDate30);
+     $('#endDate').val(currDate);*/
+
+    //处理导出内容,这个方法可以自定义某一行、某一列、甚至某个单元格的内容,也就是将其值设置为自己想要的内容
+    function DoOnCellHtmlData(cell, row, col, data) {
+        if (row == 0) {
+            return data;
+        }
+
+        //由于备注列超过6个字的话,通过span标签处理只显示前面6个字,如果直接导出的话会导致内容不完整,因此要将携带完整内容的span标签中title属性的值替换
+        if (col == 4 || col == 11 || col == 7) {
+            var spanObj = $(data);//将带 <span title="val"></span> 标签的字符串转换为jQuery对象
+            var title = spanObj.attr("title");//读取<span title="val"></span>中title属性的值
+            //var span = cell[0].firstElementChild;//读取cell数组中的第一个值下的第一个元素
+            if (typeof (title) != 'undefined') {
+                return title;
+            }
+        }
+
+        return data;
+    }
+    var data=[{patientId:"381116",inpNo:"1",deptName:"陈敏",visitId:"耳鼻喉科",name:"2022-08-10",scientiTime:"王梦洁",sex:"2022-08-10",sex1:"庞龙英,黄秀芳,吴雄秋",sex2:"000188286300,000579294100",record:"孙建华",recordTime:"2022-03-14"},
+        {patientId:"381117",inpNo:"1",deptName:"曾仁威",visitId:"耳鼻喉科",name:"2022-08-11",scientiTime:"王梦洁",sex:"2022-08-10",sex1:"庞龙英,黄秀芳,吴雄秋",sex2:"000188286300,000579294100",record:"孙建华",recordTime:"2022-03-14"},]
+    function initTable() {
+        if(tipLoad == 1){
+            $("#table").bootstrapTable({ // 对应table标签的id
+                //method: 'POST',
+                <%--url: "${path}/scanInfo/scanDetailPage", // 获取表格数据的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: 10, // 页面数据条数
+                pageNumber: 1, // 初始化加载第一页，默认第一页
+                sidePagination: 'client', // 设置为服务器端分页     客户端：client
+                search: false,
+                data:data,
+                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
+                },
+                // showToggle: false,                    //是否显示详细视图和列表视图的切换按钮
+                // cardView: false,                    //是否显示详细视图
+                // detailView: false,                   //是否显示父子表
+                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 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();
+                    //     }
+                    // }
+
+
+                    var temp = {
+                        limit: limit,     //页面大小
+                        offset: offset,   //页码
+                        order: params.order,      //排位命令（desc，asc）
+                        inpNo: "" + $("#inpNo").val(),
+                        creater:""+$("#creater").val(),
+                        startDate: $("#startDate").val(),
+                        endDate: $("#endDate").val(),
+                        lockinfo: "" + $("#copyTimeType").val()
+                    };
+                    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: '病案号',
+                        field: 'patientId',
+                        align: 'left',
+                        valign: 'middle',
+                        width: 300
+                    },
+                    {
+                        title: '住院次数',
+                        field: 'inpNo',
+                        align: 'center',
+                        valign: 'middle'
+                    },
+                    {
+                        title: '患者姓名',
+                        field: 'deptName',
+                        align: 'center',
+                        width: 200
+                    },
+                    {
+                        title: '出院科室',
+                        field: 'visitId',
+                        align: 'center',
+                        valign: 'middle',
+                        width: 120
+                    },
+                    {
+                        title: '出院日期',
+                        field: 'sex',
+                        align: 'center',
+                        valign: 'middle'
+                    },
+                    {
+                        title: '主管医生',
+                        field: 'sex1',
+                        align: 'center',
+                        valign: 'middle'
+                    },
+                    {
+                        title: '记录者',
+                        field: 'record',
+                        align: 'center',
+                        valign: 'middle'
+                    },
+                    {
+                        title: '记录时间',
+                        field: 'recordTime',
+                        align: 'center',
+                        valign: 'middle'
+                    },
+                    {
+                        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 qxInfo" onclick="selecrt()">查看详情 </input>';
+                            html += '<button type="button" class="btn btn-warning btn-sm dealInfo" onclick="selecrt()">查看科研记录表 </button>';
+                            return html;
+                        }
+                    }
+                ],
+                onLoadSuccess: function (result) {  //加载成功时执行
+                    //console.info("加载成功");
+                    console.log(result)
+                    tipLoad = 0;
+                },
+                onLoadError: function () {  //加载失败时执行
+                    //console.info("加载数据失败");
+                    tipLoad = 0;
+                }
+
+            });
+        }
+    }
+
+
+    //查询
+    $('#searchBtn').click(function () {
+        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');
+    });
+
+    function selecrt() {
+        $.ajax({
+            type : "POST",
+            url : "${path}/scientific/scientificDetailst",
+            success : function(data) {
+                window.location.href =  'scientificDetailst';
+            },
+        })
+    }
+
+
+    //新增框
+    function followUp() {
+        $("#re_userName").prop("readOnly",false);
+        clearForm();
+        $("#userId").val("");
+        $("#deptIds").val("");
+        $('.selectpicker').selectpicker('val','1');
+        $('#genjin').modal('show');
+        $("#passwordDiv").show();
+    }
+
+    //新增框
+    function update() {
+        $("#re_userName").prop("readOnly",false);
+        clearForm();
+        $("#userId").val("");
+        $("#deptIds").val("");
+        $('.selectpicker').selectpicker('val','1');
+        $('#myModal1').modal('show');
+        $("#passwordDiv").show();
+    }
+
+
+    //新增框
+    function add() {
+        $("#re_userName").prop("readOnly",false);
+        clearForm();
+        $("#userId").val("");
+        $("#deptIds").val("");
+        $('.selectpicker').selectpicker('val','1');
+        $('#myModal').modal('show');
+        $("#passwordDiv").show();
+    }
+    //清空
+    function clearForm(){
+        $("#updateaddform")[0].reset();
+        //loadTree();
+        $("#deptIds").val("");
+    }
+
+    //导出excel功能
+    $("#excelBtn").click(function () {
+        toastr.warning("正在导出，请稍等...");
+        var inpNo = "" + $("#inpNo").val();
+        var creater=""+$("#creater").val();//扫描人
+        var startDate= $("#startDate").val();
+        var endDate= $("#endDate").val();
+        var lockinfo= "" + $("#copyTimeType").val();
+        window.location.href = "${path}/scanInfo/exportExcel?inpNo=" + inpNo + "&startDate=" + startDate +
+            "&endDate=" + endDate + "&lockinfo=" + lockinfo+ "&creater=" + creater;
+
+    });
+
+
+</script>
+
+</html>
\ No newline at end of file