From dd9ad7f5ee28f835e6c3a1f7ced3154aada506d4 Mon Sep 17 00:00:00 2001
From: ALW <850658129@qq.com>
Date: Tue, 10 May 2022 15:44:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E8=AF=A6=E6=83=85=E5=A4=8D?=
 =?UTF-8?q?=E9=80=89=E6=A1=86=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../js/hospitalCommom/hospitalCommom.js       | 90 +++++++++++++++----
 1 file changed, 72 insertions(+), 18 deletions(-)

diff --git a/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js b/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js
index 51c4e9e..fd8f6fc 100644
--- a/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js
+++ b/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js
@@ -1219,11 +1219,34 @@ function initTable5(data,sidePagination) {
                 align: 'center',
                 hidden: true,
                 formatter: function (value, row, index) {
-                    console.log(row.timeStatus)
-                    if (row.timeStatus ==1) {
-                        return { disabled : true,}
-                    }else if(row.timeStatus ==2){
-                        return { disabled : false,}
+                    let nursingEndTime = row.nursingEndTime;
+                    let time = row.createTime;
+                    let etimeStr = row.etimeStr;
+                    if(row.sysflag == 1){
+                        if (time==null || nursingEndTime > time || nursingEndTime == null) {
+                            return { disabled : false}
+                        }else {
+                            return { disabled : true,}
+                        }
+                        // if ( time==null || time=='' || nursingEndTime > time && nursingEndTime != null ) {
+                        //     return { disabled : false,}
+                        // }
+                        // else  if (  nursingEndTime != null && nursingEndTime < time && time !=null && time !='' ){
+                        //     return { disabled : true,}
+                        // }
+                    }else{
+                        if (time==null || etimeStr > time || etimeStr == null) {
+                            return { disabled : false,}
+                        }else {
+                            return { disabled : true,}
+                        }
+
+                        // if (time==null || time=='' || etimeStr > time && etimeStr != null   ) {
+                        //     return { disabled : false,}
+                        // }
+                        // else  if (etimeStr != null && etimeStr < time  && time !=null && time !='') {
+                        //     return { disabled : true,}
+                        // }
                     }
                 },
             },
@@ -1233,14 +1256,27 @@ function initTable5(data,sidePagination) {
                 valign: 'middle',
                 width: 120, // 定义列的宽度，单位为像素px
                 formatter: function (value, row, index) {
-                    if (row.timeStatus !=1) {
-                        var html = '<button type="button" class="btn btn-primary btn-sm editInfo" >同步更新</button>';
-
-                        return html;
-                    }else {
-                        var html = '<button type="button" class="btn btn-primary btn-sm " >正在更新</button>';
-                        return html;
-                    }
+                    let nursingEndTime = row.nursingEndTime;
+                    let time = row.createTime;
+                    let etimeStr = row.etimeStr;
+                    //1是护理
+                        if(row.sysflag == 1){
+                            if ( time=='' ||time==null || nursingEndTime > time && nursingEndTime != null ){
+                                var html = '<button type="button" class="btn btn-primary btn-sm editInfo" >同步更新</button>';
+                                return html;
+                            } else  if ( nursingEndTime != null && nursingEndTime < time  && time !=null && time !=''){
+                                var html = '<button type="button" class="btn btn-primary btn-sm editInfo" disabled : false>正在更新</button>';
+                                return html;
+                            }
+                        }else{
+                            if ( time=='' ||time==null ||  etimeStr > time  && etimeStr != null){
+                                var html = '<button type="button" class="btn btn-primary btn-sm editInfo" >同步更新</button>';
+                                return html;
+                            } else if ( etimeStr != null && etimeStr < time  && time !=null && time !=''){
+                                var html = '<button type="button" class="btn btn-primary btn-sm editInfo" disabled : false>正在更新</button>';
+                                return html;
+                            }
+                        }
                 },
                 events: {
                     'click .editInfo': function (e, value, row, index) {
@@ -1286,10 +1322,10 @@ function initTable5(data,sidePagination) {
                         var color = '';
                         if(row.sysflag == 1){
                             //护理
-                            color = selectTimeColor(value,row.nursingEndTime);
+                            color = selectTimeColor(value,row);
                         }else{
                             //非护理
-                            color = selectTimeColor(row.tempTime,row.etimeStr);
+                            color = selectTimeColor2(value,row);
                         }
                         return '<span style="color: ' + color + '">' + value + '</span>';
                     }
@@ -1385,13 +1421,31 @@ function initTable5(data,sidePagination) {
  * @param type 区别，type=1显示time值，type=2显示最新更新的时间
  * @returns {*}
  */
-function selectTimeColor(createTime,etimeStr){
-    var color = 'red';
-    if(etimeStr != null && etimeStr > createTime){
+function selectTimeColor(value,row){
+    var color = '';
+    let nursingEndTime = row.nursingEndTime;
+    let time = row.createTime;
+    if(nursingEndTime != null && nursingEndTime > time && time!=null && time!=''){
+        color = 'green';
+    }else if (nursingEndTime != null && nursingEndTime < time && time!=null && time!='') {
+        color = 'red';
+    }
+    console.log(color)
+    return color;
+}
+function selectTimeColor2(value,row){
+    var color = '';
+    let etimeStr = row.etimeStr;
+    let time = row.createTime;
+    if(etimeStr != null && etimeStr > time && time!=null && time!='') {
         color = 'green';
+    }else if (etimeStr != null && etimeStr < time && time!=null && time!='') {
+        color = 'red';
     }
+    console.log(color)
     return color;
 }
+
 //定义刷新开始计时到超时时间为10分钟
 var timeOut = 10 * 60 * 1000;
 //定义查询间隔时间默认10秒