1.出院浏览，科主任审核，病案示踪查询增加床号查询条件

2.病案室终审增加是否死亡查询条件

src/main/java/com/emr/controller/commitController.java

@@ -50,7 +50,7 @@ public class commitController {
 
     @RequestMapping(value = "/commList")
     public String faults(Model model) {
-        //return "beHospitaledDir/beHospListTest";
+//        return "beHospitaledDir/beHospListTest";
         return "commitDir/commitList";
     }
 

src/main/java/com/emr/entity/Archive_Master.java

@@ -69,6 +69,8 @@ public class Archive_Master {
     //2020-1-13 新增扫描字段
     private String isScanning;
 
+    //2021-1-18 新增床号
+    private String bedNumber;
 
     public String getId() {
         return id;
@@ -333,4 +335,12 @@ public class Archive_Master {
     public void setIsScanning(String isScanning) {
         this.isScanning = isScanning;
     }
+
+    public String getBedNumber() {
+        return bedNumber;
+    }
+
+    public void setBedNumber(String bedNumber) {
+        this.bedNumber = bedNumber;
+    }
 }

src/main/java/com/emr/entity/Archive_Master_Vo.java

@@ -72,9 +72,22 @@ public class Archive_Master_Vo {
     // 科室是否纸质提交
     private String isscaned;
 
-    //2020-1-13 新增扫描字段
+    //2021-1-13 新增扫描字段
     private String isScanning;
 
+    //2021-1-18 新增床号
+    private String bedNumber;
+
+    private String deathFlag;
+
+    public String getDeathFlag() {
+        return deathFlag;
+    }
+
+    public void setDeathFlag(String deathFlag) {
+        this.deathFlag = deathFlag == null ? null : deathFlag.trim();
+    }
+
 
     public String getId() {
         return id;
@@ -327,6 +340,14 @@ public class Archive_Master_Vo {
     public void setIsScanning(String isScanning) {
         this.isScanning = isScanning;
     }
+
+    public String getBedNumber() {
+        return bedNumber;
+    }
+
+    public void setBedNumber(String bedNumber) {
+        this.bedNumber = bedNumber;
+    }
 }
  
 

src/main/resources/mapper/Archive_MasterMapper.xml

@@ -24,7 +24,7 @@
     <result column="dept_code_lend" jdbcType="NVARCHAR" property="deptCodeLend" />
     <result column="isscaned" jdbcType="NVARCHAR" property="isscaned" />
     <result column="isScanning" jdbcType="NVARCHAR" property="is_scanning" />
-
+    <result column="bed_number" jdbcType="NVARCHAR" property="bedNumber" />
 
     <result column="cmt_doctor" jdbcType="INTEGER" property="cmtDoctor"/>
     <result column="cmt_nurse" jdbcType="INTEGER" property="cmtNurse"/>
@@ -69,7 +69,7 @@
     id, patient_id, inp_no, visit_id, name, sex, dept_name, discharge_date_time, ArchiveState, 
     admission_date_time, dept_admission_to, check_doctor, check_datetime, checked_doctor, transfer_dept,
     checked_datetime, LockInfo, DOCTOR_IN_CHARGE, ID_NO, DISCHARGE_DISPOSITION, dept_code_lend,isscaned,is_scanning,
-    cmt_doctor,cmt_nurse,doctor_name,nurse_name,cmt_doctor_date,cmt_nurse_date,emr_doctor_cmt,emr_nure_cmt,death_flag
+    cmt_doctor,cmt_nurse,doctor_name,nurse_name,cmt_doctor_date,cmt_nurse_date,emr_doctor_cmt,emr_nure_cmt,death_flag,bed_number
   </sql>
   <select id="selectById" parameterType="java.lang.String" resultMap="BaseResultMap">
     select 
@@ -80,7 +80,7 @@
   <select id="selectByCol" parameterType="com.emr.entity.Archive_Master_Vo" resultMap="BaseResultMap">
     select distinct m.id,m.patient_id,m.inp_no,m.visit_id,m.name,m.sex,f.name
     dept_name,CONVERT(varchar(10),m.discharge_date_time, 120) discharge_date_time,m.ArchiveState,CONVERT(varchar(10),m.admission_date_time, 120) admission_date_time,d.name dept_admission_to
-    ,m.check_doctor,m.checked_datetime,m.checked_doctor,m.LockInfo,m.DOCTOR_IN_CHARGE,m.ID_NO,m.DISCHARGE_DISPOSITION,m.dept_code_lend,m.isscaned,m.is_scanning
+    ,m.check_doctor,m.checked_datetime,m.checked_doctor,m.LockInfo,m.DOCTOR_IN_CHARGE,m.ID_NO,m.DISCHARGE_DISPOSITION,m.dept_code_lend,m.isscaned,m.is_scanning,bed_number
     from archive_master m
     LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where
     typeCode='dept_code' )) d
@@ -107,6 +107,11 @@
     <if test="inpNo != null and inpNo != ''">
       and m.inp_no like '%'+#{inpNo,jdbcType=NCHAR}+'%'
     </if>
+
+    <if test="bedNumber != null and bedNumber != ''">
+      and m.bed_number like '%'+#{bedNumber,jdbcType=NVARCHAR}+'%'
+    </if>
+
     <if test="visitId != null and visitId != ''">
       and m.visit_id=#{visitId,jdbcType=NCHAR}
     </if>
@@ -182,7 +187,7 @@
     select m.id,m.patient_id,m.inp_no,m.visit_id,m.name,m.sex,f.name
     dept_name,CONVERT(varchar(10),m.discharge_date_time, 120) discharge_date_time,m.ArchiveState,CONVERT(varchar(10),m.admission_date_time, 120) admission_date_time,d.name dept_admission_to
     ,m.check_doctor,m.checked_datetime,m.checked_doctor,m.LockInfo,m.DOCTOR_IN_CHARGE,m.ID_NO,m.DISCHARGE_DISPOSITION,m.dept_code_lend,m.isscaned,m.is_scanning,
-    m.cmt_doctor,m.cmt_nurse,m.doctor_name,m.nurse_name,m.cmt_doctor_date,m.cmt_nurse_date,m.emr_doctor_cmt,m.emr_nure_cmt,m.death_flag
+    m.cmt_doctor,m.cmt_nurse,m.doctor_name,m.nurse_name,m.cmt_doctor_date,m.cmt_nurse_date,m.emr_doctor_cmt,m.emr_nure_cmt,m.death_flag,m.bed_number
     from archive_master m
     LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where
     typeCode='dept_code' )) d
@@ -205,6 +210,9 @@
     <if test="inpNo != null and inpNo != ''">
       and m.inp_no like '%'+#{inpNo,jdbcType=NCHAR}+'%'
     </if>
+    <if test="bedNumber != null and bedNumber != ''">
+      and m.bed_number like '%'+#{bedNumber,jdbcType=NVARCHAR}+'%'
+    </if>
     <if test="visitId != null and visitId != ''">
       and m.visit_id=#{visitId,jdbcType=NCHAR}
     </if>
@@ -287,7 +295,7 @@
     select m.id,m.patient_id,m.inp_no,m.visit_id,m.name,m.sex,f.name
     dept_name,CONVERT(varchar(10),m.discharge_date_time, 120) discharge_date_time,m.ArchiveState,CONVERT(varchar(10),m.admission_date_time, 120) admission_date_time,d.name dept_admission_to
     ,m.check_doctor,m.checked_datetime,m.checked_doctor,m.LockInfo,m.DOCTOR_IN_CHARGE,m.ID_NO,m.DISCHARGE_DISPOSITION,m.dept_code_lend,m.isscaned,
-    m.cmt_doctor,m.cmt_nurse,m.doctor_name,m.nurse_name,m.cmt_doctor_date,m.cmt_nurse_date,m.emr_doctor_cmt,m.emr_nure_cmt,m.death_flag,m.first_instance,m.is_scanning
+    m.cmt_doctor,m.cmt_nurse,m.doctor_name,m.nurse_name,m.cmt_doctor_date,m.cmt_nurse_date,m.emr_doctor_cmt,m.emr_nure_cmt,m.death_flag,m.first_instance,m.is_scanning,bed_number
     from archive_master m
     LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where
     typeCode='dept_code' )) d
