Parcourir la source

Merge branch '20230223_pad_vue_new_branch' of http://git.shengws.com/csx/Pad_New into 20230223_pad_vue_new_branch

28169 il y a 1 semaine
Parent
révision
9364a49b14

+ 6 - 7
src/pages/doctorAdvice/components/new_Inspectiondetails.vue Voir le fichier

@@ -195,7 +195,7 @@ export default {
195 195
     // 顶部返回
196 196
     toReturn(){
197 197
       this.$router.push(
198
-        {path:"/patientdetail?patientid=" +this.patientid,query:{active:this.active} }
198
+        {path:"/patientdetail?patientid=" +this.patientid +'&seacherActive='+1,query:{active:this.active} }
199 199
       );
200 200
     },
201 201
     getTime (time) {
@@ -280,7 +280,7 @@ export default {
280 280
       for(let i=0;i<this.tableData.length;i++){
281 281
         for(let j=0;j<this.tableData[i].Child.length;j++){
282 282
           if(inspect_date == this.tableData[i].Child[j].inspect_date && item_name == this.tableData[i].Child[j].item_name){
283
-            inspect_value = this.tableData[i].Child[j].inspect_value
283
+            inspect_value = this.tableData[i].Child[j].inspect_value.replace(/&lt;/g, "<").replace(/&gt;/g, ">")
284 284
           }
285 285
         }
286 286
       }
@@ -314,11 +314,10 @@ export default {
314 314
       this.$router.push(
315 315
         {path:'/patientdetail?' +
316 316
           'patientid=' +
317
-          this.patientid +
318
-          '&active=' +
319
-          4 +
320
-          '&restatus=' +
321
-          1,query:{id:this.blood_id,date:this.route_date,name:this.patient_name,}})
317
+          this.patientid + '&seacherActive=' + 1 + 
318
+          '&active=' + 4 + '&restatus=' +1,
319
+          query:{id:this.blood_id,date:this.route_date,name:this.patient_name,}
320
+        })
322 321
     },
323 322
     down (event) {
324 323
       this.flags = true

+ 9 - 1
src/pages/doctorAdvice/index.vue Voir le fichier

@@ -61,6 +61,7 @@
61 61
         <device-management :active="active"></device-management>
62 62
       </van-tab>
63 63
     </van-tabs>
64
+    <!-- 患者弹窗 -->
64 65
     <van-popup v-model="show" position="top" :style="{ height: '100%' }">
65 66
       <div
66 67
         style="padding:10px;font-size:1.25rem;text-align:right"
@@ -380,6 +381,7 @@ export default {
380 381
         }
381 382
       })
382 383
     },
384
+    // 全部病人
383 385
     getBloodDialysisPatientTwo () {
384 386
       getBloodDialysisPatientTwo(this.page, this.limit).then(response => {
385 387
         var patient = response.data.data.patient
@@ -474,12 +476,14 @@ export default {
474 476
         }
475 477
       })
476 478
     },
