Home Explore Help
Register Sign In
elizebath
/
elizebeth
forked from csx/Vue_New
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

11月14日 库存扣减更新

XMLWAN 3 years ago
parent
cebabe95e8
commit
e45db5550d
8 changed files with 48 additions and 35 deletions
Split View Show Diff Stats
  1. 3 2
      src/api/dialysis_record.js
  2. 11 11
      src/xt_pages/dialysis/batch_print/batch_print_order_six.vue
  3. 2 2
      src/xt_pages/dialysis/details/DialysisPrescription.vue
  4. 6 4
      src/xt_pages/dialysis/details/dialog/computer_dialog.vue
  5. 4 4
      src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue
  6. 13 1
      src/xt_pages/dialysis/details/dialog/monitor_dialog.vue
  7. 8 8
      src/xt_pages/dialysis/details/dialysisMonitoring.vue
  8. 1 3
      src/xt_pages/dialysis/template/DialysisPrintOrderFortySeven.vue

+ 3 - 2
src/api/dialysis_record.js View File 

@@ -47,7 +47,7 @@ export function editMonitor(patient_id, schedule_date, data, mode) {
47 47 
   })
48 48 
 }
49 49
50 
-export function startDialysis(patient_id, schedule_date, nurse_id, bed_id, lood_drawing, puncture_nurse_id, start_time, schedual_type, mode, washpipe_nurse, change_nurse, difficult_puncture_nurse, new_fistula_nurse) {
50 
+export function startDialysis(patient_id, schedule_date, nurse_id, bed_id, lood_drawing, puncture_nurse_id, start_time, schedual_type, mode, washpipe_nurse, change_nurse, difficult_puncture_nurse, new_fistula_nurse, blood_drawing) {
51 51 
   var params = {
52 52 
     patient_id: patient_id,
53 53 
     date: schedule_date,
 
@@ -61,7 +61,8 @@ export function startDialysis(patient_id, schedule_date, nurse_id, bed_id, lood_
61 61 
     washpipe_nurse: washpipe_nurse,
62 62 
     change_nurse: change_nurse,
63 63 
     difficult_puncture_nurse: difficult_puncture_nurse,
64 
-    new_fistula_nurse: new_fistula_nurse
64 
+    new_fistula_nurse: new_fistula_nurse,
65 
+    blood_drawing: blood_drawing
65 66 
   }
66 67 
   console.log('params', params)
67 68 
   return request({

+ 11 - 11
src/xt_pages/dialysis/batch_print/batch_print_order_six.vue View File 

@@ -278,7 +278,7 @@
278 278 
                             style="width: 100px;text-align: center"
279 279 
                             v-if="
280 280 
                               record.assessment_before_dislysis.puncture_way == ''
281 
-
281 
+
282 282 
                             "
283 283 
                           ></div>
284 284 
                           <div
 
@@ -295,7 +295,7 @@
295 295 
                             style="width: 100px;text-align: center"
296 296 
                             v-if="
297 297 
                               record.assessment_before_dislysis.puncture_way.indexOf('扣眼')>-1
298 
-
298 
+
299 299 
                             "
300 300 
                           >
301 301 
                             扣眼
 
@@ -305,7 +305,7 @@
305 305 
                             style="width: 100px;text-align: center"
306 306 
                             v-if="
307 307 
                               record.assessment_before_dislysis.puncture_way.indexOf('区域')>-1
308 
-
308 
+
309 309 
                             "
310 310 
                           >
311 311 
                             区域
 
@@ -330,7 +330,7 @@
330 330 
                           }}
331 331 
                         </div>
332 332 
                       </div>
333 
-
333 
+
334 334 
                     </div>
335 335 
                     <div
336 336 
                       class="row"
 
@@ -348,7 +348,7 @@
348 348 
                                   .blood_access_part_id
349 349 
                                 ? record.assessment_before_dislysis
350 350 
                                     .blood_access_part_id
351 
-                                : 0
351 
+                                : 0
352 352 
                           }}
353 353 
                           {{
354 354 
                             record.assessment_before_dislysis &&
 
@@ -679,7 +679,7 @@
679 679 
                           <span v-else>/</span>
680 680 
                         </div>
681 681 
                       </div>
682 
-
682 
+
683 683 
                     </div>
684 684
685 685 
                     <div
 
@@ -704,7 +704,7 @@
704 704 
                                       .additional_weight
705 705 
                                 ).toFixed(1)
706 706 
                               : "未称重"
707 
-                          }}</span>
707 
+                          }}</span>
708 708 
                         </div>