@@ -302,6 +310,9 @@
     <if test="inpNo != null and inpNo != ''">
       and m.inp_no like '%'+#{inpNo,jdbcType=NCHAR}+'%'
     </if>
+    <if test="bedNumber != null and bedNumber != ''">
+      and m.bed_number like '%'+#{bedNumber,jdbcType=NVARCHAR}+'%'
+    </if>
     <if test="visitId != null and visitId != ''">
       and m.visit_id=#{visitId,jdbcType=NCHAR}
     </if>
@@ -391,7 +402,7 @@
     select m.id,m.patient_id,m.inp_no,m.visit_id,m.name,m.sex,f.name
     dept_name,CONVERT(varchar(10),m.discharge_date_time, 120) discharge_date_time,m.ArchiveState,CONVERT(varchar(10),m.admission_date_time, 120) admission_date_time,d.name dept_admission_to
     ,m.check_doctor,m.checked_datetime,m.checked_doctor,m.LockInfo,m.DOCTOR_IN_CHARGE,m.ID_NO,m.DISCHARGE_DISPOSITION,m.dept_code_lend,m.isscaned,
-    m.cmt_doctor,m.cmt_nurse,m.doctor_name,m.nurse_name,m.cmt_doctor_date,m.cmt_nurse_date,m.emr_doctor_cmt,m.emr_nure_cmt,m.death_flag,m.is_scanning
+    m.cmt_doctor,m.cmt_nurse,m.doctor_name,m.nurse_name,m.cmt_doctor_date,m.cmt_nurse_date,m.emr_doctor_cmt,m.emr_nure_cmt,m.death_flag,m.is_scanning,bed_number
     from archive_master m
     LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where
     typeCode='dept_code' )) d
