yq1 пре 2 дана
родитељ
комит
af6bff0f0a
1 измењених фајлова са 32 додато и 21 уклоњено
  1. 32 21
      src/xt_pages/dialysis/template/DialysisPrintOrderSeventyeight.vue

+ 32 - 21
src/xt_pages/dialysis/template/DialysisPrintOrderSeventyeight.vue Прегледај датотеку

@@ -1810,9 +1810,7 @@ export default {
1810 1810
       
1811 1811
       var checkDate =[]
1812 1812
       var monearr = []
1813
-      if(this.dialysisOrder != undefined && this.dialysisOrder.end_time > this.new_date){
1814
-
1815
-        
1813
+      // if(this.dialysisOrder != undefined && this.dialysisOrder.end_time > this.new_date){
1816 1814
         if (this.predialysis.temperature == '') {
1817 1815
           const obj = "透前体温"
1818 1816
           checkDate.push(obj)
@@ -2040,39 +2038,52 @@ export default {
2040 2038
         if(this.monitors.length >0){
2041 2039
 
2042 2040
           for(let i in this.monitors){
2043
-            if(this.monitors[i].blood_flow_volume ==0){
2041
+            if(this.monitors[i].blood_flow_volume ==0 && this.dialysisOrder.end_time > this.monitors[i].operate_time){
2044 2042
               const obj55 = '监测第'+((i*1)+1)+'行血流量'
2045 2043
               monearr.push(obj55)
2046
-            } if(this.monitors[i].venous_pressure ==0 ||
2047
-                this.monitors[i].transmembrane_pressure ==0
2044
+            } if((this.monitors[i].venous_pressure ==0 ||
2045
+                this.monitors[i].transmembrane_pressure ==0 ) && this.dialysisOrder.end_time > this.monitors[i].operate_time
2048 2046
             ){
2049 2047
               const obj56 = '监测第'+((i*1)+1)+'行静脉压/跨膜压'
2050 2048
               monearr.push(obj56)
2051
-            } if(this.monitors[i].ultrafiltration_rate ==0){
2049
+            } if(this.monitors[i].ultrafiltration_rate ==0 && this.dialysisOrder.end_time > this.monitors[i].operate_time){
2052 2050
               const obj57 = '监测第'+((i*1)+1)+'行超滤率'
2053 2051
               monearr.push(obj57)
2054
-            } if(this.monitors[i].ultrafiltration_volume == 0 && i !=0){
2052
+            } if(this.monitors[i].ultrafiltration_volume == 0 && i !=0 && 
2053
+                this.dialysisOrder.end_time > this.monitors[i].operate_time
2054
+            ){
2055 2055
               const obj53 = '监测第'+((i*1)+1)+'行超滤量'
2056 2056
               monearr.push(obj53)
2057
-            } if(this.monitors[i].replacement_rate ==0 && this.prescription.mode =='HDF'
2057
+            } if(this.monitors[i].replacement_rate ==0 && this.prescription.mode =='HDF'&& 
2058
+                this.dialysisOrder.end_time > this.monitors[i].operate_time
2058 2059
             ){
2059 2060
               const obj58 = '监测第'+((i*1)+1)+'行置换率'
2060 2061
               monearr.push(obj58)
2061
-            } if(this.monitors[i].displacement_quantity == 0 && this.prescription.mode =='HDF'&& i !=0){
2062
+            } if(this.monitors[i].displacement_quantity == 0 && this.prescription.mode =='HDF'&& i !=0
2063
+                && this.dialysisOrder.end_time > this.monitors[i].operate_time
2064
+            ){
2062 2065
               const obj54 = '监测第'+((i*1)+1)+'行置换量'
2063 2066
               monearr.push(obj54)
2064
-            }  if(this.monitors[i].sodium_concentration ==0 ){
2067
+            } if(this.monitors[i].sodium_concentration ==0 && 
2068
+                this.dialysisOrder.end_time > this.monitors[i].operate_time
2069
+            ){
2065 2070
               // this.monitors[i].temperature == 0
2066 2071
               const obj59 = '监测第'+((i*1)+1)+'行钠浓度/温度'
2067 2072
               monearr.push(obj59)
2068
-            } if(this.monitors[i].pulse_frequency ==0){
2073
+            } if(this.monitors[i].pulse_frequency ==0  && 
2074
+                this.dialysisOrder.end_time > this.monitors[i].operate_time
2075
+            ){
2069 2076
               const obj60 = '监测第'+((i*1)+1)+'行脉搏'
2070 2077
               monearr.push(obj60)
2071
-            } if(this.monitors[i].breathing_rate ==0){
2078
+            } if(this.monitors[i].breathing_rate ==0 && 
2079
+              this.dialysisOrder.end_time > this.monitors[i].operate_time
2080
+            ){
2072 2081
               const obj61 = '监测第'+((i*1)+1)+'行呼吸'
2073 2082
               monearr.push(obj61)
2074
-            } if(this.monitors[i].systolic_blood_pressure ==0 ||
2075
-                  this.monitors.diastolic_blood_pressure==0){
2083
+            } if((this.monitors[i].systolic_blood_pressure ==0 ||
2084
+                  this.monitors.diastolic_blood_pressure==0) && 
2085
+                  this.dialysisOrder.end_time > this.monitors[i].operate_time
2086
+            ){
2076 2087
               const obj62 = '监测第'+((i*1)+1)+'行血压'
2077 2088
               monearr.push(obj62)
2078 2089
             }
@@ -2086,12 +2097,12 @@ export default {
2086 2097
         console.log('monearr监测',checkDate,monearr);
2087 2098
 
2088 2099
         this.getcheckData(checkDate)
2089
-      }else{
2090
-        this.$message({
2091
-          message:'该患者已下机',
2092
-          type:'success'
2093
-        })
2094
-      }
2100
+      // }else{
2101
+      //   this.$message({
2102
+      //     message:'该患者已下机',
2103
+      //     type:'success'
2104
+      //   })
2105
+      // }
2095 2106
     },
2096 2107
     getDisplaceLiquiPart: function (val) {
2097 2108
       let displace_liqui_part_name = "/";