709 709 
                         kg
710 710 
                       </div>
 
@@ -1092,7 +1092,7 @@
1092 1092 
                           <td></td>
1093 1093 
                           <td></td>
1094 1094 
                           <td></td>
1095 
-
1095 
+
1096 1096 
                           <td style="line-height:16px;padding:0px;">
1097 1097 
                             <div
1098 1098 
                               style="height:40px;line-height:20px; overflow:hidden;"
 
@@ -1519,8 +1519,8 @@
1519 1519 
                           }}
1520 1520 
                         </div>
1521 1521 
                       </div>
1522 
-
1523 
-
1522 
+
1523 
+
1524 1524 
                     </div>
1525 1525
1526 1526 
                     <div
 
@@ -1767,7 +1767,7 @@
1767 1767 
                             style="width: 80px;text-align: left;display: inline-block;white-space: nowrap;"
1768 1768 
                             v-if="
1769 1769 
                               record.dialysis_order != null &&
1770 
-                                record.dialysis_order.start_nurse ==
1770 
+                               record.check.creater ==
1771 1771 
                                   record.check.creater
1772 1772 
                             "
1773 1773 
                           >

+ 2 - 2
src/xt_pages/dialysis/details/DialysisPrescription.vue View File 

@@ -111,8 +111,8 @@
111 111 
           <label>目标超滤量 : </label>
112 112 
           <span class="content">{{ target_ultrafiltration != "0" ? target_ultrafiltration : ""}}</span>
113 113
114 
-          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 45  && this.$store.getters.xt_user.template_info.template_id != 47 && this.$store.getters.xt_user.template_info.org_id != 9555"  class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
115 
-          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id != 40 || this.$store.getters.xt_user.template_info.template_id != 43 || this.$store.getters.xt_user.template_info.template_id != 45  || this.$store.getters.xt_user.template_info.template_id != 47 || this.$store.getters.xt_user.template_info.org_id == 9555" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
114 
+          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 45  && this.$store.getters.xt_user.template_info.template_id != 46  && this.$store.getters.xt_user.template_info.template_id != 47 && this.$store.getters.xt_user.template_info.org_id != 9555"  class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
115 
+          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id != 40 || this.$store.getters.xt_user.template_info.template_id != 43 || this.$store.getters.xt_user.template_info.template_id != 45 || this.$store.getters.xt_user.template_info.template_id != 46 || this.$store.getters.xt_user.template_info.template_id != 47 || this.$store.getters.xt_user.template_info.org_id == 9555" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
116 116 
         </li>
117 117
118 118 
          <li v-if="isShow('目标超滤量') && this.$store.getters.xt_user.template_info.org_id == 10290">

+ 6 - 4
src/xt_pages/dialysis/details/dialog/computer_dialog.vue View File 

@@ -53,7 +53,7 @@
53 53 
         </el-form-item>
54 54
55 55
56 
-        <el-form-item label="引血(ml/min)" v-if="template_id == 6 && org_id != 10223">
56 
+        <el-form-item label="引血(ml/min)" v-show="引血">
57 57 
           <el-input type="number" v-model="form.blood_drawing" style="width:200px;"></el-input>
58 58 
         </el-form-item>
59 59 
 
@@ -357,8 +357,8 @@
357 357 
         console.log(this.dialysis_order)
358 358 
         this.loading = true
359 359 
         let mode = '1'