@@ -407,6 +418,9 @@
     <if test="inpNo != null and inpNo != ''">
       and m.inp_no like '%'+#{inpNo,jdbcType=NCHAR}+'%'
     </if>
+    <if test="bedNumber != null and bedNumber != ''">
+      and m.bed_number like '%'+#{bedNumber,jdbcType=NVARCHAR}+'%'
+    </if>
     <if test="visitId != null and visitId != ''">
       and m.visit_id=#{visitId,jdbcType=NCHAR}
     </if>
@@ -495,6 +509,9 @@
     <if test="isScanning != null and isScanning != ''">
       and m.is_scanning = #{isScanning,jdbcType=NVARCHAR}
     </if>
+    <if test="deathFlag != null and deathFlag != ''">
+      and m.death_flag = #{deathFlag,jdbcType=NVARCHAR}
+    </if>
     ORDER BY m.discharge_date_time desc
   </select>
 
@@ -505,7 +522,7 @@
     select m.id,m.patient_id,m.inp_no,m.visit_id,m.name,m.sex,f.name
     dept_name,CONVERT(varchar(10),m.discharge_date_time, 120) discharge_date_time,m.ArchiveState,CONVERT(varchar(10),m.admission_date_time, 120) admission_date_time,d.name dept_admission_to
     ,m.check_doctor,m.checked_datetime,m.checked_doctor,m.LockInfo,m.DOCTOR_IN_CHARGE,m.ID_NO,m.DISCHARGE_DISPOSITION,m.dept_code_lend,m.isscaned,m.is_scanning,
-    m.cmt_doctor,m.cmt_nurse,m.doctor_name,m.nurse_name,m.cmt_doctor_date,m.cmt_nurse_date,m.emr_doctor_cmt,m.emr_nure_cmt,m.death_flag
+    m.cmt_doctor,m.cmt_nurse,m.doctor_name,m.nurse_name,m.cmt_doctor_date,m.cmt_nurse_date,m.emr_doctor_cmt,m.emr_nure_cmt,m.death_flag,bed_number
     from archive_master m
     LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where
     typeCode='dept_code' )) d
@@ -520,6 +537,9 @@
     <if test="inpNo != null and inpNo != ''">
       and m.inp_no like '%'+#{inpNo,jdbcType=NCHAR}+'%'
     </if>
+    <if test="bedNumber != null and bedNumber != ''">
+      and m.bed_number like '%'+#{bedNumber,jdbcType=NVARCHAR}+'%'
+    </if>
     <if test="visitId != null and visitId != ''">
       and m.visit_id=#{visitId,jdbcType=NCHAR}
     </if>
