浏览代码

hah阿凡达

28169 2 周前
父节点
当前提交
e380ebe1d6

+ 2 - 1
src/xt_pages/dialysis/template/DialysisPrintOrderFortySeven.vue 查看文件

@@ -3420,9 +3420,10 @@ export default {
3420 3420
       var end_time =   moment().endOf('month').format("YYYY-MM-DD")
3421 3421
        var params = {
3422 3422
         start_time:start_time,
3423
-        end_time:end_time,
3423
+        end_time:this.$route.query && this.$route.query.xtdate,
3424 3424
         patient_id:this.$route.query && this.$route.query.patient_id,
3425 3425
        }
3426
+       console.log("param================",params)
3426 3427
       getDialysisTotalCount(params).then(response=>{
3427 3428
         if(response.data.state == 1){
3428 3429
           var order =  response.data.data.order

+ 216 - 115
src/xt_pages/user/courseOfDisease_new.vue 查看文件

@@ -424,6 +424,8 @@
424 424
                  @current-change="summaryChange"
425 425
                  @selection-change="selectionchange2"
426 426
                 style="width: 100%">
427
+                <el-table-column type="selection"width="55">
428
+                </el-table-column>
427 429
                 <el-table-column prop="date" label="透析日期"  width="" align="center">
428 430
                   <template slot-scope="scope" a>
429 431
                       {{ getTime(scope.row.schedule_date) }}
@@ -447,7 +449,6 @@
447 449
         <span slot="footer" class="dialog-footer" style="text-align: center;">
448 450
           <!-- <el-button type="danger" @click="template_dele">删除模板</el-button>
449 451
           <el-button type="primary" @click="template_save">保存模板</el-button> -->
450
-          <el-button type="primary" @click="toContentPint(3)">应用</el-button>
451 452
           <el-button type="primary" @click="toSummaryPint">应用</el-button>
452 453
           <el-button @click="summary_dialog = false">取消</el-button>
453 454
         </span>
@@ -558,14 +559,14 @@
558 559
               <div class="Second_title">方案详情</div>
559 560
               <div style="">
560 561
                 <keep-alive>
561
-                  <ueditor ref="editor" id="editors" :content="option_context"></ueditor>
562
+                  <ueditor ref="editorOne" id="editors" :content="option_context"></ueditor>
562 563
                 </keep-alive>
563 564
               </div>
564 565
             </div>
565 566
           </div>
566 567
         </div>
567 568
         <span slot="footer" class="dialog-footer" style="text-align: center;">
568
-          <el-button type="primary" @click="toContentPint">应用</el-button>
569
+          <el-button type="primary" @click="toSystemContentPint">应用</el-button>
569 570
           <el-button @click="option_dialog = false">取消</el-button>
570 571
         </span>
571 572
       </el-dialog>
@@ -607,46 +608,46 @@
607 608
               :data="adviceList"
608 609
               :highlight-current-row="true"
609 610
                 ref="weight_table"
610
-                @selection-change="selectionchange5"
611
+              @selection-change="selectionchange5"
611 612
               style="width: 100%">
612 613
               <el-table-column type="selection"width="55">
613 614
               </el-table-column>
614
-              <el-table-column prop="date" label="开始时间"  width="">
615
+              <el-table-column prop="date" label="开始时间"  width="" align="center">
615 616
                 <template slot-scope="scope">
616 617
                     {{ getTimeThree(scope.row.start_time) }}
617 618
                  </template>
618 619
               </el-table-column>
619
-              <el-table-column prop="name" label="医嘱名称"  width="">
620
+              <el-table-column prop="name" label="医嘱名称"  width="" align="center">
620 621
                 <template slot-scope="scope">
621
-                    {{ getTimeThree(scope.row.advice_name) }}
622
+                    {{scope.row.advice_name }}
622 623
                  </template>
623 624
               </el-table-column>
624
-              <el-table-column prop="guige" label="规格"  width="">
625
+              <el-table-column prop="guige" label="规格"  width="" align="center">
625 626
                 <template slot-scope="scope">
626
-                    {{ getTimeThree(scope.row.advice_desc) }}
627
+                    {{scope.row.advice_desc}}
627 628
                  </template>
628 629
               </el-table-column>
629
-              <el-table-column prop="danci" label="单次用量"  width="">
630
+              <el-table-column prop="danci" label="单次用量"  width="" align="center">
630 631
                 <template slot-scope="scope">
631 632
                   <span v-if="scope.row.single_dose>0">{{ scope.row.single_dose }}</span>
632 633
                  </template>
633 634
               </el-table-column>
634
-              <el-table-column prop="geiyao" label="给药途径"  width="">
635
+              <el-table-column prop="geiyao" label="给药途径"  width="" align="center">
635 636
                 <template slot-scope="scope">
636 637
                     {{scope.row.delivery_way}}
637 638
                  </template>
638 639
               </el-table-column>
639
-              <el-table-column prop="pinlv" label="执行频率"  width="">
640
+              <el-table-column prop="pinlv" label="执行频率"  width="" align="center">
640 641
                 <template slot-scope="scope">
641 642
                     {{scope.row.execution_frequency }}
642 643
                  </template>
643 644
               </el-table-column>
644
-              <el-table-column prop="beizhu" label="备注"  width="">
645
+              <el-table-column prop="beizhu" label="备注"  width="" align="center">
645 646
                 <template slot-scope="scope">
646 647
                     {{scope.row.remark}}
647 648
                  </template>
648 649
               </el-table-column>
649
-              <el-table-column prop="tingzhi" label="停止时间/执行时间"  width="">
650
+              <el-table-column prop="tingzhi" label="停止时间/执行时间"  width="" align="center">
650 651
                 <template slot-scope="scope">
651 652
                   <span v-if="scope.row.advice_type == 1">
652 653
                     {{ getTimeThree(scope.row.stop_time) }}
@@ -657,7 +658,7 @@
657 658
 
658 659
                  </template>
659 660
               </el-table-column>
660
-              <el-table-column prop="yuanyin" label="停止原因"  width="">
661
+              <el-table-column prop="yuanyin" label="停止原因"  width="" align="center">
661 662
                 <template slot-scope="scope">
662 663
                    <span v-if="scope.row.advice_type == 1">
663 664
                     {{scope.row.remark }}
@@ -665,7 +666,7 @@
665 666
 
666 667
                  </template>
667 668
               </el-table-column>
668
-              <el-table-column prop="yisheng" label="停止医生"  width="">
669
+              <el-table-column prop="yisheng" label="停止医生"  width="" align="center">
669 670
                 <template slot-scope="scope">
670 671
                   <span v-if="scope.row.advice_type == 1">
671 672
                     {{ getDocName(scope.row.advice_doctor) }}
@@ -676,10 +677,8 @@
676 677
             </el-table>
677 678
           </div>
678 679
         </div>
679
-        <span slot="footer" class="dialog-footer" style="text-align: center;">
680
-          <!-- <el-button type="danger" @click="template_dele">删除模板</el-button>
681
-          <el-button type="primary" @click="template_save">保存模板</el-button> -->
682
-          <el-button type="primary" @click="toContentPint">应用</el-button>
680
+        <span slot="footer" class="dialog-footer" style="text-align: center;" align="center">
681
+          <el-button type="primary" @click="toAdviceContentPint">应用</el-button>
683 682
           <el-button @click="advice_dialog = false">取消</el-button>
684 683
         </span>
685 684
       </el-dialog>
@@ -972,7 +971,11 @@
972 971
         newInspectionList:[],
973 972
         newInspectionListOne:[],
974 973
         inspect_context:"",
975
-        inspectionList:[]
974
+        inspectionList:[],
975
+        newIds:[],
976
+        adviceNewList:[],
977
+        all_select:0,
978
+        systemPrescritpionList:[]
976 979
       }
977 980
     },
978 981
     created() {
@@ -1270,15 +1273,14 @@
1270 1273
 
1271 1274
         }
1272 1275
       },
1273
-      toContentPint(val){
1274
-
1275
-
1276
+      toAdviceContentPint(val){
1277
+       
1276 1278
         console.log('blood_context',this.blood_context,this.template_content);
1277
-        this.template_content = this.template_content +'<br/>'+ this.blood_context+'<br/>'+this.summary_context +'<br/>' +this.advice_context
1279
+        this.template_content = this.template_content +'<br/>'+ this.blood_context+'<br/>'+this.summary_context +'<br/>' +this.advice_context+'<br/>'+this.option_context
1278 1280
         this.$refs.editor.contents = this.template_content
1279 1281
         const iframe = document.getElementsByClassName('edui-editor-iframeholder')[0].getElementsByTagName('iframe')[0].contentDocument.getElementsByTagName('body')[0]
1280 1282
         console.log('document.getElementsByClassName',);
1281
-        if(val == 6){
1283
+       
1282 1284
             this.$nextTick(()=>{
1283 1285
                 const new_list=document.createElement('table')
1284 1286
                 new_list.style.cssText='border:1px solid black;border-collapse:collapse;width:100%';
@@ -1314,49 +1316,97 @@
1314 1316
                 newListItem1.appendChild(new_td9);
1315 1317
                 newListItem1.appendChild(new_td10);
1316 1318
                 new_list.appendChild(newListItem1)
1317
-              for(let i in this.adviceRows){
1318
-                let newListItem2 = document.createElement('tr');
1319
-                let new_td1 = document.createElement('td');
1320
-                let new_td2 = document.createElement('td');
1321
-                let new_td3 = document.createElement('td');
1322
-                let new_td4 = document.createElement('td');
1323
-                let new_td5 = document.createElement('td');
1324
-                let new_td6 = document.createElement('td');
1325
-                let new_td7 = document.createElement('td');
1326
-                let new_td8 = document.createElement('td');
1327
-                let new_td9 = document.createElement('td');
1328
-                let new_td10 = document.createElement('td');
1329
-                new_td1.textContent =this.adviceRows[i].date
1330
-                new_td2.textContent =this.adviceRows[i].name
1331
-                new_td3.textContent =this.adviceRows[i].guige
1332
-                new_td4.textContent =this.adviceRows[i].danci
1333
-                new_td5.textContent =this.adviceRows[i].geiyao
1334
-                new_td6.textContent =this.adviceRows[i].pinlv
1335
-                new_td7.textContent =this.adviceRows[i].beizhu
1336
-                new_td8.textContent =this.adviceRows[i].tingzhi
1337
-                new_td9.textContent =this.adviceRows[i].yuanyin
1338
-                new_td10.textContent =this.adviceRows[i].yisheng
1339
-                newListItem2.appendChild(new_td1);
1340
-                newListItem2.appendChild(new_td2);
1341
-                newListItem2.appendChild(new_td3);
1342
-                newListItem2.appendChild(new_td4);
1343
-                newListItem2.appendChild(new_td5);
1344
-                newListItem2.appendChild(new_td6);
1345
-                newListItem2.appendChild(new_td7);
1346
-                newListItem2.appendChild(new_td8);
1347
-                newListItem2.appendChild(new_td9);
1348
-                newListItem2.appendChild(new_td10);
1349
-                new_list.appendChild(newListItem2)
1350
-              }
1319
+
1320
+               if(this.adviceList!=null && this.adviceList.length>0 && this.all_select == 0){
1321
+                for(let i in this.adviceList){
1322
+                    let newListItem2 = document.createElement('tr');
1323
+                    let new_td1 = document.createElement('td');
1324
+                    let new_td2 = document.createElement('td');
1325
+                    let new_td3 = document.createElement('td');
1326
+                    let new_td4 = document.createElement('td');
1327
+                    let new_td5 = document.createElement('td');
1328
+                    let new_td6 = document.createElement('td');
1329
+                    let new_td7 = document.createElement('td');
1330
+                    let new_td8 = document.createElement('td');
1331
+                    let new_td9 = document.createElement('td');
1332
+                    let new_td10 = document.createElement('td');
1333
+                    new_td1.textContent =this.getTimeThree(this.adviceList[i].start_time) 
1334
+                    new_td2.textContent =this.adviceList[i].advice_name
1335
+                    new_td3.textContent =this.adviceList[i].advice_desc
1336
+                    new_td4.textContent =this.adviceList[i].single_dose
1337
+                    new_td5.textContent =this.adviceList[i].delivery_way
1338
+                    new_td6.textContent =this.adviceList[i].execution_frequency
1339
+                    new_td7.textContent =this.adviceList[i].remark
1340
+                    if(this.adviceList[i].advice_type == 1){
1341
+                      new_td8.textContent =this.getTimeThree(this.adviceList[i].stop_time) 
1342
+                    }else{
1343
+                      new_td8.textContent =this.getTimeThree(this.adviceList[i].execution_time) 
1344
+                    }
1345
+                    new_td9.textContent =this.adviceList[i].stop_reason
1346
+                    new_td10.textContent =this.getDocName(this.adviceList[i].advice_doctor) 
1347
+                    newListItem2.appendChild(new_td1);
1348
+                    newListItem2.appendChild(new_td2);
1349
+                    newListItem2.appendChild(new_td3);
1350
+                    newListItem2.appendChild(new_td4);
1351
+                    newListItem2.appendChild(new_td5);
1352
+                    newListItem2.appendChild(new_td6);
1353
+                    newListItem2.appendChild(new_td7);
1354
+                    newListItem2.appendChild(new_td8);
1355
+                    newListItem2.appendChild(new_td9);
1356
+                    newListItem2.appendChild(new_td10);
1357
+                    new_list.appendChild(newListItem2)
1358
+                 }
1359
+               } 
1360
+
1361
+               if(this.adviceNewList!=null && this.adviceNewList.length>0 && this.all_select == 1){
1362
+                for(let i in this.adviceNewList){
1363
+                    let newListItem2 = document.createElement('tr');
1364
+                    let new_td1 = document.createElement('td');
1365
+                    let new_td2 = document.createElement('td');
1366
+                    let new_td3 = document.createElement('td');
1367
+                    let new_td4 = document.createElement('td');
1368
+                    let new_td5 = document.createElement('td');
1369
+                    let new_td6 = document.createElement('td');
1370
+                    let new_td7 = document.createElement('td');
1371
+                    let new_td8 = document.createElement('td');
1372
+                    let new_td9 = document.createElement('td');
1373
+                    let new_td10 = document.createElement('td');
1374
+                    new_td1.textContent =this.getTimeThree(this.adviceNewList[i].start_time) 
1375
+                    new_td2.textContent =this.adviceNewList[i].advice_name
1376
+                    new_td3.textContent =this.adviceNewList[i].advice_desc
1377
+                    new_td4.textContent =this.adviceNewList[i].single_dose
1378
+                    new_td5.textContent =this.adviceNewList[i].delivery_way
1379
+                    new_td6.textContent =this.adviceNewList[i].execution_frequency
1380
+                    new_td7.textContent =this.adviceNewList[i].remark
1381
+                    if(this.adviceNewList[i].advice_type == 1){
1382
+                      new_td8.textContent =this.getTimeThree(this.adviceNewList[i].stop_time) 
1383
+                    }else{
1384
+                      new_td8.textContent =this.getTimeThree(this.adviceNewList[i].execution_time) 
1385
+                    }
1386
+                    new_td9.textContent =this.adviceNewList[i].stop_reason
1387
+                    new_td10.textContent =this.getDocName(this.adviceNewList[i].advice_doctor) 
1388
+                    newListItem2.appendChild(new_td1);
1389
+                    newListItem2.appendChild(new_td2);
1390
+                    newListItem2.appendChild(new_td3);
1391
+                    newListItem2.appendChild(new_td4);
1392
+                    newListItem2.appendChild(new_td5);
1393
+                    newListItem2.appendChild(new_td6);
1394
+                    newListItem2.appendChild(new_td7);
1395
+                    newListItem2.appendChild(new_td8);
1396
+                    newListItem2.appendChild(new_td9);
1397
+                    newListItem2.appendChild(new_td10);
1398
+                    new_list.appendChild(newListItem2)
1399
+                 }
1400
+               }
1401
+            
1351 1402
               const cont = iframe.getElementsByClassName('advice_table')[0]
1352 1403
               cont.appendChild(new_list)
1353
-              // iframe.appendChild(new_list)
1354 1404
               console.log('iframe.appendChild(new_list)',cont);
1355 1405
               console.log('this.advice_context',this.advice_context);
1356 1406
             })
1357 1407
 
1358
-        }
1359
-        this.library_dialog = false
1408
+        
1409
+        this.advice_dialog = false
1360 1410
       },
1361 1411
       getCurrentChangeOne(val){
1362 1412
         console.log("val================",val)
@@ -3385,9 +3435,21 @@
3385 3435
         console.log('血压',this.bloodRows);
3386 3436
       },
3387 3437
       selectionchange2(val){
3438
+       
3388 3439
         this.summaryRows = val
3389
-        this.getsummary(val)
3390
-        console.log('透析小结',this.summaryRows);
3440
+        this.summary_context=""
3441
+        if(val!=null){
3442
+          // if(val.summary!=null && val.summary!=undefined){
3443
+          //   this.summary_context = val.summary.dialysis_summary
3444
+          // }
3445
+          for(let i=0;i<val.length;i++){
3446
+            this.summary_context += val[i].summary.dialysis_summary+"</br>"
3447
+          }
3448
+         this.summary_context = this.summary_context
3449
+
3450
+        }
3451
+        // this.getsummary(val)
3452
+        // console.log('透析小结',this.summaryRows);
3391 3453
       },
3392 3454
       selectionchange3(val){
3393 3455
         this.weightRows = val
@@ -3395,12 +3457,15 @@
3395 3457
         console.log('透析小结',this.weightRows);
3396 3458
       },
3397 3459
       selectionchange4(val){
3460
+        
3398 3461
         this.optionRows = val
3399 3462
         this.getoption(val)
3400 3463
         console.log('透析小结',this.weightRows);
3401 3464
       },
3402 3465
       selectionchange5(val){
3466
+       
3403 3467
         this.adviceRows = val
3468
+        this.getNewPatientAdviceList(val)
3404 3469
       },
3405 3470
       gettext(val){
3406 3471
         const arr= []
@@ -3437,44 +3502,54 @@
3437 3502
         this.weight_context = `${arr.join('<br/>')}`
3438 3503
       },
3439 3504
       getoption(val){
3505
+       
3506
+        var newArr = []
3507
+        for(let i=0;i<this.systemPrescritpionList.length;i++){
3508
+          for(let j=0;j<val.length;j++){
3509
+            if(val[j].mode == this.systemPrescritpionList[i].mode_name){
3510
+              newArr.push(this.systemPrescritpionList[i])
3511
+            }
3512
+          }
3513
+         
3514
+        }
3440 3515
         const arr= []
3441
-        if(val.length>0){
3442
-          for(let i in val){
3516
+       
3517
+        if(newArr.length>0){
3518
+          for(let i=0;i<newArr.length;i++){
3443 3519
             const text = `<table border="1" style="border-collapse: collapse;width: 100%;">
3444
-      <tr><td colspan="4">HD,每周3次,启用</td></tr>
3520
+      <tr><td colspan="4">${newArr[i].mode_name},启用</td></tr>
3445 3521
       <tr>
3446
-        <td>透析时长(h):4</td>
3447
-        <td>置换方式:</td>
3448
-        <td>血流量(ml/min):250</td>
3522
+        <td>透析时长:${newArr[i].dialysis_duration_hour}时${newArr[i].dialysis_duration_minute}分</td>
3523
+        <td>置换方式:${newArr[i].displace_name}</td>
3524
+        <td>血流量(ml/min):${newArr[i].blood_flow_volume}</td>
3449 3525
         <td></td>
3450 3526
       </tr>
3451 3527
       <tr>
3452
-        <td>血透器:空心纤维血液透析器B-18BHF(B-18BHF)</td>
3453
-        <td>血滤器:</td>
3454
-        <td>灌流器:</td>
3455
-        <td>透析液流量(ml/min):500</td>
3528
+        <td>透析器:${newArr[i].dialysis_dialyszers}</td>
3529
+        <td>灌流器:${newArr[i].dialysis_irrigation}</td>
3530
+        <td>透析液流量(ml/min):${newArr[i].dialysate_flow}</td>
3456 3531
       </tr>
3457 3532
       <tr>
3458
-        <td>钾(mmol/L):2.0</td>
3459
-        <td>钠(mmol/L):138</td>
3460
-        <td>钙(mmol/L):1.5</td>
3461
-        <td>碳酸氢根(mmol/L):32</td>
3533
+        <td>钾(mmol/L):${newArr[i].kalium}</td>
3534
+        <td>钠(mmol/L):${newArr[i].sodium}</td>
3535
+        <td>钙(mmol/L):${newArr[i].calcium}</td>
3536
+        <td>碳酸氢根(mmol/L):${newArr[i].bicarbonates}</td>
3462 3537
       </tr>
3463 3538
       <tr>
3464
-        <td>抗凝剂:低分子肝素</td>
3465
-        <td>首剂(iu):4500</td>
3466
-        <td>维持(iu): 0</td>
3467
-        <td>总量(iu):4500</td>
3539
+        <td>抗凝剂:${newArr[i].anticoagulant_name}</td>
3540
+        <td>首剂(iu):${newArr[i].anticoagulant_shouji}</td>
3541
+        <td>维持(iu):${newArr[i].anticoagulant_weichi}</td>
3542
+        <td>总量(iu):${newArr[i].anticoagulant_zongliang}</td>
3468 3543
       </tr>
3469
-      <tr><td colspan="4">抗凝剂公式:自定义维持时长(H)</td></tr>
3544
+      <tr><td colspan="4"></td></tr>
3470 3545
             </table>`
3471 3546
             arr.push(text)
3472 3547
           }
3473 3548
         }
3474 3549
         const contenttext = `${arr.join('<br/>')}`
3475 3550
         this.option_context = contenttext
3476
-        console.log('option_context',this.option_context);
3477
-        this.$refs.editor.contents = this.option_context
3551
+        // console.log('option_context',this.option_context);
3552
+        this.$refs.editorOne.contents = this.option_context
3478 3553
       },
3479 3554
       // 血压搜索
3480 3555
       bloodsearch(val){
@@ -3506,7 +3581,7 @@
3506 3581
         })
3507 3582
       },
3508 3583
       option_click(val){
3509
-        console.log("valoo00000000000",val)
3584
+   
3510 3585
         this.option_dialog =true
3511 3586
         // this.start_date1 = this.timeForMat(7)
3512 3587
         // this.end_date1 = this.getTime(new Date())
@@ -3548,7 +3623,7 @@
3548 3623
 
3549 3624
       },
3550 3625
       childclick(i){
3551
-        console.log('i333333333333333333333333333333',i);
3626
+      
3552 3627
           var params = {
3553 3628
             patient_id:i.patient_id,
3554 3629
             project_id:i.project_id,
@@ -3602,7 +3677,7 @@
3602 3677
         }
3603 3678
       },
3604 3679
       check_change(){
3605
-        console.log('this',this.checked);
3680
+
3606 3681
         const arr = []
3607 3682
         if(this.checked==true){
3608 3683
           for(let i in this.Inspectlist){
@@ -3628,7 +3703,7 @@
3628 3703
           this.InspectRows = []
3629 3704
         }
3630 3705
         this.getinspect(this.InspectRows)
3631
-        console.log('this',this.InspectRows);
3706
+        // console.log('this',this.InspectRows);
3632 3707
       },
3633 3708
     //血压
3634 3709
     getMonitorSearchList(){
@@ -3681,15 +3756,42 @@
3681 3756
           patient_id:this.patient_id,
3682 3757
         }
3683 3758
         getDilaysisSystemList(params).then(response=>{
3759
+           if(response.data.state == 1){
3760
+              this.systemPrescritpionList = []
3761
+              var systemPrescritpionList =  response.data.data.prescription
3762
+              
3763
+              if(systemPrescritpionList!=null && systemPrescritpionList.length>0){
3764
+                 for(let i=0;i<systemPrescritpionList.length;i++){
3765
+                   systemPrescritpionList[i].mode_name = ""
3766
+                   systemPrescritpionList[i].mode_name = this.getModeId(systemPrescritpionList[i].mode_id)
3767
+                   systemPrescritpionList[i].displace_name = this.getDisplaceLiqu(systemPrescritpionList[i].displace_liqui)
3768
+                   systemPrescritpionList[i].anticoagulant_name = this.getAnticoagulantName(systemPrescritpionList[i].anticoagulant)
3769
+                 }
3770
+              }
3771
+              this.systemPrescritpionList = systemPrescritpionList
3684 3772
 
3773
+           }
3685 3774
         })
3686 3775
       },
3776
+      getDisplaceLiqu(id){
3777
+        var  displace_liqui_List = this.$store.getters.displace_liqui
3778
+
3779
+        var name = ""
3780
+        for(let i=0;i<displace_liqui_List.length;i++){
3781
+          if(id == displace_liqui_List[i].id){
3782
+            name = displace_liqui_List[i].name
3783
+          }
3784
+        }
3785
+        return name
3786
+      },
3687 3787
       getPatientAdviceList(){
3788
+        var ids = this.newIds.join()  
3688 3789
         var params = {
3689 3790
           start_time:this.start_date1,
3690 3791
           end_time:this.end_date1,
3691 3792
           patient_id:this.patient_id,
3692 3793
           advice_type:this.advice_type,
3794
+          advice_status:this.advice_status,
3693 3795
         }
3694 3796
         getPatientAdviceList(params).then(response=>{
3695 3797
           if(response.data.state == 1){
@@ -3699,6 +3801,23 @@
3699 3801
           }
3700 3802
         })
3701 3803
       },
3804
+      getNewPatientAdviceList(val){
3805
+        
3806
+         var newArr= []
3807
+         for(let i=0;i<val.length;i++){
3808
+           for(let j=0;j<this.adviceList.length;j++){
3809
+             if(val[i].id == this.adviceList[j].id){
3810
+                newArr.push(this.adviceList[j])
3811
+             }
3812
+           }
3813
+         }
3814
+         
3815
+         
3816
+         this.adviceNewList = []
3817
+         this.adviceNewList = newArr
3818
+         this.all_select = 1
3819
+
3820
+      },
3702 3821
       handleMonitorChange(val){
3703 3822
 
3704 3823
          var str = ""
@@ -3743,28 +3862,7 @@
3743 3862
                   }
3744 3863
                 }
3745 3864
              }