360 
-
361 
-        startDialysis(this.patient_id, this.schedule_date ? parseTime(this.schedule_date, '{y}-{m}-{d}') : parseTime(new Date(), '{y}-{m}-{d}'), this.form.nurse_id, this.form.bed_id, this.form.lood_drawing, this.form.puncture_nurse_id, this.form.start_time, this.schedual_type, mode,this.form.washpipe_nurse,this.form.change_nurse,this.form.difficult_puncture_nurse,this.form.new_fistula_nurse).then(rs => {
360 
+        var blood_drawing =  this.form.blood_drawing.toString()
361 
+        startDialysis(this.patient_id, this.schedule_date ? parseTime(this.schedule_date, '{y}-{m}-{d}') : parseTime(new Date(), '{y}-{m}-{d}'), this.form.nurse_id, this.form.bed_id, this.form.lood_drawing, this.form.puncture_nurse_id, this.form.start_time, this.schedual_type, mode,this.form.washpipe_nurse,this.form.change_nurse,this.form.difficult_puncture_nurse,this.form.new_fistula_nurse,blood_drawing).then(rs => {
362 362 
           this.loading = false
363 363 
           var resp = rs.data
364 364 
           if (resp.state == 1) {
 
@@ -379,7 +379,8 @@
379 379 
             this.$message.error(resp.msg)
380 380 
           }
381 381 
         })
382 
-      }, editOrder() {
382 
+      },
383 
+      editOrder() {
383 384 
         let ParamsQuery = {}
384 385 
         ParamsQuery['schedual_type'] = this.schedual_type
385 386 
         ParamsQuery['id'] = this.dialysis_order.id
 
@@ -391,6 +392,7 @@
391 392 
         ParamsQuery['change_nurse'] = this.form.change_nurse
392 393 
         ParamsQuery['difficult_puncture_nurse'] = this.form.difficult_puncture_nurse
393 394 
         ParamsQuery['new_fistula_nurse'] = this.form.new_fistula_nurse
395 
+        ParamsQuery["blood_drawing"] = this.form.blood_drawing
394 396 
         ParamsQuery['mode'] = "2"
395 397 
         if (this.dialysis_order.creator != this.$store.getters.xt_user.user.id) {
396 398 
           ParamsQuery['mode'] = "3"

+ 4 - 4
src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue View File 

@@ -87,7 +87,7 @@
87 87 
                     </el-col>
88 88
89 89 
                     <el-col :span="8"
90 
-                            v-if="isShows('目标超滤量') && (this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22  || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28  || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 ||  this.$store.getters.xt_user.template_info.template_id == 40 ||  this.$store.getters.xt_user.template_info.template_id == 43 ||  this.$store.getters.xt_user.template_info.template_id == 45 ||  this.$store.getters.xt_user.template_info.template_id == 47 || this.$store.getters.xt_user.template_info.org_id == 9555 )">
90 
+                            v-if="isShows('目标超滤量') && (this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22  || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28  || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 ||  this.$store.getters.xt_user.template_info.template_id == 40 ||  this.$store.getters.xt_user.template_info.template_id == 43 ||  this.$store.getters.xt_user.template_info.template_id == 45  ||  this.$store.getters.xt_user.template_info.template_id == 46 ||  this.$store.getters.xt_user.template_info.template_id == 47 || this.$store.getters.xt_user.template_info.org_id == 9555 )">
91 91 
                         <el-form-item label="目标超滤量(ml)：">
92 92 
                             <el-input
93 93 
                                     type="number"
 
@@ -98,7 +98,7 @@
98 98
99 99
100 100 
                     <el-col :span="8"
101 
-                            v-if="isShows('目标超滤量')  && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 &&  this.$store.getters.xt_user.template_info.template_id != 40 &&  this.$store.getters.xt_user.template_info.template_id != 43 &&  this.$store.getters.xt_user.template_info.template_id != 45  &&  this.$store.getters.xt_user.template_info.template_id != 47 && this.$store.getters.xt_user.template_info.org_id != 9555 ">
101 
+                            v-if="isShows('目标超滤量')  && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 &&  this.$store.getters.xt_user.template_info.template_id != 40 &&  this.$store.getters.xt_user.template_info.template_id != 43 &&  this.$store.getters.xt_user.template_info.template_id != 45 &&  this.$store.getters.xt_user.template_info.template_id != 46  &&  this.$store.getters.xt_user.template_info.template_id != 47 && this.$store.getters.xt_user.template_info.org_id != 9555 ">
102 102 
                         <el-form-item label="目标超滤量(L)：">
103 103 
                             <el-input
104 104 
                                     type="number"
 
@@ -369,7 +369,7 @@
369 369
370 370
371 371 
                     <el-col :span="8"
372 
-                            v-if="isShows('置换量') && (this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 29)"
372 
+                            v-if="isShows('置换量') && (this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 46)"
373 373 
                             v-show="zhiShow">
374 374 
                         <el-form-item label="置换量(ml)：">
375 375 
                             <el-input
 
@@ -379,7 +379,7 @@
379 379 
                         </el-form-item>
380 380 
                     </el-col>
381 381 
                     <el-col :span="8"
382 
-                            v-if="isShows('置换量') && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 40"
382 
+                            v-if="isShows('置换量') && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 46"
383 383 
                             v-show="zhiShow">
384 384 
                         <el-form-item label="置换量(L)：">
385 385 
                             <el-input

+ 13 - 1
src/xt_pages/dialysis/details/dialog/monitor_dialog.vue View File 

@@ -226,6 +226,7 @@
226 226 
                 template_id == 41 ||
227 227 
                 template_id == 43 ||
228 228 
                 template_id == 44 ||
229 
+                template_id == 46 ||
229 230 
                 template_id == 47 ||
230 231 
                 org_id == 9555)
231 232 
             "
 
@@ -274,6 +275,7 @@
274 275 
               template_id != 41 &&
275 276 
               template_id != 43 &&
276 277 
               template_id != 44 &&
278 
+              template_id != 46 &&
277 279 
               template_id != 47 &&
278 280 
               org_id != 9555
279 281 
             "
 
@@ -317,6 +319,7 @@
317 319 
                 template_id == 41 ||
318 320 
                 template_id == 43 ||
319 321 
                 template_id == 44 ||
322 
+                template_id == 46 ||
320 323 
                 template_id == 47)
321 324 
             "
322 325 
           >
 
@@ -358,6 +361,7 @@
358 361 
               template_id != 41 &&
359 362 
               template_id != 43 &&
360 363 
               template_id != 44 &&
364 
+              template_id == 46 &&
361 365 
               template_id != 47
362 366 
             "
363 367 
           >
 
@@ -956,6 +960,7 @@
956 960 
                 template_id == 41 ||
957 961 
                 template_id == 43 ||
958 962 
                 template_id == 44 ||
963 
+                template_id == 46 ||
959 964 
                 template_id == 47)