@@ -650,7 +670,7 @@
     </choose>
   </select>
   <select id="bbSel2" parameterType="com.emr.entity.Archive_Master_Vo" resultMap="BaseResultMap">
-    select id,inp_no,visit_id,U.name,dept_name,E.name doctor_name,DOCTOR_IN_CHARGE,ArchiveState,CONVERT(varchar(100),admission_date_time, 120) admission_date_time,CONVERT(varchar(100),U.discharge_date_time, 120) discharge_date_time,GETDATE() nowt,CEILING(DATEDIFF(hour,U.discharge_date_time,GETDATE())/24.00)-3 nurse_name
+    select id,inp_no,visit_id,U.name,dept_name,E.name doctor_name,DOCTOR_IN_CHARGE,ArchiveState,CONVERT(varchar(100),admission_date_time, 120) admission_date_time,CONVERT(varchar(100),U.discharge_date_time, 120) discharge_date_time,GETDATE() nowt,CEILING(DATEDIFF(hour,U.discharge_date_time,GETDATE())/24.00)-3 nurse_name,bed_number
     from archive_master U
     LEFT JOIN (
     select code,name from emr_dictionary
@@ -955,6 +975,7 @@
       isscaned = #{isscaned,jdbcType=NVARCHAR},
       is_scanning = #{isScanning,jdbcType=NVARCHAR},
       first_instance=#{firstInstance,jdbcType=NVARCHAR}
+      bed_number=#{bedNumber,jdbcType=NVARCHAR}
     where id = #{id,jdbcType=NVARCHAR}
   </update>
   <select id="getFName" parameterType="java.lang.String" resultType="java.lang.String">

src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp

@@ -1,4 +1,4 @@
-<%@ page contentType="text/html;charset=UTF-8" language="java" import="java.util.*" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" import="java.util.*" %>
 <%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <c:set value="${pageContext.request.contextPath}" var="path" scope="page"/>
 <%
@@ -15,6 +15,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <%@include file="../../jspf/comm.jspf" %>
     <%@ include file="../../jspf/ztreeCommom.jsp" %>
+    <%--<link rel="stylesheet" href="${path}/static/css/bootstrap-table-fixed-columns.css"/>--%>
+    <%--<script src="${path}/static/js/bootstrap-table-fixed-columns.js"></script>--%>
     <style>
         .modal-header2 {
             text-align: center !important;
@@ -296,6 +298,10 @@
                     <option value="2">护士提交</option>
                 </select>
             </div>
+            <div class="form-group divCss2">
+                <label>床号:</label>
+                <input type="text" class="input-sm form-control" id="bedNumber" placeholder="请输入床号">
+            </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>
 
@@ -2495,6 +2501,8 @@
                 //dataField: "data",//这是返回的json数组的key.默认是"rows".这里只有前后端约定好就行
                 cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true
                 striped: true,  //是否显示行间隔色
+                // fixedColumns: true,//固定列
+                // fixedNumber:3,//固定前两列
                 pagination: true, // 在表格底部显示分页组件，默认false
                 paginationShowPageGo: true,
                 pageList: [10, 20, 50, 100], // 如果设置了分页，设置可供选择的页面数据条数。设置为All 则显示所有记录。
@@ -2587,7 +2595,8 @@
                         endDateTo: $("#endDateTo").val(),
                         deptName: deptName.toString(),
                         doctorInCharge: doctorInCharge,
-                        emrCmit:$("#emrCmit").val()
+                        emrCmit:$("#emrCmit").val(),
+                        bedNumber:$("#bedNumber").val()
                     };
                     return temp;
                 },
@@ -2632,6 +2641,12 @@
                         align: 'center',
                         valign: 'middle',
                     },
