Sfoglia il codice sorgente

Merge remote-tracking branch 'origin/20230223_pad_vue_new_branch' into 20230223_pad_vue_new_branch

yq1 1 settimana fa
parent
commit
9cb85c7b79

+ 1 - 1
build/cdn.json Vedi File

@@ -1,3 +1,3 @@
1 1
 {
2
-  "version": "2999.999.13744"
2
+  "version": "2999.999.13748"
3 3
 }

+ 3 - 1
src/pages/main/dialog/DoubleDialog.vue Vedi File

@@ -219,6 +219,7 @@
219 219
             </van-checkbox-group>
220 220
           </div>
221 221
           <van-field
222
+           v-if="this.$store.getters.user.template_info.org_id!=10721 && this.$store.getters.user.template_info.org_id!=10164" 
222 223
             v-model="first_check_time_str"
223 224
             readonly
224 225
             @click="selectFirstCheckTimeAction"
@@ -243,13 +244,14 @@
243 244
             </template>
244 245
           </van-cell>
245 246
           <van-field
247
+            v-if="this.$store.getters.user.template_info.org_id!=10721 && this.$store.getters.user.template_info.org_id!=10164" 
246 248
             v-model="check_time_str"
247 249
             readonly
248 250
             @click="selectSecondCheckTimeAction"
249 251
             label="第二核对时间"
250 252
             input-align="right"
251 253
           />
252
-          <van-cell title="第二核对人员">
254
+          <van-cell title="第二核对人员"  v-if="this.$store.getters.user.template_info.org_id!=10721 && this.$store.getters.user.template_info.org_id!=10164">
253 255
             <template #label>
254 256
               <van-radio-group
255 257
                 class="doctorList"

+ 125 - 14
src/pages/main/newActionBar/consumables.vue Vedi File