960 965 
             "
961 966 
           >
 
@@ -990,6 +995,7 @@
990 995 
               template_id != 41 &&
991 996 
               template_id != 43 &&
992 997 
               template_id != 44 &&
998 
+              template_id != 46 &&
993 999 
               template_id != 47
994 1000 
             "
995 1001 
           >
 
@@ -1029,6 +1035,7 @@
1029 1035 
                 template_id == 41 ||
1030 1036 
                 template_id == 43 ||
1031 1037 
                 template_id == 44 ||
1038 
+                template_id == 46 ||
1032 1039 
                 template_id == 47 ||
1033 1040 
                 org_id == 9555)
1034 1041 
             "
 
@@ -1069,6 +1076,7 @@
1069 1076 
               template_id != 41 &&
1070 1077 
               template_id != 43 &&
1071 1078 
               template_id != 44 &&
1079 
+              template_id != 46 &&
1072 1080 
               template_id != 47 &&
1073 1081 
               org_id != 9555
1074 1082 
             "
 
@@ -1101,6 +1109,7 @@
1101 1109 
               template_id != 20 &&
1102 1110 
               template_id != 26 &&
1103 1111 
               template_id != 29 &&
1112 
+              template_id != 46 &&
1104 1113 
               template_id != 47
1105 1114 
             "
1106 1115 
           >
 
@@ -1118,6 +1127,7 @@
1118 1127 
                 template_id == 20 ||
1119 1128 
                 template_id == 26 ||
1120 1129 
                 template_id == 29 ||
1130 
+                template_id == 46 ||
1121 1131 
                 template_id == 47)
1122 1132 
             "
1123 1133 
           >
 
@@ -1141,6 +1151,7 @@
1141 1151 
               template_id != 26 &&
1142 1152 
               template_id != 29 &&
1143 1153 
               template_id != 43 &&
1154 
+              template_id != 46 &&
1144 1155 
               template_id != 47
1145 1156 
             "
1146 1157 
           >
 
@@ -1161,6 +1172,7 @@
1161 1172 
                 template_id == 20 ||
1162 1173 
                 template_id == 26 ||
1163 1174 
                 template_id == 29 ||
1175 
+                template_id == 46 ||
1164 1176 
                 template_id == 47)
1165 1177 
             "
1166 1178 
           >
 