+                    {
+                        title: '床号',
+                        field: 'bedNumber',
+                        align: 'center',
+                        valign: 'middle',
+                    },
                     {
                         title: '身份证号',
                         field: 'idNo',
@@ -3476,9 +3491,11 @@
         var emrCmit=$("#emrCmit").val();
         var doctorInCharge= $("#doctorInCharge").val().toString();
 
+        var bedNumber=$("#bedNumber").val();
+
         window.location.href = "${path}/beHosp/exportExcel?inpNo=" + inpNo + "&visitId=" + visitId +
             "&name=" + name  + "&archivestate=" + archivestate + "&deptName=" + deptName+"&emrCmit="+ emrCmit
-            + "&startDateTo=" + startDateTo + "&endDateTo=" + endDateTo+"&doctorInCharge="+ doctorInCharge;
+            + "&startDateTo=" + startDateTo + "&endDateTo=" + endDateTo+"&doctorInCharge="+ doctorInCharge+"&bedNumber="+bedNumber;
 
     });
 

src/main/webapp/WEB-INF/views/beHospitaledDir/beHospListTest.jsp

@@ -10,8 +10,8 @@
     <title></title>
     <%@include file="../../jspf/comm.jspf" %>
     <!--必须的css引用-->
-    <link rel="stylesheet" href="${path}/static/css/bootstrap-table-fixed-columns.css"/>
-    <script src="${path}/static/js/bootstrap-table-fixed-columns.js"></script>
+    <%--<link rel="stylesheet" href="${path}/static/css/bootstrap-table-fixed-columns.css"/>--%>
+    <%--<script src="${path}/static/js/bootstrap-table-fixed-columns.js"></script>--%>
     <%--<link rel="stylesheet" href="${path}/static/bootstrap-3.3.7/plugins/bootstrap-table-master/dist/extensions/fixed-columns/bootstrap-table-fixed-columns.css"/>--%>
     <%--<script src="${path}/static/bootstrap-3.3.7/plugins/bootstrap-table-master/dist/extensions/fixed-columns/bootstrap-table-fixed-columns.js"></script>--%>
 </head>
@@ -149,9 +149,9 @@
            // height:400,
 
             fixedColumns: true,
