|
|
|
@ -519,14 +519,14 @@
|
|
|
|
|
<option value="">全部</option>
|
|
|
|
|
</select>
|
|
|
|
|
</div>
|
|
|
|
|
<div class="form-group divCss8">
|
|
|
|
|
<%--<div class="form-group divCss8">
|
|
|
|
|
<label>主管医生:</label>
|
|
|
|
|
<select class="selectpicker bla bla bli" multiple data-live-search="true" name="doctorInCharge"
|
|
|
|
|
id="doctorInCharge" title="请输入主管医生" data-actions-box="true" data-deselect-all-text="取消全选"
|
|
|
|
|
data-select-all-text="全选">
|
|
|
|
|
<option value="">全部</option>
|
|
|
|
|
</select>
|
|
|
|
|
</div>
|
|
|
|
|
</div>--%>
|
|
|
|
|
<div class="form-group divCss8">
|
|
|
|
|
<label>出院日期:</label>
|
|
|
|
|
<div class="input-daterange input-group" id="datepicker">
|
|
|
|
@ -2978,7 +2978,7 @@
|
|
|
|
|
getDept();
|
|
|
|
|
|
|
|
|
|
//主管医生doctorInCharge
|
|
|
|
|
function getDoctorInCharge() {
|
|
|
|
|
/*function getDoctorInCharge() {
|
|
|
|
|
var deptName = "";
|
|
|
|
|
if (deptArr.length > 0) {
|
|
|
|
|
deptName = deptArr.toString();
|
|
|
|
@ -2992,7 +2992,8 @@
|
|
|
|
|
if (result != null) {
|
|
|
|
|
for (var i = 0; i < result.length; i++) {
|
|
|
|
|
if (result[i]!=null&&result[i].doctorInCharge != null) {
|
|
|
|
|
$("#doctorInCharge").append("<option value=" + result[i].doctorInCharge + ">" + result[i].doctorInCharge + "</option>");
|
|
|
|
|
$("#doctorInCharge").append("<option value=" + data[i].userName + ">" + data[i].name + "</option>");
|
|
|
|
|
//$("#doctorInCharge").append("<option value=" + result[i].doctorInCharge + ">" + result[i].doctorInCharge + "</option>");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
@ -3001,7 +3002,7 @@
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
getDoctorInCharge();
|
|
|
|
|
getDoctorInCharge();*/
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
//日期控件
|
|
|
|
@ -3803,7 +3804,7 @@
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
var doctorInCharge = $("#doctorInCharge").val().toString();
|
|
|
|
|
//var doctorInCharge = $("#doctorInCharge").val().toString();
|
|
|
|
|
var temp = {
|
|
|
|
|
limit: limit, //页面大小
|
|
|
|
|
offset: offset, //页码
|
|
|
|
@ -3818,7 +3819,7 @@
|
|
|
|
|
startDateTo: $("#startDateTo").val(),
|
|
|
|
|
endDateTo: $("#endDateTo").val(),
|
|
|
|
|
deptName: deptName.toString(),
|
|
|
|
|
doctorInCharge: doctorInCharge,
|
|
|
|
|
//doctorInCharge: doctorInCharge,
|
|
|
|
|
emrCmit: $("#emrCmit").val(),
|
|
|
|
|
bedNumber: $("#bedNumber").val(),
|
|
|
|
|
printNum:$("#printNum").val()
|
|
|
|
@ -5110,7 +5111,7 @@
|
|
|
|
|
deptName = $("#deptName").val().toString();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
var doctorInCharge = $("#doctorInCharge").val().toString();
|
|
|
|
|
//var doctorInCharge = $("#doctorInCharge").val().toString();
|
|
|
|
|
var inpNo = "" + $("#inpNo").val();
|
|
|
|
|
var visitId = "" + $("#visitId").val();
|
|
|
|
|
var name = "" + $("#name").val();
|
|
|
|
@ -5123,7 +5124,7 @@
|
|
|
|
|
|
|
|
|
|
window.location.href = "${path}/beHosp/exportExcel?inpNo=" + inpNo + "&visitId=" + visitId + "&name=" + name + "&archivestate=" + archivestate
|
|
|
|
|
+ "&deptName=" + deptName + "&emrCmit=" + emrCmit + "&startDateTo=" + startDateTo + "&endDateTo=" + endDateTo
|
|
|
|
|
+ "&doctorInCharge=" + doctorInCharge + "&bedNumber=" + bedNumber + "&printNum=" + printNum;
|
|
|
|
|
+ "&bedNumber=" + bedNumber + "&printNum=" + printNum;//+ "&doctorInCharge=" + doctorInCharge
|
|
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|