From a6cf6ac4d404e83e7a8515e567614fa63c030a1c Mon Sep 17 00:00:00 2001
From: wzqgit <568275241@qq.com>
Date: Wed, 13 Jan 2021 08:57:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=9C=80=E6=B1=82=EF=BC=9A?=
=?UTF-8?q?=201.=E9=80=89=E5=87=BA=E9=99=A2=E7=A7=91=E5=AE=A4=E4=B9=8B?=
=?UTF-8?q?=E5=89=8D=EF=BC=8C=E7=BD=AE=E7=A9=BA=E4=B9=8B=E5=89=8D=E7=9A=84?=
=?UTF-8?q?=E9=80=89=E6=8B=A9=EF=BC=8C=E9=BB=98=E8=AE=A4=E5=87=BA=E9=99=A2?=
=?UTF-8?q?=E7=A7=91=E5=AE=A4=E9=83=BD=E4=B8=8D=E9=80=89=E4=B8=AD=202.?=
=?UTF-8?q?=E7=97=85=E6=A1=88=E5=AE=A4=E7=BB=88=E5=AE=A1=E9=83=A8=E5=88=86?=
=?UTF-8?q?=E5=AD=97=E6=AE=B5=E9=BB=98=E8=AE=A4=E4=B8=8D=E6=98=BE=E7=A4=BA?=
=?UTF-8?q?=203.=E5=87=BA=E9=99=A2=E6=B5=8F=E8=A7=88=E9=A1=B5=EF=BC=8C?=
=?UTF-8?q?=E5=BD=92=E6=A1=A3=E5=8C=BB=E7=94=9F=E6=8F=90=E4=BA=A4=E6=97=B6?=
=?UTF-8?q?=EF=BC=8C=E5=A6=82=E6=9E=9C=E5=AE=8C=E6=95=B4=E6=80=A7=E6=A0=A1?=
=?UTF-8?q?=E9=AA=8C=E7=BC=BA=E5=A4=B1=E7=97=85=E6=A1=88=E9=A6=96=E9=A1=B5?=
=?UTF-8?q?=E6=88=96=E5=85=A5=E9=99=A2=E8=AE=B0=E5=BD=95=E5=88=99=E6=97=A0?=
=?UTF-8?q?=E6=B3=95=E5=BC=BA=E5=88=B6=E6=8F=90=E4=BA=A4=20=E2=80=94?=
=?UTF-8?q?=E2=80=94=E2=80=94=E2=80=942021.01.13=20=E7=8E=8B=E6=B3=BD?=
=?UTF-8?q?=E9=92=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../views/beHospitaledDir/beHospList.jsp | 40 ++++++++++++-------
.../views/lastVerifyDir/lastVerifyList.jsp | 6 ++-
2 files changed, 30 insertions(+), 16 deletions(-)
diff --git a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp
index f60fa3d..5d4a999 100644
--- a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp
+++ b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp
@@ -2087,6 +2087,9 @@
if($('#isScanedChk').is(':checked')){
isScanedChk="1";
}
+
+
+
if(lockinfo=="完整"){
$.ajax({
url: "${path}/beHosp/cmtDoctorOrNurs",
@@ -2103,14 +2106,20 @@
}
});
}else{
- $("#flagStaff").val(0);
- //弹窗提示是否强制性
- $("#WzRsult2").html(lockinfo);
- $('#WZModal2').modal({
- backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
- keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
- show: true//弹出对话框
- });
+
+ //如果缺失病案首页或入院记录则无法强制提交
+ if(lockinfo.indexOf("病案首页")!=-1||lockinfo.indexOf("入院记录")!=-1){
+ alert("缺失病案首页或入院记录，无法强制提交！");
+ }else{
+ $("#flagStaff").val(0);
+ //弹窗提示是否强制性
+ $("#WzRsult2").html(lockinfo);
+ $('#WZModal2').modal({
+ backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
+ keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
+ show: true//弹出对话框
+ });
+ }
}
});
@@ -2678,17 +2687,17 @@
{
title: '医生',
field: 'doctorName',
- align: 'left',
+ align: 'left'/*,
formatter: function (value, row, index) {
//调接口 参数：工号 返回：名字
var request = new XMLHttpRequest();
//var data = {"xxx":"xxx"};
- request.open('GET', '${path}/getDoctorOrNursName?user_name=' + value, false);
+ request.open('GET', '{path}/getDoctorOrNursName?user_name=' + value, false);
request.send(null);
//request.send(data);
return request.responseText;
- }
+ }*/
},
{
title: '医生提交日期',
@@ -2721,15 +2730,15 @@
{
title: '护士',
field: 'nurseName',
- align: 'left',
+ align: 'left'/*,
formatter: function (value, row, index) {
//调接口 参数：工号 返回：名字
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);
return request.responseText;
- }
+ }*/
},
{
title: '护士提交日期',
@@ -2785,7 +2794,7 @@
//死亡否
var deathExpired = <%=res.getString("deathExpired")%>;
if (value != null && value != "" && value==0) {
- result = '未死亡'
+ result = ' '
} else {
if (days > deathExpired) {
var day=days- deathExpired;
@@ -3384,6 +3393,7 @@
} else {
toastr.warning("正在查询，请稍等...");
}
+ $(".selectpicker").selectpicker( 'deselectAll' );
});
//添加pdf记录
diff --git a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp
index 8fa4e60..9ad1eac 100644
--- a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp
+++ b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp
@@ -1935,6 +1935,7 @@
title: '医生是否提交',
field: 'cmtDoctor',
align: 'center',
+ visible: false,
formatter: function (value, row, index) {
var result = "";
if (value == 1) {
@@ -1954,6 +1955,7 @@
title: '医生提交日期',
field: 'cmtDoctorDate',
align: 'center',
+ visible: false,
formatter: function (value, row, index) {
var result = "";
if (value != null && value != "") {
@@ -1968,6 +1970,7 @@
title: '护士是否提交',
field: 'cmtNurse',
align: 'center',
+ visible: false,
formatter: function (value, row, index) {
var result = "";
if (value == 1) {
@@ -1987,6 +1990,7 @@
title: '护士提交日期',
field: 'cmtNurseDate',
align: 'center',
+ visible: false,
formatter: function (value, row, index) {
var result = "";
if (value != null && value != "") {
@@ -2009,7 +2013,7 @@
//死亡否
var deathExpired = <%=res.getString("deathExpired")%>;
if (value != null && value != "" && value==0) {
- result = '未死亡'
+ result = ' '
} else {
if (days > deathExpired) {
var day = days - deathExpired;