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

2.病案室终审增加是否死亡查询条件
master
leijx 5 years ago
parent 6122709532
commit 15e1e6ed9b

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

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

@ -72,9 +72,22 @@ public class Archive_Master_Vo {
// 科室是否纸质提交 // 科室是否纸质提交
private String isscaned; private String isscaned;
//2020-1-13 新增扫描字段 //2021-1-13 新增扫描字段
private String isScanning; 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() { public String getId() {
return id; return id;
@ -327,6 +340,14 @@ public class Archive_Master_Vo {
public void setIsScanning(String isScanning) { public void setIsScanning(String isScanning) {
this.isScanning = isScanning; this.isScanning = isScanning;
} }
public String getBedNumber() {
return bedNumber;
}
public void setBedNumber(String bedNumber) {
this.bedNumber = bedNumber;
}
} }

@ -24,7 +24,7 @@
<result column="dept_code_lend" jdbcType="NVARCHAR" property="deptCodeLend" /> <result column="dept_code_lend" jdbcType="NVARCHAR" property="deptCodeLend" />
<result column="isscaned" jdbcType="NVARCHAR" property="isscaned" /> <result column="isscaned" jdbcType="NVARCHAR" property="isscaned" />
<result column="isScanning" jdbcType="NVARCHAR" property="is_scanning" /> <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_doctor" jdbcType="INTEGER" property="cmtDoctor"/>
<result column="cmt_nurse" jdbcType="INTEGER" property="cmtNurse"/> <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, 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, 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, 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> </sql>
<select id="selectById" parameterType="java.lang.String" resultMap="BaseResultMap"> <select id="selectById" parameterType="java.lang.String" resultMap="BaseResultMap">
select select
@ -80,7 +80,7 @@
<select id="selectByCol" parameterType="com.emr.entity.Archive_Master_Vo" resultMap="BaseResultMap"> <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 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 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 from archive_master m
LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where
typeCode='dept_code' )) d typeCode='dept_code' )) d
@ -107,6 +107,11 @@
<if test="inpNo != null and inpNo != ''"> <if test="inpNo != null and inpNo != ''">
and m.inp_no like '%'+#{inpNo,jdbcType=NCHAR}+'%' and m.inp_no like '%'+#{inpNo,jdbcType=NCHAR}+'%'
</if> </if>
<if test="bedNumber != null and bedNumber != ''">
and m.bed_number like '%'+#{bedNumber,jdbcType=NVARCHAR}+'%'
</if>
<if test="visitId != null and visitId != ''"> <if test="visitId != null and visitId != ''">
and m.visit_id=#{visitId,jdbcType=NCHAR} and m.visit_id=#{visitId,jdbcType=NCHAR}
</if> </if>
@ -182,7 +187,7 @@
select m.id,m.patient_id,m.inp_no,m.visit_id,m.name,m.sex,f.name 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 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,
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 from archive_master m
LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where
typeCode='dept_code' )) d typeCode='dept_code' )) d
@ -205,6 +210,9 @@
<if test="inpNo != null and inpNo != ''"> <if test="inpNo != null and inpNo != ''">
and m.inp_no like '%'+#{inpNo,jdbcType=NCHAR}+'%' and m.inp_no like '%'+#{inpNo,jdbcType=NCHAR}+'%'
</if> </if>
<if test="bedNumber != null and bedNumber != ''">
and m.bed_number like '%'+#{bedNumber,jdbcType=NVARCHAR}+'%'
</if>
<if test="visitId != null and visitId != ''"> <if test="visitId != null and visitId != ''">
and m.visit_id=#{visitId,jdbcType=NCHAR} and m.visit_id=#{visitId,jdbcType=NCHAR}
</if> </if>
@ -287,7 +295,7 @@
select m.id,m.patient_id,m.inp_no,m.visit_id,m.name,m.sex,f.name 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 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.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 from archive_master m
LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where
typeCode='dept_code' )) d typeCode='dept_code' )) d
@ -302,6 +310,9 @@
<if test="inpNo != null and inpNo != ''"> <if test="inpNo != null and inpNo != ''">
and m.inp_no like '%'+#{inpNo,jdbcType=NCHAR}+'%' and m.inp_no like '%'+#{inpNo,jdbcType=NCHAR}+'%'
</if> </if>
<if test="bedNumber != null and bedNumber != ''">
and m.bed_number like '%'+#{bedNumber,jdbcType=NVARCHAR}+'%'
</if>
<if test="visitId != null and visitId != ''"> <if test="visitId != null and visitId != ''">
and m.visit_id=#{visitId,jdbcType=NCHAR} and m.visit_id=#{visitId,jdbcType=NCHAR}
</if> </if>
@ -391,7 +402,7 @@
select m.id,m.patient_id,m.inp_no,m.visit_id,m.name,m.sex,f.name 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 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.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 from archive_master m
LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where
typeCode='dept_code' )) d typeCode='dept_code' )) d
@ -407,6 +418,9 @@
<if test="inpNo != null and inpNo != ''"> <if test="inpNo != null and inpNo != ''">
and m.inp_no like '%'+#{inpNo,jdbcType=NCHAR}+'%' and m.inp_no like '%'+#{inpNo,jdbcType=NCHAR}+'%'
</if> </if>
<if test="bedNumber != null and bedNumber != ''">
and m.bed_number like '%'+#{bedNumber,jdbcType=NVARCHAR}+'%'
</if>
<if test="visitId != null and visitId != ''"> <if test="visitId != null and visitId != ''">
and m.visit_id=#{visitId,jdbcType=NCHAR} and m.visit_id=#{visitId,jdbcType=NCHAR}
</if> </if>
@ -495,6 +509,9 @@
<if test="isScanning != null and isScanning != ''"> <if test="isScanning != null and isScanning != ''">
and m.is_scanning = #{isScanning,jdbcType=NVARCHAR} and m.is_scanning = #{isScanning,jdbcType=NVARCHAR}
</if> </if>
<if test="deathFlag != null and deathFlag != ''">
and m.death_flag = #{deathFlag,jdbcType=NVARCHAR}
</if>
ORDER BY m.discharge_date_time desc ORDER BY m.discharge_date_time desc
</select> </select>
@ -505,7 +522,7 @@
select m.id,m.patient_id,m.inp_no,m.visit_id,m.name,m.sex,f.name 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 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,
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 from archive_master m
LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where
typeCode='dept_code' )) d typeCode='dept_code' )) d
@ -520,6 +537,9 @@
<if test="inpNo != null and inpNo != ''"> <if test="inpNo != null and inpNo != ''">
and m.inp_no like '%'+#{inpNo,jdbcType=NCHAR}+'%' and m.inp_no like '%'+#{inpNo,jdbcType=NCHAR}+'%'
</if> </if>
<if test="bedNumber != null and bedNumber != ''">
and m.bed_number like '%'+#{bedNumber,jdbcType=NVARCHAR}+'%'
</if>
<if test="visitId != null and visitId != ''"> <if test="visitId != null and visitId != ''">
and m.visit_id=#{visitId,jdbcType=NCHAR} and m.visit_id=#{visitId,jdbcType=NCHAR}
</if> </if>
@ -650,7 +670,7 @@
</choose> </choose>
</select> </select>
<select id="bbSel2" parameterType="com.emr.entity.Archive_Master_Vo" resultMap="BaseResultMap"> <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 from archive_master U
LEFT JOIN ( LEFT JOIN (
select code,name from emr_dictionary select code,name from emr_dictionary
@ -955,6 +975,7 @@
isscaned = #{isscaned,jdbcType=NVARCHAR}, isscaned = #{isscaned,jdbcType=NVARCHAR},
is_scanning = #{isScanning,jdbcType=NVARCHAR}, is_scanning = #{isScanning,jdbcType=NVARCHAR},
first_instance=#{firstInstance,jdbcType=NVARCHAR} first_instance=#{firstInstance,jdbcType=NVARCHAR}
bed_number=#{bedNumber,jdbcType=NVARCHAR}
where id = #{id,jdbcType=NVARCHAR} where id = #{id,jdbcType=NVARCHAR}
</update> </update>
<select id="getFName" parameterType="java.lang.String" resultType="java.lang.String"> <select id="getFName" parameterType="java.lang.String" resultType="java.lang.String">

@ -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" %> <%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<c:set value="${pageContext.request.contextPath}" var="path" scope="page"/> <c:set value="${pageContext.request.contextPath}" var="path" scope="page"/>
<% <%
@ -15,6 +15,8 @@
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<%@include file="../../jspf/comm.jspf" %> <%@include file="../../jspf/comm.jspf" %>
<%@ include file="../../jspf/ztreeCommom.jsp" %> <%@ 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> <style>
.modal-header2 { .modal-header2 {
text-align: center !important; text-align: center !important;
@ -68,10 +70,10 @@
margin-top: 10px; margin-top: 10px;
margin-bottom: 5px; margin-bottom: 5px;
}病历清单 }病历清单
.labCss { .labCss {
/*color: gainsboro;*/ /*color: gainsboro;*/
color: #c1c3c4; color: #c1c3c4;
} }
.titleCss { .titleCss {
text-align: left; text-align: left;
@ -248,13 +250,13 @@
<div class="form-group divCss8" id="deptDiv" style="height: 18px;margin-top: -7px;"> <div class="form-group divCss8" id="deptDiv" style="height: 18px;margin-top: -7px;">
<label>出院科室:</label> <label>出院科室:</label>
<%--<select class="input-sm form-control" id="deptName">--%> <%--<select class="input-sm form-control" id="deptName">--%>
<%--<option value="">全部</option>--%> <%--<option value="">全部</option>--%>
<%--&lt;%&ndash;<option value="在院">在院</option>&ndash;%&gt;--%> <%--&lt;%&ndash;<option value="在院">在院</option>&ndash;%&gt;--%>
<%--&lt;%&ndash;<option value="未归档">未归档</option>&ndash;%&gt;--%> <%--&lt;%&ndash;<option value="未归档">未归档</option>&ndash;%&gt;--%>
<%--&lt;%&ndash;<option value="归档中">归档中</option>&ndash;%&gt;--%> <%--&lt;%&ndash;<option value="归档中">归档中</option>&ndash;%&gt;--%>
<%--&lt;%&ndash;<option value="初审">初审</option>&ndash;%&gt;--%> <%--&lt;%&ndash;<option value="初审">初审</option>&ndash;%&gt;--%>
<%--&lt;%&ndash;<option value="已认证">已认证</option>&ndash;%&gt;--%> <%--&lt;%&ndash;<option value="已认证">已认证</option>&ndash;%&gt;--%>
<%--&lt;%&ndash;<option value="已归档">已归档</option>&ndash;%&gt;--%> <%--&lt;%&ndash;<option value="已归档">已归档</option>&ndash;%&gt;--%>
<%--</select>--%> <%--</select>--%>
<select class="selectpicker bla bla bli" multiple data-live-search="true" name="deptName" id="deptName" <select class="selectpicker bla bla bli" multiple data-live-search="true" name="deptName" id="deptName"
title="请输入科室"> title="请输入科室">
@ -264,7 +266,7 @@
<div class="form-group divCss8" style="height: 18px;margin-top: -7px;"> <div class="form-group divCss8" style="height: 18px;margin-top: -7px;">
<label>主管医生:</label> <label>主管医生:</label>
<select class="selectpicker bla bla bli" multiple data-live-search="true" name="doctorInCharge" id="doctorInCharge" title="请输入主管医生"> <select class="selectpicker bla bla bli" multiple data-live-search="true" name="doctorInCharge" id="doctorInCharge" title="请输入主管医生">
<option value="">全部</option> <option value="">全部</option>
</select> </select>
</div> </div>
<div class="form-group divCss8"> <div class="form-group divCss8">
@ -296,6 +298,10 @@
<option value="2">护士提交</option> <option value="2">护士提交</option>
</select> </select>
</div> </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-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-info btn-sm divCss" id="excelBtn">条件导出</button>
@ -685,7 +691,7 @@
</div> </div>
<div class="row" id="backDivs"> <div class="row" id="backDivs">
<span style="color: blue;">退回信息</span> <span style="color: blue;">退回信息</span>
<!--通过审批且未过期的patientId集合--> <!--通过审批且未过期的patientId集合-->
<form class="form-horizontal" id="form2"> <form class="form-horizontal" id="form2">
<div class="row"><input id="backArchiveId" hidden> <div class="row"><input id="backArchiveId" hidden>
<%--<div class="row divCss3 ">退回信息</div>--%> <%--<div class="row divCss3 ">退回信息</div>--%>
@ -748,21 +754,21 @@
</div> </div>
</div> </div>
<%--<div class="row divCss2">--%> <%--<div class="row divCss2">--%>
<%--<span style="vertical-align:top;">缺陷类型:</span>--%> <%--<span style="vertical-align:top;">缺陷类型:</span>--%>
<%--<input type="text" id="assortName" readonly/>--%> <%--<input type="text" id="assortName" readonly/>--%>
<%--</div>--%> <%--</div>--%>
<%--<div class="row divCss2" >--%> <%--<div class="row divCss2" >--%>
<%--<span class="divCss7">选项:</span>--%> <%--<span class="divCss7">选项:</span>--%>
<%--<div class="divCss4" id="faultTypeDiv">--%> <%--<div class="divCss4" id="faultTypeDiv">--%>
<%--&lt;%&ndash;<div class="row " style="width:600px">&ndash;%&gt;--%> <%--&lt;%&ndash;<div class="row " style="width:600px">&ndash;%&gt;--%>
<%--&lt;%&ndash;<label class="col-xs-6"><input name="Fruit" type="checkbox" value=""/>苹果 </label>&ndash;%&gt;--%> <%--&lt;%&ndash;<label class="col-xs-6"><input name="Fruit" type="checkbox" value=""/>苹果 </label>&ndash;%&gt;--%>
<%--&lt;%&ndash;<label class="col-xs-6"><input name="Fruit" type="checkbox" value=""/>桃子 </label>&ndash;%&gt;--%> <%--&lt;%&ndash;<label class="col-xs-6"><input name="Fruit" type="checkbox" value=""/>桃子 </label>&ndash;%&gt;--%>
<%--&lt;%&ndash;</div>&ndash;%&gt;--%> <%--&lt;%&ndash;</div>&ndash;%&gt;--%>
<%--&lt;%&ndash;<div class="row " style="width:600px">&ndash;%&gt;--%> <%--&lt;%&ndash;<div class="row " style="width:600px">&ndash;%&gt;--%>
<%--&lt;%&ndash;<label class="col-xs-6"><input name="Fruit" type="checkbox" value=""/>苹果水电费是否是的范德萨</label>&ndash;%&gt;--%> <%--&lt;%&ndash;<label class="col-xs-6"><input name="Fruit" type="checkbox" value=""/>苹果水电费是否是的范德萨</label>&ndash;%&gt;--%>
<%--&lt;%&ndash;<label class="col-xs-6"><input name="Fruit" type="checkbox" value=""/>桃子</label>&ndash;%&gt;--%> <%--&lt;%&ndash;<label class="col-xs-6"><input name="Fruit" type="checkbox" value=""/>桃子</label>&ndash;%&gt;--%>
<%--&lt;%&ndash;</div>&ndash;%&gt;--%> <%--&lt;%&ndash;</div>&ndash;%&gt;--%>
<%--</div>--%> <%--</div>--%>
<%--</div>--%> <%--</div>--%>
<div class="row divCss2"> <div class="row divCss2">
<span style="vertical-align:top;">内容:</span> <span style="vertical-align:top;">内容:</span>
@ -1141,19 +1147,19 @@
//$(".img_div").html(""); //$(".img_div").html("");
return false; return false;
} else { } else {
/** /**
*若规则全部通过则在此提交url到后台数据库 *若规则全部通过则在此提交url到后台数据库
*/ */
// if (objUrl.indexOf(".") != -1) { // if (objUrl.indexOf(".") != -1) {
// img_html = "<div class='isImg' id='-1'><img src='require(" + objUrl + ")' id='" + fileALL[i].name + "' onclick='javascript:lookBigImg(this)' style='height: 100%; width: 100%;' />" // img_html = "<div class='isImg' id='-1'><img src='require(" + objUrl + ")' id='" + fileALL[i].name + "' onclick='javascript:lookBigImg(this)' style='height: 100%; width: 100%;' />"
// } else { // } else {
// img_html = "<div class='isImg' id='-1'><img src='" + objUrl + "' id='" + fileALL[i].name + "' onclick='javascript:lookBigImg(this)' style='height: 100%; width: 100%;' />" // img_html = "<div class='isImg' id='-1'><img src='" + objUrl + "' id='" + fileALL[i].name + "' onclick='javascript:lookBigImg(this)' style='height: 100%; width: 100%;' />"
// } // }
img_html = "<div class='isImg' id='-1'><img src='" + objUrl + "' id='" + fileALL[i].name + "' onclick='javascript:lookBigImg(this)' style='height: 100%; width: 100%;' />" img_html = "<div class='isImg' id='-1'><img src='" + objUrl + "' id='" + fileALL[i].name + "' onclick='javascript:lookBigImg(this)' style='height: 100%; width: 100%;' />"
img_html += selectStr img_html += selectStr
+ " <button class='removeBtn' onclick='javascript:removeImg(this)'>x</button></div>"; + " <button class='removeBtn' onclick='javascript:removeImg(this)'>x</button></div>";
img_div.append(img_html); img_div.append(img_html);
} }
} }
/** /**
@ -1722,276 +1728,276 @@
}); });
function getQxList() { function getQxList() {
$("#tableBack").bootstrapTable({ // 对应table标签的id $("#tableBack").bootstrapTable({ // 对应table标签的id
//method: 'POST', //method: 'POST',
url: "${path}/fault/getFaultPage", // 获取表格数据的url url: "${path}/fault/getFaultPage", // 获取表格数据的url
contentType: "application/x-www-form-urlencoded",//一种编码。好像在post请求的时候需要用到。这里用的get请求注释掉这句话也能拿到数据 contentType: "application/x-www-form-urlencoded",//一种编码。好像在post请求的时候需要用到。这里用的get请求注释掉这句话也能拿到数据
//dataField: "data",//这是返回的json数组的key.默认是"rows".这里只有前后端约定好就行 //dataField: "data",//这是返回的json数组的key.默认是"rows".这里只有前后端约定好就行
cache: false, // 设置为 false 禁用 AJAX 数据缓存, 默认为true cache: false, // 设置为 false 禁用 AJAX 数据缓存, 默认为true
striped: true, //是否显示行间隔色 striped: true, //是否显示行间隔色
pagination: true, // 在表格底部显示分页组件默认false pagination: true, // 在表格底部显示分页组件默认false
paginationShowPageGo: true, paginationShowPageGo: true,
pageList: [10, 20, 50, 100], // 如果设置了分页设置可供选择的页面数据条数。设置为All 则显示所有记录。 pageList: [10, 20, 50, 100], // 如果设置了分页设置可供选择的页面数据条数。设置为All 则显示所有记录。
smartDisplay: false, smartDisplay: false,
pageSize: 2, // 页面数据条数 pageSize: 2, // 页面数据条数
pageNumber: 1, // 初始化加载第一页,默认第一页 pageNumber: 1, // 初始化加载第一页,默认第一页
sidePagination: 'server', // 设置为服务器端分页 客户端client sidePagination: 'server', // 设置为服务器端分页 客户端client
search: false, search: false,
//showColumns: true, //showColumns: true,
//sortable: true, //sortable: true,
// sortOrder: "asc", // sortOrder: "asc",
//toolbar: '#toolbar',//指定工具栏 //toolbar: '#toolbar',//指定工具栏
searchOnEnterKey: false, //设置为 true时按回车触发搜索方法否则自动触发搜索方法 searchOnEnterKey: false, //设置为 true时按回车触发搜索方法否则自动触发搜索方法
undefinedText: '---', //当数据为 undefined 时显示的字符 undefinedText: '---', //当数据为 undefined 时显示的字符
singleSelect: true,//设置True 将禁止多选 singleSelect: true,//设置True 将禁止多选
clickToSelect: true,//设置true 将在点击行时自动选择rediobox 和 checkbox clickToSelect: true,//设置true 将在点击行时自动选择rediobox 和 checkbox
height: 350, //定义表格的高度。 height: 350, //定义表格的高度。
searchTimeOut: 500,// 默认500 设置搜索超时时间。 searchTimeOut: 500,// 默认500 设置搜索超时时间。
paginationDetailHAlign: 'left',//指定 分页详细信息 在水平方向的位置。'left' 或 'right'。 paginationDetailHAlign: 'left',//指定 分页详细信息 在水平方向的位置。'left' 或 'right'。
showHeader: true,//是否显示列头。 showHeader: true,//是否显示列头。
trimOnSearch: true,//设置为 true 将自动去掉搜索字符的前后空格。 trimOnSearch: true,//设置为 true 将自动去掉搜索字符的前后空格。
//是否显示导出按钮 //是否显示导出按钮
showExport: false, showExport: false,
//导出表格方式默认basic只导出当前页的表格数据all导出所有数据selected导出选中的数据 //导出表格方式默认basic只导出当前页的表格数据all导出所有数据selected导出选中的数据
//exportDataType: "basic", //exportDataType: "basic",
//导出文件类型 //导出文件类型
//exportTypes: ['json', 'xml', 'csv', 'txt', 'sql', 'excel'], //exportTypes: ['json', 'xml', 'csv', 'txt', 'sql', 'excel'],
exportOptions: { exportOptions: {
fileName: document.title fileName: document.title
}, },
// showToggle: false, //是否显示详细视图和列表视图的切换按钮 // showToggle: false, //是否显示详细视图和列表视图的切换按钮
// cardView: false, //是否显示详细视图 // cardView: false, //是否显示详细视图
// detailView: false, //是否显示父子表 // detailView: false, //是否显示父子表
queryParams: function (params) { queryParams: function (params) {
var currPageSize = this.pageSize; var currPageSize = this.pageSize;
if (currPageSize == 2) { if (currPageSize == 2) {
currPageSize = 10; currPageSize = 10;
} }
var limit = null; var limit = null;
var offset = params.offset; var offset = params.offset;
//判断是否导出全部all //判断是否导出全部all
if ($("#sel_exportoption").val() == "all") { if ($("#sel_exportoption").val() == "all") {
offset = 0; offset = 0;
limit = this.totalRows; limit = this.totalRows;
this.pageSize = limit; this.pageSize = limit;
} else { } else {
limit = currPageSize; limit = currPageSize;
this.pageSize = currPageSize; this.pageSize = currPageSize;
} }
var temp = { var temp = {
limit: limit, //页面大小 limit: limit, //页面大小
offset: offset, //页码 offset: offset, //页码
//order: params.order, //排位命令descasc //order: params.order, //排位命令descasc
archiveDetailId: $("#idLab").html(), archiveDetailId: $("#idLab").html(),
backFlag:1 backFlag:1
}; };
return temp; return temp;
}, },
sortName: 'id', // 要排序的字段 sortName: 'id', // 要排序的字段
sortOrder: 'desc', // 排序规则 sortOrder: 'desc', // 排序规则
columns: [{ columns: [{
field: 'archiveDetailId', field: 'archiveDetailId',
title: 'id', title: 'id',
visible: false visible: false
}, { }, {
field: 'assortId', field: 'assortId',
title: '缺陷类型ID', title: '缺陷类型ID',
width: 150, width: 150,
visible: false visible: false
}, { }, {
field: 'assortName', field: 'assortName',
title: '缺陷类型', title: '缺陷类型',
width: 150 width: 150
}, { }, {
field: 'price', field: 'price',
title: '类型分', title: '类型分',
width: 60, width: 60,
visible: false, visible: false,
formatter: function (value, row, index) { formatter: function (value, row, index) {
var result = '<span style="color:blue;"><i class="fa fa-times-circle-o" aria-hidden="true"></i>' + value + '分</span>'; var result = '<span style="color:blue;"><i class="fa fa-times-circle-o" aria-hidden="true"></i>' + value + '分</span>';
return result return result
} }
}, { }, {
title: '退回', title: '退回',
field: 'backFlag', field: 'backFlag',
align: 'center', align: 'center',
width: 130, width: 130,
formatter: function (value, row, index) { formatter: function (value, row, index) {
var result = ""; var result = "";
if (value == 1) { if (value == 1) {
result = '<span style="color:green;"><i class="fa fa-times-circle-o" aria-hidden="true"></i>科主任退回医生</span>' result = '<span style="color:green;"><i class="fa fa-times-circle-o" aria-hidden="true"></i>科主任退回医生</span>'
} else if (value == 2) { } else if (value == 2) {
result = '<span style="color:red;"><i class="fa fa-times-circle-o" aria-hidden="true"></i>科主任退回护士</span>' result = '<span style="color:red;"><i class="fa fa-times-circle-o" aria-hidden="true"></i>科主任退回护士</span>'
} else if (value == 5) { } else if (value == 5) {
result = '<span style="color:orange;"><i class="fa fa-times-circle-o" aria-hidden="true"></i>病案室退回医生</span>' result = '<span style="color:orange;"><i class="fa fa-times-circle-o" aria-hidden="true"></i>病案室退回医生</span>'
} else if (value == 6) { } else if (value == 6) {
result = '<span style="color:dodgerblue;"><i class="fa fa-times-circle-o" aria-hidden="true"></i>病案室退回护士</span>' result = '<span style="color:dodgerblue;"><i class="fa fa-times-circle-o" aria-hidden="true"></i>病案室退回护士</span>'
} }
return result return result
} }
}, { }, {
field: 'dealFlag', field: 'dealFlag',
title: '处理否', title: '处理否',
align: 'center', align: 'center',
width: 80, width: 80,
formatter: function (value, row, index) { formatter: function (value, row, index) {
var result = ""; var result = "";
if (value == "1") { if (value == "1") {
result = '<span style="color:green;"><i class="fa fa-times-circle-o" aria-hidden="true"></i>已处理</span>'; result = '<span style="color:green;"><i class="fa fa-times-circle-o" aria-hidden="true"></i>已处理</span>';
} else { } else {
result = '<span style="color:blue;"><i class="fa fa-times-circle-o" aria-hidden="true"></i>未处理</span>'; result = '<span style="color:blue;"><i class="fa fa-times-circle-o" aria-hidden="true"></i>未处理</span>';
} }
return result return result
} }
}, { }, {
field: 'dealPerson', field: 'dealPerson',
title: '处理人', title: '处理人',
width: 80 width: 80
}, { }, {
field: 'dealTime', field: 'dealTime',
title: '处理时间', title: '处理时间',
width: 150 width: 150
}, },
// { // {
// field: 'content', // field: 'content',
// title: '内容', // title: '内容',
// width: 200 // width: 200
// }, // },
{ {
title: "操作", title: "操作",
align: 'left', align: 'left',
valign: 'middle', valign: 'middle',
width: 100, // 定义列的宽度单位为像素px width: 100, // 定义列的宽度单位为像素px
formatter: function (value, row, index) { formatter: function (value, row, index) {
var url = window.location.href; var url = window.location.href;
var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", ""); var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", "");
var html = ""; var html = "";
if (row.dealFlag == 1) { if (row.dealFlag == 1) {
if (index != null && index != "" && index.indexOf("dealNO") != -1) { if (index != null && index != "" && index.indexOf("dealNO") != -1) {
html += '<button type="button" class="btn btn-warning btn-sm dealInfo" >未处理 </button>'; html += '<button type="button" class="btn btn-warning btn-sm dealInfo" >未处理 </button>';
} }
} else { } else {
if (index != null && index != "" && index.indexOf("dealOk") != -1) { if (index != null && index != "" && index.indexOf("dealOk") != -1) {
html += '<button type="button" class="btn btn-info btn-sm dealInfo" >已处理 </button>'; html += '<button type="button" class="btn btn-info btn-sm dealInfo" >已处理 </button>';
} }
} }
if (index != null && index != "" && index.indexOf("select") != -1) { if (index != null && index != "" && index.indexOf("select") != -1) {
//return '<button class="btn btn-danger btn-sm" onclick="selectFun(\'' + row + '\')">查看 </button>'; //return '<button class="btn btn-danger btn-sm" onclick="selectFun(\'' + row + '\')">查看 </button>';
html+= '<button type="button" class="btn btn-danger btn-sm qxInfo" >查看 </button>';// '<a href="javascript:;" class="delete">删除</a>'; html+= '<button type="button" class="btn btn-danger btn-sm qxInfo" >查看 </button>';// '<a href="javascript:;" class="delete">删除</a>';
} }
return html; return html;
}, events: { }, events: {
'click .qxInfo': function (e, value, row, index) { 'click .qxInfo': function (e, value, row, index) {
var url = window.location.href; var url = window.location.href;
var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", ""); var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", "");
var html = ""; var html = "";
$('#qxModal').modal({ $('#qxModal').modal({
backdrop: 'static',//backdrop 为 static 时,点击模态对话框的外部区域不会将其关闭。 backdrop: 'static',//backdrop 为 static 时,点击模态对话框的外部区域不会将其关闭。
keyboard: true,//keyboard 为 false 时,按下 Esc 键不会关闭 Modal。 keyboard: true,//keyboard 为 false 时,按下 Esc 键不会关闭 Modal。
show: true//弹出对话框 show: true//弹出对话框
}); });
var backPerson = ""; var backPerson = "";
if (row.backFlag == 1) { if (row.backFlag == 1) {
backPerson = "主任退回医生"; backPerson = "主任退回医生";
} else if (row.backFlag == 2) { } else if (row.backFlag == 2) {
backPerson = "主任退回护士"; backPerson = "主任退回护士";
} else if (row.backFlag == 5) { } else if (row.backFlag == 5) {
backPerson = "病案室退回医生"; backPerson = "病案室退回医生";
} else if (row.backFlag == 6) { } else if (row.backFlag == 6) {
backPerson = "病案室退回护士"; backPerson = "病案室退回护士";
} }
var dealFlag=""; var dealFlag="";
if (row.dealFlag == 1) { if (row.dealFlag == 1) {
dealFlag = "已处理"; dealFlag = "已处理";
if (index != null && index != "" && index.indexOf("dealNO") != -1) { if (index != null && index != "" && index.indexOf("dealNO") != -1) {
$("#dealNoBtn").show(); $("#dealNoBtn").show();
}else{ }else{
$("#dealNoBtn").hide(); $("#dealNoBtn").hide();
} }
if (index != null && index != "" && index.indexOf("dealOk") != -1) { if (index != null && index != "" && index.indexOf("dealOk") != -1) {
$("#dealBtn").hide(); $("#dealBtn").hide();
}else{ }else{
$("#dealBtn").hide(); $("#dealBtn").hide();
} }
}else{ }else{
dealFlag = "未处理"; dealFlag = "未处理";
if (index != null && index != "" && index.indexOf("dealNO") != -1) { if (index != null && index != "" && index.indexOf("dealNO") != -1) {
$("#dealNoBtn").hide(); $("#dealNoBtn").hide();
} else { } else {
$("#dealNoBtn").hide(); $("#dealNoBtn").hide();
} }
if (index != null && index != "" && index.indexOf("dealOk") != -1) { if (index != null && index != "" && index.indexOf("dealOk") != -1) {
$("#dealBtn").show(); $("#dealBtn").show();
} else { } else {
$("#dealBtn").hide(); $("#dealBtn").hide();
} }
} }
var dealPerson=""; var dealPerson="";
if(dealPerson==null || dealPerson==""){ if(dealPerson==null || dealPerson==""){
dealPerson="暂无"; dealPerson="暂无";
}else{ }else{
dealPerson=row.dealPerson; dealPerson=row.dealPerson;
} }
var dealTime = ""; var dealTime = "";
if (dealTime == null || dealTime == "") { if (dealTime == null || dealTime == "") {
dealTime = "暂无"; dealTime = "暂无";
} else { } else {
dealTime = row.dealTime; dealTime = row.dealTime;
} }
//同步dealFlag //同步dealFlag
$("#backPerson").html(backPerson); $("#backPerson").html(backPerson);
$("#dealFlag").html(dealFlag); $("#dealFlag").html(dealFlag);
$("#dealPerson").html(dealPerson); $("#dealPerson").html(dealPerson);
$("#dealTime").html(dealTime); $("#dealTime").html(dealTime);
$("#qxId").val(row.id); $("#qxId").val(row.id);
$("#assortName").val(row.assortName); $("#assortName").val(row.assortName);
$("#content").val(row.content); $("#content").val(row.content);
$("#faultType").val(row.assortId); $("#faultType").val(row.assortId);
// $('input[name="Fruit"]').each(function () {//遍历每一个名字为interest的复选框其中选中的执行函数 // $('input[name="Fruit"]').each(function () {//遍历每一个名字为interest的复选框其中选中的执行函数
// if ($(this).val() == row.assortId) { // if ($(this).val() == row.assortId) {
// $(this)[0].checked = true; // $(this)[0].checked = true;
// } else { // } else {
// $(this)[0].checked = false; // $(this)[0].checked = false;
// } // }
// }); // });
}, },
'click .dealInfo': function (e, value, row, index) { 'click .dealInfo': function (e, value, row, index) {
//处理操作 //处理操作
dealFun(row.id); dealFun(row.id);
} }
}, },
cellStyle: function (value, row, index) { cellStyle: function (value, row, index) {
return {classes: 'success'} return {classes: 'success'}
} }
} }
], ],
onLoadSuccess: function (result) { //加载成功时执行 onLoadSuccess: function (result) { //加载成功时执行
// console.info("加载成功"); // console.info("加载成功");
}, },
onLoadError: function () { //加载失败时执行 onLoadError: function () { //加载失败时执行
//console.info("加载数据失败"); //console.info("加载数据失败");
}, },
onPostBody: function () { onPostBody: function () {
//重点就在这里获取渲染后的数据列td的宽度赋值给对应头部的th,这样就表头和列就对齐了 //重点就在这里获取渲染后的数据列td的宽度赋值给对应头部的th,这样就表头和列就对齐了
var header = $(".fixed-table-header table thead tr th"); var header = $(".fixed-table-header table thead tr th");
var body = $(".fixed-table-header table tbody tr td"); var body = $(".fixed-table-header table tbody tr td");
var footer = $(".fixed-table-header table tr td"); var footer = $(".fixed-table-header table tr td");
body.each(function () { body.each(function () {
header.width((this).width()); header.width((this).width());
footer.width((this).width()); footer.width((this).width());
}); });
} }
}); });
} }
getQxList(); getQxList();
$("#getRecallBtn").on('click', function () { $("#getRecallBtn").on('click', function () {
@ -2065,7 +2071,7 @@
show: true//弹出对话框 show: true//弹出对话框
}); });
//$("#table").bootstrapTable("refresh"); //$("#table").bootstrapTable("refresh");
// toastr.error(result); // toastr.error(result);
} }
} }
}); });
@ -2495,6 +2501,8 @@
//dataField: "data",//这是返回的json数组的key.默认是"rows".这里只有前后端约定好就行 //dataField: "data",//这是返回的json数组的key.默认是"rows".这里只有前后端约定好就行
cache: false, // 设置为 false 禁用 AJAX 数据缓存, 默认为true cache: false, // 设置为 false 禁用 AJAX 数据缓存, 默认为true
striped: true, //是否显示行间隔色 striped: true, //是否显示行间隔色
// fixedColumns: true,//固定列
// fixedNumber:3,//固定前两列
pagination: true, // 在表格底部显示分页组件默认false pagination: true, // 在表格底部显示分页组件默认false
paginationShowPageGo: true, paginationShowPageGo: true,
pageList: [10, 20, 50, 100], // 如果设置了分页设置可供选择的页面数据条数。设置为All 则显示所有记录。 pageList: [10, 20, 50, 100], // 如果设置了分页设置可供选择的页面数据条数。设置为All 则显示所有记录。
@ -2511,7 +2519,7 @@
undefinedText: '---', //当数据为 undefined 时显示的字符 undefinedText: '---', //当数据为 undefined 时显示的字符
singleSelect: false,//设置True 将禁止多选 singleSelect: false,//设置True 将禁止多选
clickToSelect: true,//设置true 将在点击行时自动选择rediobox 和 checkbox clickToSelect: true,//设置true 将在点击行时自动选择rediobox 和 checkbox
// height: 560, //定义表格的高度。 // height: 560, //定义表格的高度。
searchTimeOut: 500,// 默认500 设置搜索超时时间。 searchTimeOut: 500,// 默认500 设置搜索超时时间。
toolbarAlign: 'right',// 指定 toolbar 水平方向的位置。'left' 或 'right' toolbarAlign: 'right',// 指定 toolbar 水平方向的位置。'left' 或 'right'
paginationDetailHAlign: 'left',//指定 分页详细信息 在水平方向的位置。'left' 或 'right'。 paginationDetailHAlign: 'left',//指定 分页详细信息 在水平方向的位置。'left' 或 'right'。
@ -2587,7 +2595,8 @@
endDateTo: $("#endDateTo").val(), endDateTo: $("#endDateTo").val(),
deptName: deptName.toString(), deptName: deptName.toString(),
doctorInCharge: doctorInCharge, doctorInCharge: doctorInCharge,
emrCmit:$("#emrCmit").val() emrCmit:$("#emrCmit").val(),
bedNumber:$("#bedNumber").val()
}; };
return temp; return temp;
}, },
@ -2632,6 +2641,12 @@
align: 'center', align: 'center',
valign: 'middle', valign: 'middle',
}, },
{
title: '床号',
field: 'bedNumber',
align: 'center',
valign: 'middle',
},
{ {
title: '身份证号', title: '身份证号',
field: 'idNo', field: 'idNo',
@ -2767,9 +2782,9 @@
var result = ""; var result = "";
if (value != null && value != "") { if (value != null && value != "") {
result = '<span style="color:green;"><i class="fa fa-times-circle-o" aria-hidden="true"></i>提交</span>' result = '<span style="color:green;"><i class="fa fa-times-circle-o" aria-hidden="true"></i>提交</span>'
} else { } else {
result = '<span style="color:red;"><i class="fa fa-times-circle-o" aria-hidden="true"></i>未提交</span>' result = '<span style="color:red;"><i class="fa fa-times-circle-o" aria-hidden="true"></i>未提交</span>'
} }
return result return result
} }
}, },
@ -2869,7 +2884,7 @@
} }
if (index.indexOf("first") != -1) { if (index.indexOf("first") != -1) {
if (row.archivestate != '初审' && row.archivestate == '提交') { if (row.archivestate != '初审' && row.archivestate == '提交') {
// html = html + '<button type="button" class="btn btn-sm btn-primary verifyInfo">初审</button>' // html = html + '<button type="button" class="btn btn-sm btn-primary verifyInfo">初审</button>'
} }
} }
if (index.indexOf("hcmit") != -1) { if (index.indexOf("hcmit") != -1) {
@ -3476,9 +3491,11 @@
var emrCmit=$("#emrCmit").val(); var emrCmit=$("#emrCmit").val();
var doctorInCharge= $("#doctorInCharge").val().toString(); var doctorInCharge= $("#doctorInCharge").val().toString();
var bedNumber=$("#bedNumber").val();
window.location.href = "${path}/beHosp/exportExcel?inpNo=" + inpNo + "&visitId=" + visitId + window.location.href = "${path}/beHosp/exportExcel?inpNo=" + inpNo + "&visitId=" + visitId +
"&name=" + name + "&archivestate=" + archivestate + "&deptName=" + deptName+"&emrCmit="+ emrCmit "&name=" + name + "&archivestate=" + archivestate + "&deptName=" + deptName+"&emrCmit="+ emrCmit
+ "&startDateTo=" + startDateTo + "&endDateTo=" + endDateTo+"&doctorInCharge="+ doctorInCharge; + "&startDateTo=" + startDateTo + "&endDateTo=" + endDateTo+"&doctorInCharge="+ doctorInCharge+"&bedNumber="+bedNumber;
}); });
@ -3500,7 +3517,7 @@
if (result.length > 0) { if (result.length > 0) {
for (var i = 0; i < result.length; i++) { for (var i = 0; i < result.length; i++) {
//下拉类别 //下拉类别
// $("#inpType").append("<option value=" + result[i].assortId + ">" + result[i].assortName + "</option>"); // $("#inpType").append("<option value=" + result[i].assortId + ">" + result[i].assortName + "</option>");
//树列表 //树列表
var obj = {}; var obj = {};
obj.id = result[i].assortId; obj.id = result[i].assortId;
@ -3783,7 +3800,7 @@
//确认删除pdf页码 //确认删除pdf页码
$("#delPageBtn2").click(function () { $("#delPageBtn2").click(function () {
var entity={};出院科室: var entity={};出院科室:
entity.id= $("#pdfId").val(); entity.id= $("#pdfId").val();
entity.title = ""+$("#pagePdf").val(); entity.title = ""+$("#pagePdf").val();
entity.pdfPath = $("#pathPdf").val(); entity.pdfPath = $("#pathPdf").val();
if(entity.id==null ||entity.id=="" ){ if(entity.id==null ||entity.id=="" ){

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

@ -17,15 +17,15 @@
<%@include file="../../jspf/comm.jspf" %> <%@include file="../../jspf/comm.jspf" %>
<%@include file="../../jspf/ztreeCommom.jsp" %> <%@include file="../../jspf/ztreeCommom.jsp" %>
<style> <style>
.modal-header2 { .modal-header2 {
text-align: center !important; text-align: center !important;
vertical-align: middle !important; vertical-align: middle !important;
background-color: #3c8dbc !important; background-color: #3c8dbc !important;
color: #fff; color: #fff;
font-size: 16px; font-size: 16px;
font-weight: bold; font-weight: bold;
padding: 5px 5px 5px 5px !important; padding: 5px 5px 5px 5px !important;
} }
.modal-footer { .modal-footer {
padding: 5px; padding: 5px;
} }
@ -306,6 +306,10 @@
<option value="复审退回">复审退回</option> <option value="复审退回">复审退回</option>
</select> </select>
</div> </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-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-info btn-sm divCss" id="excelBtn">条件导出</button>
<button type="button" class="btn btn-warning btn-sm divCss" id="excelBtn2">当前科室归档</button> <button type="button" class="btn btn-warning btn-sm divCss" id="excelBtn2">当前科室归档</button>
@ -417,13 +421,13 @@
<div id="toolbar5" class="btn-group pull-right" style="margin-right: 20px;"> <div id="toolbar5" class="btn-group pull-right" style="margin-right: 20px;">
<div class="columns columns-right btn-group pull-right" style="margin-top:0px;"> <div class="columns columns-right btn-group pull-right" style="margin-top:0px;">
<%--<div class="btn-group btn-info">--%> <%--<div class="btn-group btn-info">--%>
<%--<select id="sel_exportoption" class="form-control">                --%> <%--<select id="sel_exportoption" class="form-control">                --%>
<%--<option value="">导出当前页面数据</option>--%> <%--<option value="">导出当前页面数据</option>--%>
<%--               --%> <%--               --%>
<%--<option value="all">导出全部数据</option>--%> <%--<option value="all">导出全部数据</option>--%>
<%--               --%> <%--               --%>
<%--<option value="selected">导出选中数据</option>--%> <%--<option value="selected">导出选中数据</option>--%>
<%--</select>--%> <%--</select>--%>
<%--</div>--%> <%--</div>--%>
<button class=" btn btn-success" style="height: 34px" type="button" id="refreshBtn5" name="refreshBtn5" <button class=" btn btn-success" style="height: 34px" type="button" id="refreshBtn5" name="refreshBtn5"
aria-label="Refresh" aria-label="Refresh"
@ -451,7 +455,7 @@
<div class="modal-content"> <div class="modal-content">
<div class="modal-header2"> <div class="modal-header2">
<%--<button type="button" class="close" data-dismiss="modal" aria-hidden="true">--%> <%--<button type="button" class="close" data-dismiss="modal" aria-hidden="true">--%>
<%--&times;--%> <%--&times;--%>
<%--</button>--%> <%--</button>--%>
<button type="button" class="close" id="closeBtn"> <button type="button" class="close" id="closeBtn">
&times; &times;
@ -561,9 +565,9 @@
<div class="columns columns-left btn-group pull-left"> <div class="columns columns-left btn-group pull-left">
<input type="checkbox" id="flag" value="1" style="margin-left: 20px;">只显示作废</input> <input type="checkbox" id="flag" value="1" style="margin-left: 20px;">只显示作废</input>
<%--<button class=" btn btn-success btn-sm" style="height: 34px" type="button"--%> <%--<button class=" btn btn-success btn-sm" style="height: 34px" type="button"--%>
<%--id="refreshBtn2" name="refresh" aria-label="Refresh"--%> <%--id="refreshBtn2" name="refresh" aria-label="Refresh"--%>
<%--title="Refresh">--%> <%--title="Refresh">--%>
<%--<i class="glyphicon glyphicon-refresh icon-refresh"></i>--%> <%--<i class="glyphicon glyphicon-refresh icon-refresh"></i>--%>
<%--</button>--%> <%--</button>--%>
</div> </div>
</div> </div>
@ -842,15 +846,18 @@
</div> </div>
<div class="row "> <div class="row ">
<span style="vertical-align:top;">退回内容:</span> <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>
<div class="row " > <div class="row " >
<span style="vertical-align:top;">护士备注:</span> <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>
<div class="row " > <div class="row " >
<span style="vertical-align:top;">医生备注:</span> <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>
</div> </div>
@ -878,17 +885,22 @@
<div class="modal-body"> <div class="modal-body">
<form> <form>
<div class="form-group "> <div class="form-group ">
<input id="archiveId" hidden/> <div class="row divCss2">
<span style="vertical-align:top;">审核内容:</span> <input id="archiveId" hidden/>
<textarea rows="6" style="width:85%;" id="verifyText"></textarea> <span style="vertical-align:top;">审核内容:</span>
</div> <textarea rows="5" style="width:95%;"id="verifyText"></textarea>
<div class="form-group " > </div>
<span style="vertical-align:top;">护士备注:</span> <div class="row divCss2" >
<textarea id="nuresText2" rows="6" style="width:85%;" disabled></textarea> <span style="vertical-align:top;">护士备注:</span>
</div> <textarea id="nuresText2" rows="5" style="width:95%;"disabled></textarea>
<div class="form-group " > </div>
<span style="vertical-align:top;">医生备注:</span> <div class="row divCss2" >
<textarea id="doctorText2" rows="6" style="width:85%;" disabled></textarea> <span style="vertical-align:top;">医生备注:</span>
<textarea id="doctorText2" rows="5" style="width:95%;"disabled></textarea>
</div>
<div class="row divCss2">
<input type="checkbox" id="isScanedChk" disabled />归档病历已全部无纸化无扫描件
</div>
</div> </div>
</form> </form>
</div> </div>
@ -1542,7 +1554,7 @@
newWindow.location.href = "${path}/static/pdfjs/web/viewer.html?file=" + encodeURIComponent("${path}/inHosp/pdfStreamHandeler?url=" + result); newWindow.location.href = "${path}/static/pdfjs/web/viewer.html?file=" + encodeURIComponent("${path}/inHosp/pdfStreamHandeler?url=" + result);
}else{ }else{
var archiveDetailId = $("#idLab").html(); var archiveDetailId = $("#idLab").html();
//var pdfUrl = "${path}/static/pdfjs/web/viewer.html?file=../../../static/img/pdfFiles/" + result;//+ result; //var pdfUrl = "${path}/static/pdfjs/web/viewer.html?file=../../../static/img/pdfFiles/" + result;//+ result;
newWindow.location.href = "${path}/pdfCtr/pdfDir?roleVal=" + encodeURI(1) + "&archiveDetailId=" + encodeURI(archiveDetailId) + "&pdfPath=" + encodeURI(result); newWindow.location.href = "${path}/pdfCtr/pdfDir?roleVal=" + encodeURI(1) + "&archiveDetailId=" + encodeURI(archiveDetailId) + "&pdfPath=" + encodeURI(result);
} }
@ -1685,7 +1697,7 @@
type: "POST", type: "POST",
data: {archiveDetailId: $("#idLab").html(), backFlag: backFlagVal}, data: {archiveDetailId: $("#idLab").html(), backFlag: backFlagVal},
success: function (result) { success: function (result) {
// console.log(result); // console.log(result);
if (result != null && result != "") { if (result != null && result != "") {
$("#backContent").val(result.backContent); $("#backContent").val(result.backContent);
$("#score").val(result.score); $("#score").val(result.score);
@ -1763,7 +1775,7 @@
$.ajax({ $.ajax({
url: "${path}/beHosp/updateStateByArchivId", url: "${path}/beHosp/updateStateByArchivId",
type: "POST", type: "POST",
data: {archiveDetailId: archiveDetailId, firstTrial: firstTrial, state: state,archiveState:archiveState}, data: {archiveDetailId: archiveDetailId, firstTrial: firstTrial, state: state,archiveState:archiveState },
success: function (result) { success: function (result) {
if (result == "完整") { if (result == "完整") {
$("#table").bootstrapTable("refresh"); $("#table").bootstrapTable("refresh");
@ -1801,12 +1813,12 @@
$("#WZModal").modal('hide'); $("#WZModal").modal('hide');
if (result == "1") { if (result == "1") {
$("#WZModal").modal('hide'); $("#WZModal").modal('hide');
$("#verifyModal").modal('hide'); $("#verifyModal").modal('hide');
$("#table").bootstrapTable("refresh"); $("#table").bootstrapTable("refresh");
toastr.success("强制提交成功!"); toastr.success("强制提交成功!");
} else { } else {
$("#WZModal").modal('hide'); $("#WZModal").modal('hide');
//$("#verifyModal").modal('hide'); //$("#verifyModal").modal('hide');
$("#table").bootstrapTable("refresh"); $("#table").bootstrapTable("refresh");
toastr.error("强制提交失败!"); toastr.error("强制提交失败!");
} }
@ -2001,6 +2013,8 @@
sidePagination: 'server', // 设置为服务器端分页 客户端client sidePagination: 'server', // 设置为服务器端分页 客户端client
search: false, search: false,
showColumns: true, showColumns: true,
// fixedColumns: true,//固定列
// fixedNumber:3,//固定前两列
// sortable: true, // sortable: true,
// sortOrder: "asc", // sortOrder: "asc",
toolbar: '#toolbar',//指定工具栏 toolbar: '#toolbar',//指定工具栏
@ -2072,7 +2086,8 @@
archivestate: "" + $("#archivestate").val(), archivestate: "" + $("#archivestate").val(),
deptName: deptName.toString(), deptName: deptName.toString(),
startDateTo: $("#startDateTo").val(), startDateTo: $("#startDateTo").val(),
endDateTo: $("#endDateTo").val() endDateTo: $("#endDateTo").val(),
bedNumber:$("#bedNumber").val()
}; };
return temp; return temp;
@ -2118,6 +2133,12 @@
align: 'center', align: 'center',
valign: 'middle', valign: 'middle',
}, },
{
title: '床号',
field: 'bedNumber',
align: 'center',
valign: 'middle',
},
{ {
title: '身份证号', title: '身份证号',
field: 'idNo', field: 'idNo',
@ -2179,12 +2200,12 @@
field: 'doctorName', field: 'doctorName',
<%--align: 'left',--%> <%--align: 'left',--%>
<%--formatter: function (value, row, index) {--%> <%--formatter: function (value, row, index) {--%>
<%--//调接口 参数:工号 返回:名字--%> <%--//调接口 参数:工号 返回:名字--%>
<%--var request = new XMLHttpRequest();--%> <%--var request = new XMLHttpRequest();--%>
<%--request.open('GET', '${path}/getDoctorOrNursName?user_name=' + value, false);--%> <%--request.open('GET', '${path}/getDoctorOrNursName?user_name=' + value, false);--%>
<%--request.send(null);--%> <%--request.send(null);--%>
<%--return request.responseText;--%> <%--return request.responseText;--%>
<%--}--%> <%--}--%>
}, },
{ {
@ -2220,12 +2241,12 @@
field: 'nurseName', field: 'nurseName',
<%--align: 'left',--%> <%--align: 'left',--%>
<%--formatter: function (value, row, index) {--%> <%--formatter: function (value, row, index) {--%>
<%--//调接口 参数:工号 返回:名字--%> <%--//调接口 参数:工号 返回:名字--%>
<%--var request = new XMLHttpRequest();--%> <%--var request = new XMLHttpRequest();--%>
<%--request.open('GET', '${path}/getDoctorOrNursName?user_name=' + value, false);--%> <%--request.open('GET', '${path}/getDoctorOrNursName?user_name=' + value, false);--%>
<%--request.send(null);--%> <%--request.send(null);--%>
<%--return request.responseText;--%> <%--return request.responseText;--%>
<%--}--%> <%--}--%>
}, },
{ {
@ -2415,6 +2436,13 @@
}); });
$("#archiveId").val(row.id); $("#archiveId").val(row.id);
$("#verifyText").val(""); $("#verifyText").val("");
// 2021-01-18 新增复选框勾选
if(result.isscaned=="1"){
$("#isScanedChk").prop("checked",true);
}else{
$("#isScanedChk").prop("checked",false);
}
} else { } else {
toastr.warning("科主任已经审核!"); toastr.warning("科主任已经审核!");
//刷新 //刷新
@ -2691,34 +2719,34 @@
var maxCmtTime= row.cmtDoctorDate > row.cmtNurseDate? row.cmtDoctorDate: row.cmtNurseDate; var maxCmtTime= row.cmtDoctorDate > row.cmtNurseDate? row.cmtDoctorDate: row.cmtNurseDate;
//后提交那一个,uploaddatetime在主任退回时间和再次 提交之间的时间 就是更新的 //后提交那一个,uploaddatetime在主任退回时间和再次 提交之间的时间 就是更新的
//判断日期 //判断日期
if(maxCmtTime>= row.createTime){ if(maxCmtTime>= row.createTime){
//row.dischargeDateTime.split(" ")[0] //row.dischargeDateTime.split(" ")[0]
var bol= nowInDateBetwen(row.createTime, maxCmtTime, row.uploaddatetime); var bol= nowInDateBetwen(row.createTime, maxCmtTime, row.uploaddatetime);
if(bol){ if(bol){
//类型节点红色 //类型节点红色
//找到节点对象 //找到节点对象
var zTree = $.fn.zTree.getZTreeObj("ztree");//换成实际的图层的id var zTree = $.fn.zTree.getZTreeObj("ztree");//换成实际的图层的id
//var nodeList = zTree.getNodesByParamFuzzy("name", value); //var nodeList = zTree.getNodesByParamFuzzy("name", value);
var node = zTree.getNodesByParam("id",row.assortId, null)[0]; var node = zTree.getNodesByParam("id",row.assortId, null)[0];
if (node != null) { if (node != null) {
//找到span标签并改变颜色 //找到span标签并改变颜色
$("#" + node.tId + "_span").css("color", 'red'); $("#" + node.tId + "_span").css("color", 'red');
} }
} }
}else{ }else{
var bol = nowInDateBetwen(maxCmtTime, row.createTime, row.uploaddatetime); var bol = nowInDateBetwen(maxCmtTime, row.createTime, row.uploaddatetime);
if (bol) { if (bol) {
//类型节点红色 //类型节点红色
//找到节点对象 //找到节点对象
var zTree = $.fn.zTree.getZTreeObj("ztree");//换成实际的图层的id var zTree = $.fn.zTree.getZTreeObj("ztree");//换成实际的图层的id
//var nodeList = zTree.getNodesByParamFuzzy("name", value); //var nodeList = zTree.getNodesByParamFuzzy("name", value);
var node = zTree.getNodesByParam("id", row.assortId, null)[0]; var node = zTree.getNodesByParam("id", row.assortId, null)[0];
if (node != null) { if (node != null) {
//找到span标签并改变颜色 //找到span标签并改变颜色
$("#" + node.tId + "_span").css("color", 'red'); $("#" + node.tId + "_span").css("color", 'red');
} }
} }
} }
} }
@ -2781,11 +2809,11 @@
if (row.source != null && row.source != "") { if (row.source != null && row.source != "") {
if (row.source.indexOf("后台") != -1) { if (row.source.indexOf("后台") != -1) {
if (index != null && index != "" && index.indexOf("delPage") != -1) { if (index != null && index != "" && index.indexOf("delPage") != -1) {
//return '<button class="btn btn-danger btn-sm" onclick="selectFun(\'' + row + '\')">查看 </button>'; //return '<button class="btn btn-danger btn-sm" onclick="selectFun(\'' + row + '\')">查看 </button>';
html = html + '<button type="button" class="btn btn-primary btn-sm delPdfPage" >删除页 </button>';// '<a href="javascript:;" class="delete">删除</a>'; html = html + '<button type="button" class="btn btn-primary btn-sm delPdfPage" >删除页 </button>';// '<a href="javascript:;" class="delete">删除</a>';
} }
} }
} }
@ -3020,9 +3048,11 @@
var archivestate = $("#archivestate").val(); var archivestate = $("#archivestate").val();
var startDateTo = $("#startDateTo").val(); var startDateTo = $("#startDateTo").val();
var endDateTo = $("#endDateTo").val(); var endDateTo = $("#endDateTo").val();
var bedNumber=$("#bedNumber").val();
window.location.href = "${path}/commCtr/exportExcel?inpNo=" + inpNo + "&visitId=" + visitId + window.location.href = "${path}/commCtr/exportExcel?inpNo=" + inpNo + "&visitId=" + visitId +
"&name=" + name + "&deptName=" + deptName + "&archivestate=" + archivestate "&name=" + name + "&deptName=" + deptName + "&archivestate=" + archivestate
+ "&startDateTo=" + startDateTo + "&endDateTo=" + endDateTo; + "&startDateTo=" + startDateTo + "&endDateTo=" + endDateTo+"&bedNumber="+bedNumber;;
}); });
@ -3055,7 +3085,7 @@
undefinedText: '---', //当数据为 undefined 时显示的字符 undefinedText: '---', //当数据为 undefined 时显示的字符
singleSelect: false,//设置True 将禁止多选 singleSelect: false,//设置True 将禁止多选
clickToSelect: true,//设置true 将在点击行时自动选择rediobox 和 checkbox clickToSelect: true,//设置true 将在点击行时自动选择rediobox 和 checkbox
// height: 560, //定义表格的高度。 // height: 560, //定义表格的高度。
searchTimeOut: 500,// 默认500 设置搜索超时时间。 searchTimeOut: 500,// 默认500 设置搜索超时时间。
toolbarAlign: 'right',// 指定 toolbar 水平方向的位置。'left' 或 'right' toolbarAlign: 'right',// 指定 toolbar 水平方向的位置。'left' 或 'right'
paginationDetailHAlign: 'left',//指定 分页详细信息 在水平方向的位置。'left' 或 'right'。 paginationDetailHAlign: 'left',//指定 分页详细信息 在水平方向的位置。'left' 或 'right'。
@ -3292,11 +3322,11 @@
align: 'center', align: 'center',
hidden: true, hidden: true,
}, // { }, // {
// title: '序', // title: '序',
// field: 'id', // field: 'id',
// align: 'left', // align: 'left',
// visible: false // visible: false
// }, // },
{ {
title: '患者ID', title: '患者ID',
field: 'id', field: 'id',
@ -3372,8 +3402,8 @@
} }
], ],
onLoadSuccess: function (result) { //加载成功时执行 onLoadSuccess: function (result) { //加载成功时执行
//console.info(result); //console.info(result);
// console.info("加载成功"); // console.info("加载成功");
}, },
onLoadError: function () { //加载失败时执行 onLoadError: function () { //加载失败时执行
// console.info("加载数据失败"); // console.info("加载数据失败");
@ -3420,7 +3450,7 @@
var days = now.getTime() - sdate.getTime(); var days = now.getTime() - sdate.getTime();
var day = parseInt(days / (1000 * 60 * 60 * 24)); var day = parseInt(days / (1000 * 60 * 60 * 24));
// console.log("'2020-12-02','2020-12-12'---day:"+day); // console.log("'2020-12-02','2020-12-12'---day:"+day);
return day; return day;
} }

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

@ -17,15 +17,15 @@
<%@include file="../../jspf/comm.jspf" %> <%@include file="../../jspf/comm.jspf" %>
<%@include file="../../jspf/ztreeCommom.jsp" %> <%@include file="../../jspf/ztreeCommom.jsp" %>
<style> <style>
.modal-header2 { .modal-header2 {
text-align: center !important; text-align: center !important;
vertical-align: middle !important; vertical-align: middle !important;
background-color: #3c8dbc !important; background-color: #3c8dbc !important;
color: #fff; color: #fff;
font-size: 16px; font-size: 16px;
font-weight: bold; font-weight: bold;
padding: 5px 5px 5px 5px !important; padding: 5px 5px 5px 5px !important;
} }
.modal-footer { .modal-footer {
padding: 5px; padding: 5px;
} }
@ -202,10 +202,10 @@
<label for="name">姓名:</label> <label for="name">姓名:</label>
<input type="text" class="input-sm form-control" id="name" placeholder="请输入姓名"> <input type="text" class="input-sm form-control" id="name" placeholder="请输入姓名">
</div> </div>
<div class="form-group divCss8"> <%--<div class="form-group divCss8">--%>
<label for="name">身份证号:</label> <%--<label for="name">身份证号:</label>--%>
<input type="text" class="input-sm form-control" id="idNo" placeholder="请输入身份证号"> <%--<input type="text" class="input-sm form-control" id="idNo" placeholder="请输入身份证号">--%>
</div> <%--</div>--%>
<div class="form-group divCss8" id="deptDiv" style="height: 18px;margin-top: -7px;"> <div class="form-group divCss8" id="deptDiv" style="height: 18px;margin-top: -7px;">
<label>出院科室:</label> <label>出院科室:</label>
<%--<select class="input-sm form-control" id="deptName">--%> <%--<select class="input-sm form-control" id="deptName">--%>
@ -235,7 +235,15 @@
<label>是否扫描:</label> <label>是否扫描:</label>
<select class="selectpicker bla bla bli" data-live-search="true" name="isscaned" id="isscaned" title="是否扫描"> <select class="selectpicker bla bla bli" data-live-search="true" name="isscaned" id="isscaned" title="是否扫描">
<option value="">全部</option> <option value="">全部</option>
<option value="1">是</option> <option value="1">是</option>
<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> <option value="0">否</option>
</select> </select>
</div> </div>
@ -1605,9 +1613,9 @@
type: "POST", type: "POST",
data: {archiveDetailId: archiveDetailId, firstTrial: firstTrial, state: state}, data: {archiveDetailId: archiveDetailId, firstTrial: firstTrial, state: state},
success: function (result) { success: function (result) {
$("#verifyModal").modal('hide'); $("#verifyModal").modal('hide');
$("#table").bootstrapTable("refresh"); $("#table").bootstrapTable("refresh");
toastr.success("终审操作成功!"); toastr.success("终审操作成功!");
} }
}); });
@ -1773,18 +1781,22 @@
pageList: [10, 20, 50, 100], // 如果设置了分页设置可供选择的页面数据条数。设置为All 则显示所有记录。 pageList: [10, 20, 50, 100], // 如果设置了分页设置可供选择的页面数据条数。设置为All 则显示所有记录。
smartDisplay: false, smartDisplay: false,
pageSize: 2, // 页面数据条数 pageSize: 2, // 页面数据条数
pageNumber: 1, // 初始化加载第一页,默认第一页 pageNumber: 3, // 初始化加载第一页,默认第一页
sidePagination: 'server', // 设置为服务器端分页 客户端client sidePagination: 'server', // 设置为服务器端分页 客户端client
search: false, search: false,
showColumns: true, showColumns: true,
// sortable: true, // sortable: true,
// sortOrder: "asc", // sortOrder: "asc",
// fixedColumns: true,//固定列
// fixedNumber:3,//固定前两列
// fixedRightNumber:32,
// addNum:70,
toolbar: '#toolbar',//指定工具栏 toolbar: '#toolbar',//指定工具栏
searchOnEnterKey: true, //设置为 true时按回车触发搜索方法否则自动触发搜索方法 searchOnEnterKey: true, //设置为 true时按回车触发搜索方法否则自动触发搜索方法
undefinedText: '---', //当数据为 undefined 时显示的字符 undefinedText: '---', //当数据为 undefined 时显示的字符
singleSelect: false,//设置True 将禁止多选 singleSelect: false,//设置True 将禁止多选
clickToSelect: true,//设置true 将在点击行时自动选择rediobox 和 checkbox clickToSelect: true,//设置true 将在点击行时自动选择rediobox 和 checkbox
// height: 560, //定义表格的高度。 // height: 560, //定义表格的高度。
searchTimeOut: 500,// 默认500 设置搜索超时时间。 searchTimeOut: 500,// 默认500 设置搜索超时时间。
toolbarAlign: 'right',// 指定 toolbar 水平方向的位置。'left' 或 'right' toolbarAlign: 'right',// 指定 toolbar 水平方向的位置。'left' 或 'right'
paginationDetailHAlign: 'left',//指定 分页详细信息 在水平方向的位置。'left' 或 'right'。 paginationDetailHAlign: 'left',//指定 分页详细信息 在水平方向的位置。'left' 或 'right'。
@ -1853,7 +1865,8 @@
deptName: deptName, deptName: deptName,
startDateTo: $("#startDateTo").val(), startDateTo: $("#startDateTo").val(),
endDateTo: $("#endDateTo").val(), endDateTo: $("#endDateTo").val(),
isscaned:$("#isscaned").val() isscaned:$("#isscaned").val(),
isScanning:$("#isScanning").val()
}; };
return temp; return temp;
@ -1899,13 +1912,13 @@
align: 'center', align: 'center',
valign: 'middle', valign: 'middle',
}, },
{ // {
title: '身份证号', // title: '身份证号',
field: 'idNo', // field: 'idNo',
align: 'center', // align: 'center',
valign: 'middle', // valign: 'middle',
visible: false // visible: false
}, // },
{ {
title: '出院科室', title: '出院科室',
field: 'deptName', field: 'deptName',
@ -2321,7 +2334,7 @@
undefinedText: '---', //当数据为 undefined 时显示的字符 undefinedText: '---', //当数据为 undefined 时显示的字符
singleSelect: false,//设置True 将禁止多选 singleSelect: false,//设置True 将禁止多选
clickToSelect: true,//设置true 将在点击行时自动选择rediobox 和 checkbox clickToSelect: true,//设置true 将在点击行时自动选择rediobox 和 checkbox
// height: 560, //定义表格的高度。 // height: 560, //定义表格的高度。
searchTimeOut: 500,// 默认500 设置搜索超时时间。 searchTimeOut: 500,// 默认500 设置搜索超时时间。
toolbarAlign: 'left',// 指定 toolbar 水平方向的位置。'left' 或 'right' toolbarAlign: 'left',// 指定 toolbar 水平方向的位置。'left' 或 'right'
paginationDetailHAlign: 'left',//指定 分页详细信息 在水平方向的位置。'left' 或 'right'。 paginationDetailHAlign: 'left',//指定 分页详细信息 在水平方向的位置。'left' 或 'right'。
@ -2467,11 +2480,11 @@
if (row.source != null && row.source != "") { if (row.source != null && row.source != "") {
if (row.source.indexOf("后台") != -1) { if (row.source.indexOf("后台") != -1) {
if (index != null && index != "" && index.indexOf("delPage") != -1) { if (index != null && index != "" && index.indexOf("delPage") != -1) {
//return '<button class="btn btn-danger btn-sm" onclick="selectFun(\'' + row + '\')">查看 </button>'; //return '<button class="btn btn-danger btn-sm" onclick="selectFun(\'' + row + '\')">查看 </button>';
html = html + '<button type="button" class="btn btn-primary btn-sm delPdfPage" >删除页 </button>';// '<a href="javascript:;" class="delete">删除</a>'; html = html + '<button type="button" class="btn btn-primary btn-sm delPdfPage" >删除页 </button>';// '<a href="javascript:;" class="delete">删除</a>';
} }
} }
} }

@ -297,6 +297,18 @@
<option value="已归档">已归档</option> <option value="已归档">已归档</option>
</select> </select>
</div> </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-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-info btn-sm divCss" id="excelBtn">条件导出</button>
@ -1828,7 +1840,9 @@
startDateTo: $("#startDateTo").val(), startDateTo: $("#startDateTo").val(),
endDateTo: $("#endDateTo").val(), endDateTo: $("#endDateTo").val(),
startDate: $("#startDate").val(), startDate: $("#startDate").val(),
endDate: $("#endDate").val() endDate: $("#endDate").val(),
bedNumber:$("#bedNumber").val(),
deathFlag:$("#deathFlag").val()
}; };
@ -1875,6 +1889,12 @@
align: 'center', align: 'center',
valign: 'middle', valign: 'middle',
}, },
{
title: '床号',
field: 'bedNumber',
align: 'center',
valign: 'middle',
},
{ {
title: '身份证号', title: '身份证号',
field: 'idNo', field: 'idNo',

Loading…
Cancel
Save