@@ -1692,11 +1632,7 @@
$(function () {
- // $("#selModal").draggable({
- // handle: ".modal-header2" // 只能点击头部拖动
- // });
- // $("#selModal").css("overflow", "hidden"); // 防止出现滚动条,出现的话,你会把滚动条一起拖着走的
-
+ initTableLg();
getFaultType();
var objUrl;
var img_html;
@@ -3856,7 +3792,8 @@
deptName: deptName.toString(),
doctorInCharge: doctorInCharge,
emrCmit: $("#emrCmit").val(),
- bedNumber: $("#bedNumber").val()
+ bedNumber: $("#bedNumber").val(),
+ printNum:$("#printNum").val()
};
return temp;
},
@@ -4086,7 +4023,7 @@
},
'click .selInfo': function (e, value, row, index) {
$("#printTableFlag").hide();
- if (row.printNum != 0) {
+ if (row.printNum == '已打印') {
$("#printTableFlag").show();
}
getStaffRemarkFun(row.id, 0);
@@ -4264,13 +4201,6 @@
return a;
}
},
- {
- title: '身份证号',
- field: 'idNo',
- align: 'center',
- valign: 'middle',
- visible: false
- },
{
title: '出院科室',
field: 'deptName',
@@ -4307,28 +4237,6 @@
return a;
}
},
- {
- title: '完整性',
- field: 'lockInfo',
- align: 'center',
- valign: 'middle',
- visible: false
- },
- // {
- // title: '出院日期',
- // field: 'dischargeDateTime',
- // align: 'center',
- // valign: 'middle',
- // // formatter: function (value, row, index) {
- // // return value
- // // }
- // },
- {
- title: '主管医生',
- field: 'doctorInCharge',
- align: 'left',
- visible: false
- },
{//医生是否提交、医生、提交日期、护士是否提交、护士、提交日期
title: '归档医生是否提交',
field: 'cmtDoctor',
@@ -4553,6 +4461,20 @@
}
return result;
}
+ },{
+ title: '是否打印',
+ field: 'printNum',
+ align: 'center',
+ formatter: function (value, row, index) {
+ var printNum = row.printNum;
+ var html = '';
+ if (printNum == '未打印') {
+ html = ''+printNum+'';
+ } else {
+ html = ''+printNum+'';
+ }
+ return html;
+ }
}, {
title: '状态',
field: 'archivestate',
@@ -5149,6 +5071,7 @@
// var deptName=""+$("#deptName").val();
var startDateTo = $("#startDateTo").val();
var endDateTo = $("#endDateTo").val();
+ var printNum = $("#printNum").val();
var url = window.location.href;
var deptName = url.substring(url.lastIndexOf('&') + 1).replace("depts=", "");
@@ -5166,7 +5089,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;
+ + "&startDateTo=" + startDateTo + "&endDateTo=" + endDateTo + "&doctorInCharge=" + doctorInCharge + "&bedNumber=" + bedNumber + "&printNum=" + printNum;
});
diff --git a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp
index 7f047a66..7d4c1291 100644
--- a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp
+++ b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp
@@ -20,6 +20,9 @@
+