From a1f6aaec754a8c1cf507672b38be452454df11b4 Mon Sep 17 00:00:00 2001
From: xuhaoxiang <1216720373@qq.com>
Date: Thu, 5 Aug 2021 00:03:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A0=E7=BA=B8=E5=8C=96=E5=BD=92=E6=A1=A3?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/beHospitaledDir/beHospList.jsp      | 38 ++++++++++++-------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp
index 04bd6970..3051306b 100644
--- a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp
+++ b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp
@@ -4347,23 +4347,33 @@
                     },
                     {
                         title: '电子病历医生提交',
-                        field: 'doctorNum',
+                        field: 'emrDoctorCmt',
                         align: 'center',
                         formatter: function (value, row, index) {
                             var redFlag = row.numb;
+                            var doctorNum = row.doctorNum;
                             var a = "";
+                            debugger;
                             if (redFlag == 0) {
-                                if (value ==0) {
-                                    a = '<span style="color:red;"><i class="glyphicon glyphicon-ban-circle" aria-hidden="true"></i>未提交</span>';
-                                } else {
+                                if (value == '提交') {
                                     a = '<span style="color:#269abc;"><i class="glyphicon glyphicon-ok-circle" aria-hidden="true"></i>已提交</span>';
+                                } else {
+                                    if(doctorNum==0){
+                                        a = '<span style="color:red;"><i class="glyphicon glyphicon-ban-circle" aria-hidden="true"></i>未提交</span>';
+                                    }else{
+                                        a = '<span style="color:#269abc;"><i class="glyphicon glyphicon-ok-circle" aria-hidden="true"></i>已提交</span>';
+                                    }
                                 }
                             } else {
-                                if (value ==0) {
-                                    a = '<span style="color:red;"><i class="glyphicon glyphicon-ban-circle" aria-hidden="true"></i>未提交</span>';
-                                } else {
+                                if (value == '提交') {
                                     //有缺陷显示红色 #269abc;
                                     a = '<i class="glyphicon glyphicon-ok-circle" aria-hidden="true" style="color:#269abc;"></i><span style="color:red;">已提交</span>';
+                                } else {
+                                    if(doctorNum==0){
+                                        a = '<span style="color:red;"><i class="glyphicon glyphicon-ban-circle" aria-hidden="true"></i>未提交</span>';
+                                    }else{
+                                        a = '<i class="glyphicon glyphicon-ok-circle" aria-hidden="true" style="color:#269abc;"></i><span style="color:red;">已提交</span>';
+                                    }
                                 }
                             }
                             return a;
@@ -4371,24 +4381,24 @@
                     },
                     {
                         title: '电子病历护士提交',
-                        field: 'nurseNum',
+                        field: 'emrNureCmt',
                         align: 'center',
                         formatter: function (value, row, index) {
                             var redFlag = row.numb;
                             var a = "";
                             if (redFlag == 0) {
-                                if (value ==0) {
-                                    a = '<span style="color:red;"><i class="glyphicon glyphicon-ban-circle" aria-hidden="true"></i>未提交</span>';
-                                } else {
+                                if (value == '提交') {
                                     a = '<span style="color:#269abc;"><i class="glyphicon glyphicon-ok-circle" aria-hidden="true"></i>已提交</span>';
+                                } else {
+                                    a = '<span style="color:red;"><i class="glyphicon glyphicon-ban-circle" aria-hidden="true"></i>未提交</span>';
                                 }
                             } else {
                                 //有缺陷显示红色
-                                if (value ==0) {
-                                    a = '<span style="color:red;"><i class="glyphicon glyphicon-ban-circle" aria-hidden="true"></i>未提交</span>';
-                                } else {
+                                if (value == '提交') {
                                     //有缺陷显示红色
                                     a = '<i class="glyphicon glyphicon-ok-circle" aria-hidden="true" style="color:#269abc;"></i><span style="color:red;">已提交</span>';
+                                } else {
+                                    a = '<span style="color:red;"><i class="glyphicon glyphicon-ban-circle" aria-hidden="true"></i>未提交</span>';
                                 }
                             }
                             return a;