瀏覽代碼

修改医嘱提醒显示

张保健 5 年之前
父節點
當前提交
99438edfe5
共有 2 個文件被更改,包括 6 次插入8 次删除
  1. 4 2
      src/pages/main/index.vue
  2. 2 6
      src/pages/main/today/TodayTab.vue

+ 4 - 2
src/pages/main/index.vue 查看文件

52
             let doctorAdvice = []
52
             let doctorAdvice = []
53
             for (let i = 0; i < this.scheduals.length; i++) {
53
             for (let i = 0; i < this.scheduals.length; i++) {
54
               for (let y = 0; y < this.scheduals[i].doctor_advice.length; y++) {
54
               for (let y = 0; y < this.scheduals[i].doctor_advice.length; y++) {
55
-                if (this.scheduals[i].doctor_advice[y].execution_state == 2) {
56
-                  doctorAdvice.push(this.scheduals[i].doctor_advice[y])
55
+                if(this.scheduals[i].dialysis_order == null ){
56
+                  if (this.scheduals[i].doctor_advice[y].execution_state == 2) {
57
+                    doctorAdvice.push(this.scheduals[i].doctor_advice[y])
58
+                  }
57
                 }
59
                 }
58
               }
60
               }
59
             }
61
             }

+ 2 - 6
src/pages/main/today/TodayTab.vue 查看文件

332
           {title: '治疗小结', name: 'treatment_of', value: 0}
332
           {title: '治疗小结', name: 'treatment_of', value: 0}
333
         ]
333
         ]
334
 
334
 
335
-        if (!isNaN(this.prescription.id) && this.prescription.id > 0) {
335
+        if (!isNaN(this.prescription.id) && this.prescription.id > 0 && this.prescription.prescription_doctor> 0) {
336
           steps[0].value = 1
336
           steps[0].value = 1
337
         }
337
         }
338
         if (
338
         if (
341
         ) {
341
         ) {
342
           steps[1].value = 1
342
           steps[1].value = 1
343
         }
343
         }
344
-        if (
345
-          typeof this.predialysis_evaluation.id != 'undefined' &&
346
-          !isNaN(this.predialysis_evaluation.id) &&
347
-          this.predialysis_evaluation.id > 0
348
-        ) {
344
+        if ( typeof this.predialysis_evaluation.id != 'undefined' && !isNaN(this.predialysis_evaluation.id) && this.predialysis_evaluation.id > 0  && this.predialysis_evaluation.creater > 0) {
349
           steps[2].value = 1
345
           steps[2].value = 1
350
         }
346
         }
351
         if (this.advice_groups.length > 0) {
347
         if (this.advice_groups.length > 0) {