479
+    // 
477 480
     getMemberPatient () {
478 481
       getMemberPatient().then(response => {
479 482
         if (response.data.state === 1) {
480 483
           var patient = response.data.data.patient
481 484
           this.patient = patient
482 485
           let cityNameList = []
486
+          console.log('response.data.data12112康桥',response.data.data);
483 487
           for (let p in patient) {
484 488
             cityNameList.push(patient[p].name)
485 489
           }
@@ -505,6 +509,7 @@ export default {
505 509
         }
506 510
       })
507 511
     },
512
+    // 弹窗搜索
508 513
     onSearch (val) {
509 514
       ToSearch(val).then(response => {
510 515
         if (response.data.state === 1) {
@@ -536,6 +541,7 @@ export default {
536 541
       })
537 542
     },
538 543
     onCancel () {},
544
+    // 弹窗选中患者
539 545
     chooseCity (val) {
540 546
       this.value = val
541 547
       console.log('val',val);
@@ -544,7 +550,7 @@ export default {
544 550
           var id = this.patient[i].id
545 551
           this.show = false
546 552
           this.$router.push(
547
-            '/patientdetail?patientid=' + id + '&seacherActive=' + this.active
553
+            '/patientdetail?patientid=' + id + '&seacherActive=' + 1 + '&active='+this.active
548 554
           )
549 555
           this.patientName = this.value
550 556
           this.reload()
@@ -581,6 +587,8 @@ export default {
581 587
     this.patient_id = patientid
582 588
     this.getPatientDetail(patientid)
583 589
     var seacherActive = this.$route.query.seacherActive
590
+    console.log('seacherActive',seacherActive);
591
+    
584 592
     if (seacherActive == 0) {
585 593
       this.getBloodDialysisPatientTwo()
586 594
     }

+ 2 - 2
src/pages/main/template/DialysisPrintOrderSix.vue Voir le fichier

@@ -785,7 +785,7 @@
785 785
                         置换液速度<br />(ml/h)
786 786
                         </td>
787 787
                       <td width="50" v-if="org_id == 10449 || org_id == 3877">累计超滤量<br/>(ml)</td>
788
-                      <td v-if="(org_id!=10683 && (prescription.mode_id==2 || prescription.mode_id==5 || prescription.mode_id== 12))" width="50">置换量<br/>
788
+                      <td v-if="(org_id!=10683 && org_id!=10402 && (prescription.mode_id==2 || prescription.mode_id==5 || prescription.mode_id== 12))" width="50">置换量<br/>
789 789
                         <span v-if="org_id !=10644"> (ml)</span>
790 790
                         <span v-if="org_id ==10644"> (L)</span>
791 791
                       </td>
@@ -843,7 +843,7 @@
843 843
                         {{ monitor.replacement_speed?monitor.replacement_speed:"" }}
844 844
                         <br />
845 845
                         </td>
846
-                      <td v-if="(org_id!=10683 && (prescription.mode_id==2 || prescription.mode_id==5 || prescription.mode_id== 12))"  width="50" >{{ monitor.displacement_quantity ? monitor.displacement_quantity : "0" }}</td>
846
+                      <td v-if="(org_id!=10683 && org_id!=10402 &&(prescription.mode_id==2 || prescription.mode_id==5 || prescription.mode_id== 12))"  width="50" >{{ monitor.displacement_quantity ? monitor.displacement_quantity : "0" }}</td>
847 847
 
848 848
                       <td width="50" v-if="org_id == 3877 || org_id == 10449">{{monitor.filter_pressure }}</td>
849 849
                       <td width="50" v-if="org_id == 9919 || org_id == 9538|| org_id == 9675 || org_id ==10629 || org_id ==10517  || org_id == 10567 || org_id ==10724">

+ 113 - 86
src/pages/main/template/DialysisPrintOrderThirtyOne.vue Voir le fichier

@@ -126,7 +126,26 @@
126 126
             <div class="inline_block" style="margin-right:30px;">
127 127
               血液净化器类型
128 128
               <div class="inline_block under_line" style="width:150px;text-align: center;">
129
-                  {{ prescription.dialyzer_perfusion_apparatus ? prescription.dialyzer_perfusion_apparatus : ''}}
129
+                <span v-if="prescription.dialyzer_perfusion_apparatus !=''">
130
+                  {{
131
+                    prescription.dialyzer_perfusion_apparatus
132
+                      ? prescription.dialyzer_perfusion_apparatus
133
+                      : ""
134
+                  }}
135
+                </span>
136
+                <span v-if="prescription.dialysis_dialyszers !=''">
137
+                  {{
138
+                    prescription.dialysis_dialyszers
139
+                      ? prescription.dialysis_dialyszers
140
+                      : "/"
141
+                  }}
142
+                </span>
143
+                <span v-if="prescription.dialysis_strainer !=''">
144
+                  {{
145
+                    prescription.dialysis_strainer?
146
+                    prescription.dialysis_strainer:""
147
+                  }}
148
+                </span>
130 149
               </div>
131 150
             </div>
132 151
             <div class="inline_block" style="margin-right:30px;">
@@ -679,6 +698,7 @@ import { getDialysisRecord, getPrintDialysisRecord } from '@/api/dialysis'
679 698
 import { getDataConfig } from '@/utils/data'
680 699
 import { jsGetAge, uParseTime } from '@/utils/tools'
681 700
 import LabelBox from '../printItem/LabelBox'
701
+import {Toast} from 'vant'
682 702
 // import DialysisPrintOrderOne from './template/dialysisPrintOrderOne'
683 703
 // import DialysisPrintOrderTwo from './template/dialysisPrintOrderTwo'
684 704
 import print from 'print-js'
@@ -1343,9 +1363,9 @@ export default {
1343 1363
 
1344 1364
           this.monitors = response.data.data.monitors
1345 1365
           this.summary = response.data.data.summary
1346
-          var start_nurse = response.data.data.startNuse
1347
-          this.orderForm.start_nurse = start_nurse.user_name
1348
-          this.orderForm.url = start_nurse.url
1366
+          // var start_nurse = response.data.data.startNuse
1367
+          // this.orderForm.start_nurse = start_nurse.user_name
1368
+          // this.orderForm.url = start_nurse.url
1349 1369
           this.org_template_info = response.data.data.org_template_info
1350 1370
           // 配置超滤量和置换量是否要显示0还是空
1351 1371
           if (this.org_template_info.org_id == 9535) {
@@ -1362,84 +1382,87 @@ export default {
1362 1382
           this.advices = response.data.data.advices
1363 1383
 
1364 1384
           var doctorAdevieInfo = response.data.data.advices
1365
-          var tableAdvice = doctorAdevieInfo
1366
-          if (tableAdvice.length === 0) {
1367
-            var obj = { advice_name: '', start_time: '' }
1368
-            var obj1 = { advice_name: '', start_time: '' }
1369
-            var obj2 = { advice_name: '', start_time: '' }
1370
-            var obj3 = { advice_name: '', start_time: '' }
1371
-            var obj4 = { advice_name: '', start_time: '' }
1372
-            var obj5 = { advice_name: '', start_time: '' }
1373
-            tableAdvice.push(obj)
1374
-            tableAdvice.push(obj1)
1375
-            tableAdvice.push(obj2)
1376
-            tableAdvice.push(obj3)
1377
-            tableAdvice.push(obj4)
1378
-            tableAdvice.push(obj5)
1379
-            this.tableAdvice = tableAdvice
1380
-          }
1381
-          if (tableAdvice.length === 1) {
1382
-            var obj = { advice_name: '', start_time: '' }
1383
-            var obj1 = { advice_name: '', start_time: '' }
1384
-            var obj2 = { advice_name: '', start_time: '' }
1385
-            var obj3 = { advice_name: '', start_time: '' }
1386
-            var obj4 = { advice_name: '', start_time: '' }
1387
-            tableAdvice.push(obj)
1388
-            tableAdvice.push(obj1)
1389
-            tableAdvice.push(obj2)
1390
-            tableAdvice.push(obj3)
1391
-            tableAdvice.push(obj4)
1392
-            this.tableAdvice = tableAdvice
1393
-          }
1394
-          if (tableAdvice.length === 2) {
1395
-            var obj = { advice_name: '', start_time: '' }
1396
-            var obj1 = { advice_name: '', start_time: '' }
1397
-            var obj2 = { advice_name: '', start_time: '' }
1398
-            var obj3 = { advice_name: '', start_time: '' }
1399
-            tableAdvice.push(obj)
1400
-            tableAdvice.push(obj1)
1401
-            tableAdvice.push(obj2)
1402
-            tableAdvice.push(obj3)
1403
-            this.tableAdvice = tableAdvice
1404
-          }
1405
-          if (tableAdvice.length === 3) {
1406
-            // eslint-disable-next-line no-redeclare
1407
-            var obj = { advice_name: '', start_time: '' }
1408
-            // eslint-disable-next-line no-redeclare
1409
-            var obj1 = { advice_name: '', start_time: '' }
1410
-            // eslint-disable-next-line no-redeclare
1411
-            var obj2 = { advice_name: '', start_time: '' }
1412
-            // eslint-disable-next-line no-redeclare
1413
-            tableAdvice.push(obj)
1414
-            tableAdvice.push(obj1)
1415
-            tableAdvice.push(obj2)
1416
-
1417
-            this.tableAdvice = tableAdvice
1418
-          }
1419
-          if (tableAdvice.length === 4) {
1420
-            // eslint-disable-next-line no-redeclare
1421
-            var obj = { advice_name: '', start_time: '' }
1422
-            // eslint-disable-next-line no-redeclare
1423
-            var obj1 = { advice_name: '', start_time: '' }
1424
-            // eslint-disable-next-line no-redeclare
1425
-
1426
-            tableAdvice.push(obj)
1427
-            tableAdvice.push(obj1)
1428
-            this.tableAdvice = tableAdvice
1429
-          }
1430
-          if (tableAdvice.length === 5) {
1431
-            // eslint-disable-next-line no-redeclare
1432
-            var obj = { advice_name: '', start_time: '' }
1433
-            // eslint-disable-next-line no-redeclare
1434
-            var obj1 = { advice_name: '', start_time: '' }
1435
-            tableAdvice.push(obj)
1436
-            tableAdvice.push(obj1)
1437
-            this.tableAdvice = tableAdvice
1438
-          }
1439
-
1440
-          if (tableAdvice.length >= 6) {
1441
-            this.tableAdvice = tableAdvice
1442
-          }
1385
+          this.tableAdvice = doctorAdevieInfo
1386
+          console.log('医嘱',this.tableAdvice);
1387
+
1388
+          // var tableAdvice = doctorAdevieInfo
1389
+          // if (tableAdvice.length === 0) {
1390
+          //   var obj = { advice_name: '', start_time: '' }
1391
+          //   var obj1 = { advice_name: '', start_time: '' }
1392
+          //   var obj2 = { advice_name: '', start_time: '' }
1393
+          //   var obj3 = { advice_name: '', start_time: '' }
1394
+          //   var obj4 = { advice_name: '', start_time: '' }
1395
+          //   var obj5 = { advice_name: '', start_time: '' }
1396
+          //   tableAdvice.push(obj)
1397
+          //   tableAdvice.push(obj1)
1398
+          //   tableAdvice.push(obj2)
1399
+          //   tableAdvice.push(obj3)
1400
+          //   tableAdvice.push(obj4)
1401
+          //   tableAdvice.push(obj5)
1402
+          //   this.tableAdvice = tableAdvice
1403
+          // }
1404
+          // if (tableAdvice.length === 1) {
1405
+          //   var obj = { advice_name: '', start_time: '' }
1406
+          //   var obj1 = { advice_name: '', start_time: '' }
1407
+          //   var obj2 = { advice_name: '', start_time: '' }
1408
+          //   var obj3 = { advice_name: '', start_time: '' }
1409
+          //   var obj4 = { advice_name: '', start_time: '' }
1410
+          //   tableAdvice.push(obj)
1411
+          //   tableAdvice.push(obj1)
1412
+          //   tableAdvice.push(obj2)
1413
+          //   tableAdvice.push(obj3)
1414
+          //   tableAdvice.push(obj4)
1415
+          //   this.tableAdvice = tableAdvice
1416
+          // }
1417
+          // if (tableAdvice.length === 2) {
1418
+          //   var obj = { advice_name: '', start_time: '' }
1419
+          //   var obj1 = { advice_name: '', start_time: '' }
1420
+          //   var obj2 = { advice_name: '', start_time: '' }
1421
+          //   var obj3 = { advice_name: '', start_time: '' }
1422
+          //   tableAdvice.push(obj)
1423
+          //   tableAdvice.push(obj1)
1424
+          //   tableAdvice.push(obj2)
1425
+          //   tableAdvice.push(obj3)
1426
+          //   this.tableAdvice = tableAdvice
1427
+          // }
1428
+          // if (tableAdvice.length === 3) {
1429
+          //   // eslint-disable-next-line no-redeclare
1430
+          //   var obj = { advice_name: '', start_time: '' }
1431
+          //   // eslint-disable-next-line no-redeclare
1432
+          //   var obj1 = { advice_name: '', start_time: '' }
1433
+          //   // eslint-disable-next-line no-redeclare
1434
+          //   var obj2 = { advice_name: '', start_time: '' }
1435
+          //   // eslint-disable-next-line no-redeclare
1436
+          //   tableAdvice.push(obj)
1437
+          //   tableAdvice.push(obj1)
1438
+          //   tableAdvice.push(obj2)
1439
+
1440
+          //   this.tableAdvice = tableAdvice
1441
+          // }
1442
+          // if (tableAdvice.length === 4) {
1443
+          //   // eslint-disable-next-line no-redeclare
1444
+          //   var obj = { advice_name: '', start_time: '' }
1445
+          //   // eslint-disable-next-line no-redeclare
1446
+          //   var obj1 = { advice_name: '', start_time: '' }
1447
+          //   // eslint-disable-next-line no-redeclare
1448
+
1449
+          //   tableAdvice.push(obj)
1450
+          //   tableAdvice.push(obj1)
1451
+          //   this.tableAdvice = tableAdvice
1452
+          // }
1453
+          // if (tableAdvice.length === 5) {
1454
+          //   // eslint-disable-next-line no-redeclare
1455
+          //   var obj = { advice_name: '', start_time: '' }
1456
+          //   // eslint-disable-next-line no-redeclare
1457
+          //   var obj1 = { advice_name: '', start_time: '' }
1458
+          //   tableAdvice.push(obj)
1459
+          //   tableAdvice.push(obj1)
1460
+          //   this.tableAdvice = tableAdvice
1461
+          // }
1462
+
1463
+          // if (tableAdvice.length >= 6) {
1464
+          //   this.tableAdvice = tableAdvice
1465
+          // }
1443 1466
           this.monitors = response.data.data.monitors
1444 1467
           this.summary = response.data.data.summary
1445 1468
           this.org_template_info = response.data.data.org_template_info
@@ -1574,10 +1597,14 @@ export default {
1574 1597
     },
1575 1598
     getcheckData(val){
1576 1599
       if(val.length >0){
1577
-        const a = val.join(',')
1578
-        console.log('a',a);
1579
-        this.$toast(a +" 未填");
1580
-        return a
1600
+        let message = `记录单未填数据:\n${val.join("\n")}`;
1601
+        Toast({
1602
+          duration:0,
1603
+          message:message,
1604
+          closeOnClick:true,
1605
+          closeOnClickOverlay:true,
1606
+        })
1607
+        return message
1581 1608
       }else{
1582 1609
         this.$toast('核对完成');
1583 1610
       }

+ 7 - 5
src/pages/main/template/DialysisPrintOrdereightyone.vue Voir le fichier

@@ -565,13 +565,15 @@
565 565
                   <div class="inline_block" style="flex: 1">
566 566
                     型号:
567 567
                     <div class="under_line" style="width: 60%; text-align: center">
568
-                      <!-- <span v-if="dialysisOrder && dialysisOrder.bed_id !=0">
569
-                        {{ getnumberlist(dialysisOrder.bed_id) }} 
568
+                      <span v-if="dialysisOrder && dialysisOrder.bed_id !=0">
569
+                        {{ getnumberlist(dialysisOrder.bed_id) ? getnumberlist(dialysisOrder.bed_id) : '东丽'}} 
570 570
                       </span>
571 571
                       <span v-else>
572
-                        {{ getnumberlist(patientInfo.DialysisSchedule.bed_id) }} 
573
-                      </span> -->
574
-                      {{predialysis.machine_type ? predialysis.machine_type : ""}}
572
+                        {{ getnumberlist(patientInfo.DialysisSchedule.bed_id) ?                    
573
+                          getnumberlist(patientInfo.DialysisSchedule.bed_id) : '东丽'
574
+                        }} 
575
+                      </span>
576
+                      <!-- {{predialysis.machine_type ? predialysis.machine_type : ""}} -->
575 577
                     </div>
576 578
                   </div>   
577 579
                 </div>