@@ -1781,7 +1793,7 @@ export default {
1781 1793 
           : "";
1782 1794 
         this.form.ktv = resp.monitor.ktv ? resp.monitor.ktv : ""; // this.last_monitor_record.ktv;
1783 1795 
         this.form.symptom = resp.monitor.symptom ? resp.monitor.symptom : ""; // this.last_monitor_record.symptom;
1784 
-        this.form.dispose = resp.monitor.dispose ? resp.monitor.dispose : ""; // this.last_monitor_record.dispose;
1796 
+       // this.form.dispose = resp.monitor.dispose ? resp.monitor.dispose : ""; // this.last_monitor_record.dispose;
1785 1797 
         this.form.result = resp.monitor.result ? resp.monitor.result : ""; // this.last_monitor_record.result;
1786 1798 
         this.form.blood_oxygen_saturation = resp.monitor.blood_oxygen_saturation
1787 1799 
           ? resp.monitor.blood_oxygen_saturation

+ 8 - 8
src/xt_pages/dialysis/details/dialysisMonitoring.vue View File 

@@ -14,17 +14,17 @@
14 14 
           <th width="76px">静脉压/动脉压({{monitores[0]&&monitores[0]['venous_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
15 15 
           <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
16 16 
           <th v-if="isShow('跨膜压')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
17 
-          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 47 || this.$store.getters.xt_user.template_info.org_id == 9555)" width="76px" > 超滤量(ml)</th>
18 
-          <th v-if=" isShow('超滤量') && template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44  && template_id != 47  && this.$store.getters.xt_user.template_info.org_id != 9555"  width="76px"> 超滤量(L) </th>
19 
-          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 47)" width="50px"> 超滤率 <br />(ml/h) </th>
20 
-          <th v-if="isShow('超滤率') && template_id !=6 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=47" width="50px"> 超滤率 <br />(L/h) </th>
17 
+          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || this.$store.getters.xt_user.template_info.org_id == 9555)" width="76px" > 超滤量(ml)</th>
18 
+          <th v-if=" isShow('超滤量') && template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47  && this.$store.getters.xt_user.template_info.org_id != 9555"  width="76px"> 超滤量(L) </th>
19 
+          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47)" width="50px"> 超滤率 <br />(ml/h) </th>
20 
+          <th v-if="isShow('超滤率') && template_id !=6 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47" width="50px"> 超滤率 <br />(L/h) </th>
21 21 
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
22 22 
           <th v-if="isShow('透析液温度')" width="92px">透析液温度(℃)</th>
23 
-          <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29  || template_id == 47) " width="92px" > 置换率(ml/min) </th>
24 
-          <th v-if=" isShow('置换率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 47" width="92px" > 置换率(L/h)  </th>
23 
+          <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 47) " width="92px" > 置换率(ml/min) </th>
24 
+          <th v-if=" isShow('置换率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 47" width="92px" > 置换率(L/h)  </th>
25 25 
           <th v-if=" isShow('置换量') && (template_id == 43)" width="92px"> 置换量(ml/h)  </th>
26 
-          <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 47)" width="92px"  > 置换量(ml)  </th>
27 
-          <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919 || org_id == 10191) && org_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 47)" width="92px" > 置换量(L) </th>
26 
+          <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 47)" width="92px"  > 置换量(ml)  </th>
27 
+          <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919 || org_id == 10191) && org_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 47)" width="92px" > 置换量(L) </th>
28 28 
           <th v-if=" isShow('SpO₂') && template_id != 6 && template_id != 10 && template_id != 11  " width="92px" > SpO₂(%) </th>
29 29 
           <th v-if="isShow('电导度')" width="92px">电导度(mS/m)</th>
30 30 
           <th v-if="isShow('置换液流量') && template_id != 27" width="92px">置换液流量(ml/h)</th>

+ 1 - 3
src/xt_pages/dialysis/template/DialysisPrintOrderFortySeven.vue View File 

@@ -1319,9 +1319,7 @@
1319 1319 
                                 >【开始透析】
1320 1320 
                                 </template>
1321 1321
1322 
-                              {{ monitor.end }} {{ monitor.symptom }} &nbsp;{{
1323 
-                                monitor.dispose
1324 
-                              }}
1322 
+                              {{ monitor.end }} {{ monitor.symptom }} &nbsp;{{monitor.dispose}}
1325 1323 
                               &nbsp;{{ monitor.result }}
1326 1324 
                             </span>
1327 1325 
                           </div>