-            fixedNumber: 1,
-            fixedRightNumber:32,
-            addNum:70,
+            fixedNumber: 5,
+            // fixedRightNumber:32,
+            // addNum:70,
             fNum:0,
             //注册加载子表的事件。注意下这里的三个参数！
             onExpandRow: function (index, row, $detail) {

src/main/webapp/WEB-INF/views/commitDir/commitList.jsp

@@ -306,6 +306,10 @@
                     <option value="复审退回">复审退回</option>
                 </select>
             </div>
+            <div class="form-group divCss2">
+                <label>床号:</label>
+                <input type="text" class="input-sm form-control" id="bedNumber" placeholder="请输入床号">
+            </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>
             <button type="button" class="btn btn-warning btn-sm divCss" id="excelBtn2">当前科室归档</button>
@@ -842,15 +846,18 @@
                             </div>
                             <div class="row ">
                                 <span style="vertical-align:top;">退回内容：</span>
-                                <textarea id="backContent" rows="6" style="width:80%;"></textarea>
+                                <textarea id="backContent" rows="5" style="width:95%;"></textarea>
                             </div>
                             <div class="row " >
                                 <span style="vertical-align:top;">护士备注：</span>
-                                <textarea id="nuresText" rows="6" style="width:80%;" disabled></textarea>
+                                <textarea id="nuresText" rows="5" style="width:95%;" disabled></textarea>
                             </div>
                             <div class="row " >
                                 <span style="vertical-align:top;">医生备注：</span>
-                                <textarea id="doctorText" rows="6" style="width:80%;" disabled></textarea>
+                                <textarea id="doctorText" rows="5" style="width:95%;" disabled></textarea>
+                            </div>
+                            <div class="row divCss2">
+                                <input type="checkbox" id="isScanedChk1" />归档病历已全部无纸化无扫描件
                             </div>
                         </div>
 
@@ -878,17 +885,22 @@
             <div class="modal-body">
                 <form>
                     <div class="form-group ">
+                        <div class="row divCss2">
                             <input id="archiveId" hidden/>
                             <span style="vertical-align:top;">审核内容：</span>
-                        <textarea rows="6" style="width:85%;" id="verifyText"></textarea>
+                            <textarea rows="5" style="width:95%;"id="verifyText"></textarea>
                         </div>
-                    <div class="form-group " >
+                        <div class="row divCss2" >
                             <span style="vertical-align:top;">护士备注：</span>
-                        <textarea id="nuresText2" rows="6" style="width:85%;" disabled></textarea>
+                            <textarea id="nuresText2" rows="5" style="width:95%;"disabled></textarea>
                         </div>
-                    <div class="form-group " >
+                        <div class="row divCss2" >
                             <span style="vertical-align:top;">医生备注：</span>
-                        <textarea id="doctorText2" rows="6" style="width:85%;" disabled></textarea>
+                            <textarea id="doctorText2" rows="5" style="width:95%;"disabled></textarea>
+                        </div>
+                        <div class="row divCss2">
+                            <input type="checkbox" id="isScanedChk" disabled />归档病历已全部无纸化无扫描件
+                        </div>
                     </div>
                 </form>
             </div>
@@ -1763,7 +1775,7 @@
         $.ajax({
             url: "${path}/beHosp/updateStateByArchivId",
             type: "POST",
-            data: {archiveDetailId: archiveDetailId, firstTrial: firstTrial, state: state,archiveState:archiveState},
+            data: {archiveDetailId: archiveDetailId, firstTrial: firstTrial, state: state,archiveState:archiveState },
             success: function (result) {
                 if (result == "完整") {
                     $("#table").bootstrapTable("refresh");
@@ -2001,6 +2013,8 @@
                 sidePagination: 'server', // 设置为服务器端分页     客户端：client
                 search: false,
                 showColumns: true,
+                // fixedColumns: true,//固定列
+                // fixedNumber:3,//固定前两列
                 // sortable: true,
                 // sortOrder: "asc",
                 toolbar: '#toolbar',//指定工具栏
@@ -2072,7 +2086,8 @@
                         archivestate: "" + $("#archivestate").val(),
                         deptName: deptName.toString(),
                         startDateTo: $("#startDateTo").val(),
-                        endDateTo: $("#endDateTo").val()
+                        endDateTo: $("#endDateTo").val(),
+                        bedNumber:$("#bedNumber").val()
 
                     };
                     return temp;
@@ -2118,6 +2133,12 @@
                         align: 'center',
                         valign: 'middle',
                     },
+                    {
+                        title: '床号',
+                        field: 'bedNumber',
+                        align: 'center',
+                        valign: 'middle',
+                    },
                     {
                         title: '身份证号',
                         field: 'idNo',
@@ -2415,6 +2436,13 @@
                                                         });
                                                         $("#archiveId").val(row.id);
                                                         $("#verifyText").val("");
+                                                        // 2021-01-18 新增复选框勾选
+                                                        if(result.isscaned=="1"){
+                                                            $("#isScanedChk").prop("checked",true);
+                                                        }else{
+                                                            $("#isScanedChk").prop("checked",false);
+                                                        }
+
                                                     } else {
                                                         toastr.warning("科主任已经审核!");
                                                         //刷新
@@ -3020,9 +3048,11 @@
         var archivestate = $("#archivestate").val();
         var startDateTo = $("#startDateTo").val();
         var endDateTo = $("#endDateTo").val();
+        var bedNumber=$("#bedNumber").val();
+
         window.location.href = "${path}/commCtr/exportExcel?inpNo=" + inpNo + "&visitId=" + visitId +
             "&name=" + name + "&deptName=" + deptName + "&archivestate=" + archivestate
-            + "&startDateTo=" + startDateTo + "&endDateTo=" + endDateTo;
+            + "&startDateTo=" + startDateTo + "&endDateTo=" + endDateTo+"&bedNumber="+bedNumber;;
 
     });
 

src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp

@@ -1498,6 +1498,8 @@
                 sidePagination: 'server', // 设置为服务器端分页     客户端：client
                 search: false,
                 showColumns: true,
+                // fixedColumns: true,//固定列
+                // fixedNumber:3,//固定前两列
                 // sortable: true,
                 // sortOrder: "asc",
                 toolbar: '#toolbar',//指定工具栏

src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp

@@ -202,10 +202,10 @@
                 <label for="name">姓名:</label>
                 <input type="text" class="input-sm form-control" id="name" placeholder="请输入姓名">
             </div>