@@ -207,25 +207,61 @@ export default {
207 207
           var config = res.data.config
208 208
           var outConfig = res.data.outConfig
209 209
           this.out_open = outConfig.is_open
210
-         
211
-
210
+        
212 211
           var settleConfig = res.data.settleConfig
213 212
           this.settle_open = settleConfig.is_open
214 213
           this.good_type_list  =  res.data.good_type
215 214
 
216 215
           this.list = []
217
-          if ((res.data.dialysis_goods[0].good_user.length == 0 && res.data.dialysis_goods[0].good_user_detail.length == 0 && res.data.dialysis_goods[0].last_good_user != null) || (res.data.dialysis_goods[0].good_user.length == 0 && res.data.dialysis_goods[0].good_user_detail.length == 0 && res.data.dialysis_goods[0].project != null)) {
218
-            this.uploadMethod = 1
219
-          } else {
220
-            this.uploadMethod = 2
216
+          
217
+          if(this.$store.getters.user.template_info.org_id!=10164 && this.$store.getters.user.template_info.org_id!=10721){
218
+              if ((res.data.dialysis_goods[0].good_user.length == 0 && res.data.dialysis_goods[0].good_user_detail.length == 0 && res.data.dialysis_goods[0].last_good_user != null) || (res.data.dialysis_goods[0].good_user.length == 0 && res.data.dialysis_goods[0].good_user_detail.length == 0 && res.data.dialysis_goods[0].project != null)) {
219
+              this.uploadMethod = 1
220
+            } else {
221
+              this.uploadMethod = 2
222
+            }
223
+
224
+            if (res.data.dialysis_goods[0].good_user.length == 0 && res.data.dialysis_goods[0].good_user_detail.length == 0 && res.data.dialysis_goods[0].last_good_user == null && res.data.dialysis_goods[0].project.length == 0) {
225
+              this.color = 2
226
+            }
221 227
           }
222 228
 
223
-          if (res.data.dialysis_goods[0].good_user.length == 0 && res.data.dialysis_goods[0].good_user_detail.length == 0 && res.data.dialysis_goods[0].last_good_user == null && res.data.dialysis_goods[0].project.length == 0) {
224
-            this.color = 2
229
+          if(this.$store.getters.user.template_info.org_id==10164 || this.$store.getters.user.template_info.org_id ==10721){
230
+
231
+            if ((res.data.dialysis_goods[0].good_user.length == 0 && res.data.dialysis_goods[0].good_user_detail.length == 0 && res.data.dialysis_goods[0].last_good_user != null) || (res.data.dialysis_goods[0].good_user.length == 0 && res.data.dialysis_goods[0].good_user_detail.length == 0)) {
232
+              this.uploadMethod = 1
233
+            } else {
234
+              this.uploadMethod = 2
235
+            }
236
+
237
+            if (res.data.dialysis_goods[0].good_user.length == 0 && res.data.dialysis_goods[0].good_user_detail.length == 0 && res.data.dialysis_goods[0].last_good_user == null) {
238
+              this.color = 2
239
+            }
225 240
           }
226 241
 
242
+        
243
+
227 244
           for (let i = 0; i < res.data.dialysis_goods.length; i++) {
228
-            if (res.data.dialysis_goods[i].good_user.length > 0) {
245
+            console.log("中国=======================",res.data.dialysis_goods[i].good_user)
246
+            var goodUserList = []
247
+            if(res.data.dialysis_goods[i].good_user!=null){
248
+               for(let s=0;s<res.data.dialysis_goods[i].good_user.length;s++){
249
+                res.data.dialysis_goods[i].good_user[s].out_stock = 0
250
+                 res.data.dialysis_goods[i].good_user[s].out_stock = this.getOutStock(res.data.dialysis_goods[i].good_user[s].info.good_type_id)
251
+               }
252
+            }
253
+
254
+            if(res.data.dialysis_goods[i].good_user!=null){
255
+               for(let s=0;s<res.data.dialysis_goods[i].good_user.length;s++){
256
+                 if(res.data.dialysis_goods[i].good_user[s].out_stock == 1){
257
+                    goodUserList.push(res.data.dialysis_goods[i].good_user[s])
258
+                 }
259
+               }
260
+            }
261
+
262
+            console.log("hhahahahahhaah",goodUserList)
263
+            if (goodUserList.length > 0) {
264
+
229 265
               this.isShowButton = 2
230 266
             }
231 267
             if (res.data.dialysis_goods[i].good_user_detail.length > 0 && res.data.dialysis_goods[i].good_user.length > 0) {
@@ -234,7 +270,8 @@ export default {
234 270
           }
235 271
           //good_user 自动出库表    last_good_user (上次透析)  good_user_detail(准备表) last_good_user_detail(上次透析)
236 272
           for (let i = 0; i < res.data.dialysis_goods.length; i++) {
237
-            if (res.data.dialysis_goods[i].good_user.length > 0) {
273
+
274
+            if (goodUserList.length > 0) {
238 275
               for (let b = 0; b < res.data.dialysis_goods[i].good_user.length; b++) {
239 276
                 if (res.data.dialysis_goods[i].good_user[b].info.id > 0) {
240 277
                   let obj = {
@@ -326,7 +363,9 @@ export default {
326 363
                   }
327 364
                 }
328 365
               } else {
329
-                if (res.data.dialysis_goods[i].project.length > 0) {
366
+
367
+                if(this.$store.getters.user.template_info.org_id!=10164 && this.$store.getters.user.template_info.org_id!=10721){
368
+                  if (res.data.dialysis_goods[i].project.length > 0) {
330 369
                   for (let b = 0; b < res.data.dialysis_goods[i].project.length; b++) {
331 370
                     if (res.data.dialysis_goods[i].project[b].good_info.type.out_stock == 1) {
332 371
                       if (res.data.dialysis_goods[i].project[b].good_info.id > 0) {
@@ -375,6 +414,38 @@ export default {
375 414
                     }
376 415
                   }
377 416
                 }
417
+
418
+                
419
+                }
420
+
421
+                if(this.$store.getters.user.template_info.org_id == 10164 || this.$store.getters.user.template_info.org_id==10721){
422
+                   
423
+                  if (res.data.dialysis_goods[i].last_good_user_detail != null) {
424
+                    if (config != undefined && config.is_open != 1) {
425
+                      for (let b = 0; b < res.data.dialysis_goods[i].last_good_user_detail.length; b++) {
426
+                        if (res.data.dialysis_goods[i].last_good_user_detail[b].info.id > 0) {
427
+                          let obj = {
428
+                            good_type_id: res.data.dialysis_goods[i].last_good_user_detail[b].type.id,
429
+                            good_id: res.data.dialysis_goods[i].last_good_user_detail[b].info.id,
430
+                            type_name: res.data.dialysis_goods[i].last_good_user_detail[b].type.type_name,
431
+                            specification_name: res.data.dialysis_goods[i].last_good_user_detail[b].info.specification_name,
432
+                            count: res.data.dialysis_goods[i].last_good_user_detail[b].count.toString(),
433
+                            project_id: 0,
434
+                            old_count: 0,
435
+                            new_count: 0,
436
+                            good_type_id:res.data.dialysis_goods[i].last_good_user_detail[b].info.good_type_id,
437
+                          }
438
+                          console.log("寄44444444444444444444",this.list)
439
+                          this.list.push(obj)
440
+                        }
441
+                      }
442
+                    }
443
+                    if (config.is_open == 1) {
444
+                      this.list = []
445
+                    }
446
+                  }
447
+                }
448
+              
378 449
               }
379 450
             }
380 451
           }
@@ -396,6 +467,9 @@ export default {
396 467
           // 已经出库数据
397 468
           var warehouseOutList = res.data.warehouseOutList
398 469
           console.log('warehouseOutList', warehouseOutList)
470
+          
471
+        
472
+       
399 473
 
400 474
           var newWarehouseOutList = []
401 475
          
@@ -408,6 +482,7 @@ export default {
408 482
                   good_id:item.good_id,
409 483
                   child: [],
410 484
                   count:0,
485
+                  
411 486
                 }
412 487
               }
413 488
             })
@@ -474,8 +549,35 @@ export default {
474 549
           }
475 550
         
476 551
 
477
-          console.log("hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh",this.list)
478
-          this.list = newArr
552
+         console.log("newArr=================",newArr)
553
+           
554
+          console.log("out_open--------------",this.out_open)
555
+          console.log("is_open----------------",this.is_open)
556
+          console.log("isShowButton++++++++++",this.isShowButton)
557
+          
558
+
559
+          
560
+          var newArrList = []
561
+          if(newArr!=null && newArr.length >0){
562
+            for(let i=0;i<newArr.length;i++){
563
+              newArr[i].out_stock = 0   
564
+              newArr[i].out_stock = this.getOutStock(newArr[i].good_type_id)
565
+            }
566
+          } 
567
+          console.log("我的杰哈回复的哈哈都返回啊涣发大号暗黑风",newArr)
568
+
569
+          if(newArr!=null && newArr.length>0){
570
+            for(let i=0;i<newArr.length;i++){
571
+              if(newArr[i].out_stock == 1){
572
+                newArrList.push(newArr[i])
573
+              }
574
+            }
575
+          }
576
+
577
+          console.log("哈哈哈哈会到的佛啊地方阿道夫",newArrList)
578
+         
579
+          this.list = newArrList
580
+          console.log("list=--------------",this.list)
479 581
 
480 582
           var prescription = res.data.prescribe
481 583
 
@@ -483,7 +585,7 @@ export default {
483 585
           var dialyszerArr = []
484 586
           var irrigationArr = []
485 587
           var dialysisStrainerArr = []
486
-          if (this.$store.getters.user.template_info.org_id != 10318 && this.$store.getters.user.template_info.org_id != 10402 && this.$store.getters.user.template_info.org_id != 10485 && this.$store.getters.user.template_info.org_id != 10489 && this.$store.getters.user.template_info.org_id != 10215 && this.$store.getters.user.template_info.org_id != 10485 && this.$store.getters.user.template_info.org_id != 10265 && this.$store.getters.user.template_info.org_id != 10515 && this.$store.getters.user.template_info.org_id != 10278 && this.$store.getters.user.template_info.org_id != 10480 && this.$store.getters.user.template_info.org_id != 10598 && this.$store.getters.user.template_info.org_id != 10515 && this.$store.getters.user.template_info.org_id != 10318 && this.$store.getters.user.template_info.org_id != 10610 && this.$store.getters.user.template_info.org_id != 10265) {
588
+          if (this.$store.getters.user.template_info.org_id != 10318 && this.$store.getters.user.template_info.org_id != 10402 && this.$store.getters.user.template_info.org_id != 10485 && this.$store.getters.user.template_info.org_id != 10489 && this.$store.getters.user.template_info.org_id != 10215 && this.$store.getters.user.template_info.org_id != 10485 && this.$store.getters.user.template_info.org_id != 10265 && this.$store.getters.user.template_info.org_id != 10515 && this.$store.getters.user.template_info.org_id != 10278 && this.$store.getters.user.template_info.org_id != 10480 && this.$store.getters.user.template_info.org_id != 10598 && this.$store.getters.user.template_info.org_id != 10515 && this.$store.getters.user.template_info.org_id != 10318 && this.$store.getters.user.template_info.org_id != 10610 && this.$store.getters.user.template_info.org_id != 10265 && this.$store.getters.user.template_info.org_id != 10164 && this.$store.getters.user.template_info.org_id != 10726 && this.$store.getters.user.template_info.org_id != 10721) {
487 589
             if (prescription != null && res.data.dialysis_goods[0].good_user_detail.length == 0) {
488 590
               var dialysisDialyszers = prescription.dialysis_dialyszers
489 591
               var arr = dialysisDialyszers.split(',')
@@ -855,6 +957,15 @@ export default {
855 957
         }
856 958
       }
857 959
       return type_name
960
+    },
961
+    getOutStock(good_type_id){
962
+      var out_stock =0
963
+      for(let i=0;i<this.good_type_list.length;i++){
964
+        if(good_type_id == this.good_type_list[i].id){
965
+          out_stock = this.good_type_list[i].out_stock
966
+        }
967
+      }
968
+      return out_stock
858 969
     }
859 970
   },
860 971
   mounted () {

+ 4 - 2
src/pages/main/newActionBar/dialysisPrescription.vue Vedi File

@@ -474,7 +474,8 @@
474 474
               $store.getters.user.template_info.org_id!=10679 &&
475 475
               $store.getters.user.template_info.org_id!=10702 &&
476 476
               $store.getters.user.template_info.org_id!=10480 &&
477
-              $store.getters.user.template_info.org_id!=10510
477
+              $store.getters.user.template_info.org_id!=10510 &&
478
+              $store.getters.user.template_info.org_id!=10644 
478 479
 
479 480
             "
480 481
           >
@@ -666,7 +667,8 @@
666 667
               $store.getters.user.template_info.org_id!=10679 &&
667 668
               $store.getters.user.template_info.org_id!=10702 &&
668 669
               $store.getters.user.template_info.org_id!=10510 &&
669
-              $store.getters.user.template_info.org_id!=10480 
670
+              $store.getters.user.template_info.org_id!=10480 &&
671
+              $store.getters.user.template_info.org_id!=10644 
670 672
             "
671 673
           >
672 674
             <span

+ 1 - 2
src/pages/main/newActionBar/doctorAdvice.vue Vedi File

@@ -2718,8 +2718,7 @@ export default {
2718 2718
       
2719 2719
        params['check_time'] = checkTime
2720 2720
 
2721
-       checkMobileDoctorAdvice(params)
2722
-      .then(response => {
2721
+       checkMobileDoctorAdvice(params).then(response => {
2723 2722
         if (response.data.state == 0) {
2724 2723
           Toast.fail('你没有权限核对医嘱!')
2725 2724
           if(response.data.code == 600000008){

+ 1 - 1
src/pages/main/newActionBar/doubleCheck.vue Vedi File

@@ -89,7 +89,7 @@
89 89
                       <van-checkbox name="k">肝素补液口未双保险夹闭</van-checkbox>
90 90
                   </van-checkbox-group>
91 91
               </div>
92
-              <van-field v-model="first_check_time_str" readonly @click="selectFirstCheckTimeAction" label="第一核对时间" input-align="right"/>
92
+              <van-field v-model="first_check_time_str" readonly @click="selectFirstCheckTimeAction" label="第一核对时间" input-align="right"v-if="org_id!=10721" />
93 93
               <van-cell title='第一核对人员' v-if="org_id!=10597">
94 94
                   <template #label>
95 95
                       <van-radio-group class="doctorList" v-model="doubleReview.creater">

+ 7 - 4
src/pages/main/newActionBar/monitoring.vue Vedi File

@@ -132,7 +132,7 @@
132 132
                     <span v-if="org_id==10644">{{item.transmembrane_pressure?item.transmembrane_pressure:''}}</span>
133 133
                   </td>
134 134
                   <td v-if="isShow('跨膜压1')" >{{item.transmembrane_pressure_one?item.transmembrane_pressure_one:'/'}}</td>
135
-                  <td v-if="isShow('超滤量') && (org_id==10551 || org_id ==10617 || org_id ==10629 || org_id ==10679 || org_id ==10693 || org_id ==10702)" >
135
+                  <td v-if="isShow('超滤量') && (org_id==10551 || org_id ==10617 || org_id ==10629 || org_id ==10679 || org_id ==10693 || org_id ==10702 || org_id ==10721)" >
136 136
                     {{item.ultrafiltration_volume?item.ultrafiltration_volume:'0'}}</td>
137 137
                   <td v-if="isShow('超滤量') && org_id!=10551 && org_id != 10617 && org_id!=10629 && org_id!=10679 && org_id!=10693 && org_id!=10702" >
138 138
                     <span v-if="org_id ==10612">
@@ -152,8 +152,8 @@
152 152
                   <td v-if="isShow('置换率')">{{item.replacement_rate?item.replacement_rate:''}}</td>
153 153
                   <td v-if="isShow('置换率1')">{{item.replacement_rate_one?item.replacement_rate_one:'/'}}</td>
154 154
                   <td v-if="isShow('置换量')" >
155
-                    <span v-if="org_id!=10702"> {{item.displacement_quantity?item.displacement_quantity:''}}</span> 
156
-                    <span v-if="org_id==10702"> {{item.displacement_quantity?item.displacement_quantity:'0'}}</span> 
155
+                    <span v-if="org_id!=10702 && org_id!=10721"> {{item.displacement_quantity?item.displacement_quantity:''}}</span> 
156
+                    <span v-if="org_id==10702 || org_id == 10721"> {{item.displacement_quantity?item.displacement_quantity:'0'}}</span> 
157 157
                   </td>
158 158
                  
159 159
                   <td v-if="isShow('SpO₂') && template_id != 6 && template_id != 10  && template_id != 11" >
@@ -174,7 +174,10 @@
174 174
                   <td v-if="isShow('置换液流量1')" >{{item.displacement_flow_quantity_one?item.displacement_flow_quantity_one:'/'}}</td>
175 175
                   <td v-if="isShow('透析液流量')" >{{item.dialysate_flow?item.dialysate_flow:''}}</td>
176 176
                   <td v-if="isShow('透析液流量1')" >{{item.dialysate_flow_one?item.dialysate_flow_one:'/'}}</td>
177
-                  <td v-if="isShow('超滤率')" >{{item.ultrafiltration_rate?item.ultrafiltration_rate:'0'}}</td>
177
+                  <td v-if="isShow('超滤率')" >
178
+                    <span v-if="org_id==10702"> {{item.ultrafiltration_rate?item.ultrafiltration_rate:'0'}}</span>
179
+                    <span v-if="org_id!=10702"> {{item.ultrafiltration_rate?item.ultrafiltration_rate:''}}</span>
180
+                  </td>
178 181
                   <th v-if="isShow('超滤率2')" width="60px">{{ item.ultrafiltration_rate_one?item.ultrafiltration_rate_one:"/" }} <br /></th>
179 182
                   <th v-if="isShow('剩余肝素')" width="60px">{{item.heparin_one?item.heparin_one:"/"}} <br /> </th>
180 183
                   <td v-if="isShow('置换量1')" >{{item.displacement_quantity_one?item.displacement_quantity_one:'/'}}</td>

+ 100 - 5
src/pages/main/today/TodayTab.vue Vedi File

@@ -1260,6 +1260,8 @@ export default {
1260 1260
 
1261 1261
           var all_projcet = []
1262 1262
 
1263
+         
1264
+
1263 1265
           if (this.$store.getters.user.template_info.org_id == 10318) {
1264 1266
             var project = resp.data.project // 项目
1265 1267
             if(project!=null && project.length > 0){
@@ -1286,8 +1288,81 @@ export default {
1286 1288
             }
1287 1289
 
1288 1290
           }
1291
+          var new_all_project = []
1292
+
1293
+          var new_all_group = []
1294
+
1295
+          var good_list_group = []
1296
+
1297
+          //针对 10726 江西乐安祥康血液透析中心
1298
+          if(this.$store.getters.user.template_info.org_id == 10726 || this.$store.getters.user.template_info.org_id == 10164){
1299
+            var project = resp.data.project // 项目
1300
+            if(project!=null && project.length > 0){
1301
+              for (let i = 0; i < project.length; i++) {
1302
+
1303
+                if(project[i].type == 3){
1304
+                  good_list_group.push(project[i])
1305
+                }
1289 1306
 
1290
-          if (this.$store.getters.user.template_info.org_id != 10318 && this.$store.getters.user.template_info.org_id != 10635) {
1307
+                if (project[i].type == 2 && project[i].team_id ==0) {
1308
+                     new_all_project.push(project[i])
1309
+                }
1310
+
1311
+                if (project[i].type == 2 && project[i].team_id > 0) {
1312
+                     new_all_group.push(project[i])
1313
+                }
1314
+
1315
+              }
1316
+              if(good_list_group!=null && good_list_group.length>0){
1317
+                this.project.push(...good_list_group)
1318
+              }
1319
+              if(new_all_project!=null && new_all_project.length>0){
1320
+                this.project.push(...new_all_project)
1321
+              }
1322
+              console.log("项目组套名称----------------",new_all_group)
1323
+              if(new_all_group!=null && new_all_group.length>0){
1324
+                  let dataInfo = {}
1325
+                  new_all_group.forEach((item, index) => {
1326
+                  let { team_id } = item
1327
+                  if (!dataInfo[team_id]) {
1328
+                    dataInfo[team_id] = {
1329
+                      team_id:item.team_id,
1330
+                      id:item.team_id,
1331
+                      advice_name:item.team.project_team,
1332
+                      project_team:item.team.project_team,
1333
+                      doctor:item.doctor,
1334
+                      start_time:item.start_time,
1335
+                      execution_time:item.execution_time,
1336
+                      execution_state:item.execution_state,
1337
+                      execution_staff:item.execution_staff,
1338
+                      check_time:item.check_time,
1339
+                      check_state:item.check_state,
1340
+                      checker:item.checker,
1341
+                      remark:'',
1342
+                      parent_id:0,
1343
+                      is_check_team:1,
1344
+                      team:item.team,
1345
+                      project:item.project,
1346
+                      good_info:item.good_info,
1347
+                      type:item.type,
1348
+                      count:item.count,
1349
+
1350
+                    }
1351
+                  }
1352
+                })
1353
+                let arr = Object.values(dataInfo)
1354
+                if(arr!=null && arr.length>0){
1355
+                  console.log("arr----------------",arr)
1356
+                  this.project.push(...arr)
1357
+                }
1358
+              
1359
+              }
1360
+            
1361
+            }
1362
+
1363
+          }
1364
+
1365
+          if (this.$store.getters.user.template_info.org_id != 10318 && this.$store.getters.user.template_info.org_id != 10635 && this.$store.getters.user.template_info.org_id != 10726) {
1291 1366
             var project = resp.data.project
1292 1367
 
1293 1368
             if(project!=null && project.length>0){
@@ -1334,16 +1409,33 @@ export default {
1334 1409
               doctor_advices = []
1335 1410
             }
1336 1411
           }
1337
-
1412
+           console.log("医嘱his_doctor_advices--------------",his_doctor_advices)
1338 1413
           if (his_doctor_advices != null) {
1339 1414
             for (let i = 0; i < his_doctor_advices.length; i++) {
1340 1415
               his_doctor_advices[i]['origin'] = 2
1341 1416
               his_doctor_advices[i]['way'] = 1
1342 1417
               if (doctor_advices != null) {
1343
-                doctor_advices.push(his_doctor_advices[i])
1418
+                 
1419
+                //针对 濉溪杏康血液透析中心
1420
+                if(this.$store.getters.user.template_info.org_id == 10721){
1421
+                  if(his_doctor_advices[i].execution_frequency.indexOf("上机前") == -1){
1422
+                    doctor_advices.push(his_doctor_advices[i])
1423
+                  }
1424
+                }else{
1425
+                  doctor_advices.push(his_doctor_advices[i])
1426
+                }
1427
+
1428
+               
1344 1429
               } else {
1345
-                doctor_advices = []
1346
-                doctor_advices.push(his_doctor_advices[i])
1430
+                  doctor_advices = []
1431
+                  //针对 濉溪杏康血液透析中心
1432
+                  if(this.$store.getters.user.template_info.org_id == 10721){
1433
+                    if(his_doctor_advices[i].execution_frequency.indexOf("上机前") == -1){
1434
+                      doctor_advices.push(his_doctor_advices[i])
1435
+                    }
1436
+                  }else{
1437
+                       doctor_advices.push(his_doctor_advices[i])
1438
+                  }
1347 1439
               }
1348 1440
             }
1349 1441
           }
@@ -1570,6 +1662,9 @@ export default {
1570 1662
           }
1571 1663
 
1572 1664
           this.is_project_open = resp.data.is_project_open_config.is_open
1665
+
1666
+          console.log("项目姐夫------------------------",this.project)
1667
+          
1573 1668
           if (this.project != null && this.is_project_open == 1) {
1574 1669
             this.project.map(item => {
1575 1670
               let obj = {

+ 7 - 4
src/pages/main/today/dialysisMonitoring.vue Vedi File

@@ -104,7 +104,7 @@
104 104
           <td v-if="isShow('血流量1')">{{ item.blood_flow_volume_one ? item.blood_flow_volume_one : "/" }}</td>
105 105
           <td v-if="isShow('跨膜压')" >{{ item.transmembrane_pressure ? item.transmembrane_pressure : "" }}</td>
106 106
           <td v-if="isShow('跨膜压1')" >{{ item.venous_pressure_one ? item.venous_pressure_one : "/" }}</td>
107
-          <td v-if="isShow('超滤量')&&(org_id ==10551 || org_id ==10629 || org_id ==10679|| org_id ==10693 || org_id ==10702)" >{{ item.ultrafiltration_volume ? item.ultrafiltration_volume : "0" }}</td>
107
+          <td v-if="isShow('超滤量')&&(org_id ==10551 || org_id ==10629 || org_id ==10679|| org_id ==10693 || org_id ==10702 || org_id == 10721)" >{{ item.ultrafiltration_volume ? item.ultrafiltration_volume : "0" }}</td>
108 108
           <td v-if="isShow('超滤量')&&org_id !=10551 && org_id!=10629 && org_id != 10679&&org_id!=10693 &&org_id!=10702" >
109 109
             <span v-if="org_id == 10612">
110 110
               <span v-if="index == 1"> {{ item.ultrafiltration_volume ? item.ultrafiltration_volume : "0" }}</span>
@@ -116,7 +116,10 @@
116 116
 
117 117
           </td>
118 118
           <td v-if="isShow('超滤量1')" >{{item.ultrafiltration_volume_one?item.ultrafiltration_volume_one:'/'}}</td>
119
-          <td v-if="isShow('超滤率')" >{{item.ultrafiltration_rate?item.ultrafiltration_rate:'0'}}</td>
119
+          <td v-if="isShow('超滤率')" >
120
+            <span v-if="org_id==10702">{{item.ultrafiltration_rate?item.ultrafiltration_rate:'0'}} </span> 
121
+            <span v-if="org_id!=10702">{{item.ultrafiltration_rate?item.ultrafiltration_rate:''}} </span> 
122
+          </td>
120 123
           <td v-if="isShow('超滤率2')" >{{item.ultrafiltration_rate_one?item.ultrafiltration_rate_one:''}}</td>
121 124
           <td v-if="isShow('钠浓度')">{{ item.sodium_concentration ? item.sodium_concentration : "" }}</td>
122 125
           <td v-if="isShow('钠浓度1')">{{ item.sodium_concentration_one ? item.sodium_concentration_one : "/" }}</td>
@@ -125,10 +128,10 @@
125 128
           <td v-if="isShow('置换率')">{{ item.replacement_rate ? item.replacement_rate : "" }}</td>
126 129
           <td v-if="isShow('置换率1')">{{ item.replacement_rate_one ? item.replacement_rate_one : "/" }}</td>
127 130
           <td v-if="isShow('置换量')" >
128
-            <span v-if="org_d == 10702">
131
+            <span v-if="org_id == 10702">
129 132
               {{ item.displacement_quantity ? item.displacement_quantity : "0" }}
130 133
             </span>
131
-            <span v-if="org_d != 10702">
134
+            <span v-if="org_id != 10702">
132 135
               {{ item.displacement_quantity ? item.displacement_quantity : "" }}
133 136
             </span>
134 137
           </td>