3746
-
3747
-            //  if(newGroupList.length!=null && newGroupList.length>0){
3748
-            //     for(let i=0;i<newGroupList.length;i++){
3749
-            //       newGroupList[i].child = []
3750
-            //       for(let j=0;j<inspection.length;j++){
3751
-            //         if(newGroupList[i].project_id == inspection[j].project_id && newGroupList[i].inspect_date == inspection[j].inspect_date){
3752
-            //           newGroupList[i].child.push(inspection[j])
3753
-            //         }
3754
-            //       }
3755
-            //     }
3756
-            //  }
3757
-
3758
-            //  this.newInspectionListOne = []
3759
-            //  this.newInspectionListOne = newGroupList
3760
-
3761
-            //  console.log("hhhhhhhhhhhhhhhhhhhh",this.newInspectionListOne)
3762
-
3763
-            
3764
-
3765
-
3766
-             
3767
-
3865
+        
3768 3866
              for(let i=0;i<groupList.length;i++){
3769 3867
                for(let j=0;j<groupList[i].child.length;j++){
3770 3868
                   groupList[i].child =this.getInspection(groupList[i].child) 
@@ -3789,9 +3887,7 @@
3789 3887
           return tempArr;
3790 3888
       },
3791 3889
       changeInspetion(){
3792
-        console.log("newInsption-----------",this.newInspectionList)
3793
-        console.log("inspectionList",this.inspectionList)
3794
-
3890
+      
3795 3891
         for(let i=0;i<this.newInspectionList.length;i++){
3796 3892
            this.newInspectionList[i].childOne =[]
3797 3893
           for(let j=0;j<this.inspectionList.length;j++){
@@ -3817,6 +3913,11 @@
3817 3913
            } 
3818 3914
         }
3819 3915
          this.inspect_context = new_inspection_str
3916
+      },
3917
+      toSystemContentPint(){
3918
+       
3919
+        this.$refs.editor.contents = this.$refs.editor.contents +this.option_context
3920
+        this.option_dialog = false
3820 3921
       }
3821 3922
 
3822 3923
     },

+ 13 - 13
src/xt_permission.js 查看文件

@@ -12,19 +12,19 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
12 12
 
13 13
 router.beforeEach((to, from, next) => {
14 14
   // 线上注释
15
-  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
16
-  //   store.dispatch('VerifyConfigList', []).then(() => {
17
-  //     next()
18
-  //   })
19
-  // }
20
-  // if (store.getters.permission_routers === undefined) {
21
-  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
22
-  //     next()
23
-  //   })
24
-  // } else {
25
-  //   next()
26
-  // }
27
-  // return
15
+  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
16
+    store.dispatch('VerifyConfigList', []).then(() => {
17
+      next()
18
+    })
19
+  }
20
+  if (store.getters.permission_routers === undefined) {
21
+    store.dispatch('xt_GenerateRoutes', []).then(() => {
22
+      next()
23
+    })
24
+  } else {
25
+    next()
26
+  }
27
+  return
28 28
  // 线上注释
29 29
   NProgress.start()
30 30
   // console.log(store.getters.current_role_urls.indexOf(to.path))