-            <div class="form-group divCss8">
-                <label for="name">身份证号:</label>
-                <input type="text" class="input-sm form-control" id="idNo" placeholder="请输入身份证号">
-            </div>
+            <%--<div class="form-group divCss8">--%>
+            <%--<label for="name">身份证号:</label>--%>
+            <%--<input type="text" class="input-sm form-control" id="idNo" placeholder="请输入身份证号">--%>
+            <%--</div>--%>
             <div class="form-group divCss8" id="deptDiv" style="height: 18px;margin-top: -7px;">
                 <label>出院科室:</label>
                 <%--<select class="input-sm form-control" id="deptName">--%>
@@ -239,6 +239,14 @@
                     <option value="0">否</option>
                 </select>
             </div>
+            <div class="form-group divCss"  style="height: 18px;margin-top: -7px;">
+                <label>科室是否提交纸质病历:</label>
+                <select class="selectpicker bla bla bli"  data-live-search="true" name="isScanning" id="isScanning"  title="科室是否提交纸质病历">
+                    <option value="">全部</option>
+                    <option value="1">是</option>
+                    <option value="0">否</option>
+                </select>
+            </div>
             <%--<div class="form-group divCss2">--%>
             <%--<label for="archivestate">归档状态:</label>--%>
             <%--<select class="input-sm form-control" id="archivestate">--%>
@@ -1773,12 +1781,16 @@
                 pageList: [10, 20, 50, 100], // 如果设置了分页，设置可供选择的页面数据条数。设置为All 则显示所有记录。
                 smartDisplay: false,
                 pageSize: 2, // 页面数据条数
-                pageNumber: 1, // 初始化加载第一页，默认第一页
+                pageNumber: 3, // 初始化加载第一页，默认第一页
                 sidePagination: 'server', // 设置为服务器端分页     客户端：client
                 search: false,
                 showColumns: true,
                 // sortable: true,
                 // sortOrder: "asc",
+                // fixedColumns: true,//固定列
+                // fixedNumber:3,//固定前两列
+                // fixedRightNumber:32,
+                // addNum:70,
                 toolbar: '#toolbar',//指定工具栏
                 searchOnEnterKey: true, //设置为 true时，按回车触发搜索方法，否则自动触发搜索方法
                 undefinedText: '---', //当数据为 undefined 时显示的字符
@@ -1853,7 +1865,8 @@
                         deptName: deptName,
                         startDateTo: $("#startDateTo").val(),
                         endDateTo: $("#endDateTo").val(),
-                        isscaned:$("#isscaned").val()
+                        isscaned:$("#isscaned").val(),
+                        isScanning:$("#isScanning").val()
 
                     };
                     return temp;
@@ -1899,13 +1912,13 @@
                         align: 'center',
                         valign: 'middle',
                     },
-                    {
-                        title: '身份证号',
-                        field: 'idNo',
-                        align: 'center',
-                        valign: 'middle',
-                        visible: false
-                    },
+                    // {
+                    //     title: '身份证号',
+                    //     field: 'idNo',
+                    //     align: 'center',
+                    //     valign: 'middle',
+                    //     visible: false
+                    // },
                     {
                         title: '出院科室',
                         field: 'deptName',

src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp

@@ -297,6 +297,18 @@
                     <option value="已归档">已归档</option>
                 </select>
             </div>
+            <div class="form-group divCss">
+                <label>床号:</label>
+                <input type="text" class="input-sm form-control" id="bedNumber" placeholder="请输入床号">
+            </div>
+            <div class="form-group divCss">
+                <label>是否死亡:</label>
+                <select class="input-sm form-control" id="deathFlag">
+                    <option value="">全部</option>
+                    <option value="0">否</option>
+                    <option value="1">是</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>
 
@@ -1828,7 +1840,9 @@
                         startDateTo: $("#startDateTo").val(),
                         endDateTo: $("#endDateTo").val(),
                         startDate: $("#startDate").val(),
-                        endDate: $("#endDate").val()
+                        endDate: $("#endDate").val(),
+                        bedNumber:$("#bedNumber").val(),
+                        deathFlag:$("#deathFlag").val()
 
                     };
 
@@ -1875,6 +1889,12 @@
                         align: 'center',
                         valign: 'middle',
                     },
+                    {
+                        title: '床号',
+                        field: 'bedNumber',
+                        align: 'center',
+                        valign: 'middle',
+                    },
                     {
                         title: '身份证号',
                         field: 'idNo',