Browse Source

新分支

28169 1 year ago
parent
commit
3cbda876da

+ 19 - 0
src/xt_pages/Pharmacy/PatientDispensing.vue View File

@@ -216,6 +216,11 @@
216 216
                 <span>{{ scope.row.Total ? scope.row.Total : "" }}</span>
217 217
               </template>
218 218
             </el-table-column>
219
+            <el-table-column label="生产厂商" width="140" align="center">
220
+              <template slot-scope="scope">
221
+                <span>{{ getManutuer(scope.row.DrugId) }}</span>
222
+              </template>
223
+            </el-table-column>
219 224
             <el-table-column label="开立医生" width="150" align="center">
220 225
               <template slot-scope="scope">
221 226
                 <span>{{ scope.row.Doctor ? scope.row.Doctor : "" }}</span>
@@ -326,6 +331,7 @@ export default {
326 331
       fen: [],
327 332
       partition: 0, //分区
328 333
       drugList:[],
334
+      baseList:[],
329 335
     };
330 336
   },
331 337
   watch: {},
@@ -475,6 +481,8 @@ export default {
475 481
       waitingdrug(params).then((res) => {
476 482
         if (res.data.state == 1) {
477 483
           this.waitmount_data = res.data.data.list;
484
+          this.baseList =[]
485
+          this.baseList = res.data.data.baseList
478 486
           if (this.shift != 0 || this.partition != 0) {
479 487
             if (this.waitmount_data == null) {
480 488
               this.waitmount = 0;
@@ -534,6 +542,8 @@ export default {
534 542
         if (res.data.state == 1) {
535 543
            var list = res.data.data.list;
536 544
            console.log("hhhhawoowowow",list)
545
+           this.baseList =[]
546
+          this.baseList = res.data.data.baseList
537 547
           if(this.$store.getters.xt_user.org.id == 10188 || this.$store.getters.xt_user.org.id == 10217 || this.$store.getters.xt_user.org.id == 10387 ||  this.$store.getters.xt_user.org.id == 0  ||  this.$store.getters.xt_user.org.id == 10480  ){
538 548
             this.tableData = []
539 549
             if(list!=null && list.length >0){
@@ -723,6 +733,15 @@ export default {
723 733
        }
724 734
       }
725 735
       return medical_insurance_number
736
+    },
737
+    getManutuer(drug_id){
738
+       var manufacturer_name = ""
739
+       for(let i=0;i<this.baseList.length;i++){
740
+         if(drug_id == this.baseList[i].id){
741
+            manufacturer_name = this.baseList[i].manufacturer_name
742
+         }
743
+       }
744
+       return manufacturer_name
726 745
     }
727 746
   },
728 747
 };

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

@@ -266,14 +266,14 @@
266 266
             "
267 267
           >
268 268
             <template slot-scope="scope">
269
-             <span v-if="org_id == 10440 || org_id == 9671">
269
+             <span v-if="org_id == 10440 || org_id == 9671 || org_id ==10206">
270 270
               {{
271 271
                 scope.row.ultrafiltration_volume
272 272
                   ? scope.row.ultrafiltration_volume
273 273
                   : "0"
274 274
               }}
275 275
               </span>
276
-               <span v-if="org_id != 10440 && org_id!=9671">
276
+               <span v-if="org_id != 10440 && org_id!=9671 && org_id!=10206">
277 277
               {{
278 278
                 scope.row.ultrafiltration_volume
279 279
                   ? scope.row.ultrafiltration_volume

+ 2 - 2
src/xt_pages/role/admin.vue View File

@@ -25,13 +25,13 @@
25 25
         >医药师登记</el-button>
26 26
 
27 27
 
28
-        <!-- <el-button
28
+        <el-button
29 29
           type="primary"
30 30
           size="small"
31 31
           icon="el-icon-circle-plus-outline"
32 32
           style="float:left"
33 33
           @click="toJiaBan">加班</el-button>
34
-        -->
34
+       
35 35
 
36 36
          <!-- <el-button
37 37
           type="primary"

+ 71 - 67
src/xt_pages/workforce/appointment.vue View File

@@ -69,19 +69,20 @@
69 69
       <div style="display:flex;align-items:center">
70 70
         <el-button type="primary" size="small" icon="el-icon-printer" @click="printScheduleAction" v-if="activeName !='historyWeek'">打印排班</el-button>
71 71
         <el-button type="primary" size="small" icon="el-icon-printer" @click="printScheduleActionOne" v-if="activeName == 'historyWeek'">打印排班</el-button>
72
-        <!-- <schedule-upload-excel style="margin-right:10px;" :on-success='handleSuccess' v-if="is_edit"></schedule-upload-excel> -->
72
+        <schedule-upload-excel style="margin-right:10px;" :on-success='handleSuccess'></schedule-upload-excel>
73 73
         <!-- <el-button @click="printTable" type="primary" size="small">打印排班</el-button> -->
74 74
         <el-button v-if="isShow()" type="primary" size="small" @click="export_file()" :loading="downloadLoading">
75 75
           导出排班
76 76
         </el-button>
77
-        <!-- <el-button
77
+      
78
+        <el-button
78 79
             @click="generateLog()"
79 80
             class="filter-item"
80 81
             type="primary"
81
-            v-if="is_edit"
82
+           
82 83
             size="small"
83 84
         >下载日志
84
-        </el-button> -->
85
+        </el-button>
85 86
         <el-button type="primary" size="small" icon="el-icon-setting" @click="setScheduleTemplateAction">排班模板
86 87
         </el-button>
87 88
         <!-- <el-button type="primary" size="small" @click="copySchedule" v-if="is_edit">复制排班</el-button>
@@ -838,6 +839,9 @@ export default {
838 839
 
839 840
           })
840 841
 
842
+          console.log("tablelist020200220",this.tableList)
843
+          
844
+
841 845
           const filename = '排班模版'
842 846
 
843 847
 
@@ -2662,89 +2666,89 @@ export default {
2662 2666
                   //  周一上午
2663 2667
                   if (week[j].schedule_week == 1 && week[j].schedule_type == 1) {
2664 2668
                     console.log(week[j].name)
2665
-                    list[i].shangwu = week[j].name
2669
+                    list[i].shangwu = week[j].name+" "+week[i].dialysis_machine_name
2666 2670
                   }
2667 2671
                   // 周一下午
2668 2672
                   if (week[j].schedule_week == 1 && week[j].schedule_type == 2) {
2669
-                    list[i].xiawu = week[j].name
2673
+                    list[i].xiawu = week[j].name+" "+week[i].dialysis_machine_name
2670 2674
                   }
2671 2675
                   // 周一晚上
2672 2676
                   if (week[j].schedule_week == 1 && week[j].schedule_type == 3) {
2673
-                    list[i].wanshang = week[j].name
2677
+                    list[i].wanshang = week[j].name+" "+week[i].dialysis_machine_name
2674 2678
                   }
2675 2679
 
2676 2680
                   //周二上午
2677 2681
                   if (week[j].schedule_week == 2 && week[j].schedule_type == 1) {
2678
-                    list[i].shangwu1 = week[j].name
2682
+                    list[i].shangwu1 = week[j].name+" "+week[i].dialysis_machine_name
2679 2683
                   }
2680 2684
                   //周二下午
2681 2685
                   if (week[j].schedule_week == 2 && week[j].schedule_type == 2) {
2682
-                    list[i].xiawu1 = week[j].name
2686
+                    list[i].xiawu1 = week[j].name+" "+week[i].dialysis_machine_name
2683 2687
                   }
2684 2688
                   //周二晚上
2685 2689
                   if (week[j].schedule_week == 2 && week[j].schedule_type == 3) {
2686
-                    list[i].wanshang1 = week[j].name
2690
+                    list[i].wanshang1 = week[j].name+" "+week[i].dialysis_machine_name
2687 2691
                   }
2688 2692
 
2689 2693
                   //周三上午
2690 2694
                   if (week[j].schedule_week == 3 && week[j].schedule_type == 1) {
2691
-                    list[i].shangwu2 = week[j].name
2695
+                    list[i].shangwu2 = week[j].name+" "+week[i].dialysis_machine_name
2692 2696
                   }
2693 2697
                   //周三下午
2694 2698
                   if (week[j].schedule_week == 3 && week[j].schedule_type == 2) {
2695
-                    list[i].xiawu2 = week[j].name
2699
+                    list[i].xiawu2 = week[j].name+" "+week[i].dialysis_machine_name
2696 2700
                   }
2697 2701
                   //周三晚上
2698 2702
                   if (week[j].schedule_week == 3 && week[j].schedule_type == 3) {
2699
-                    list[i].wanshang2 = week[j].name
2703
+                    list[i].wanshang2 = week[j].name+" "+week[i].dialysis_machine_name
2700 2704
                   }
2701 2705
                   //周四上午
2702 2706
                   if (week[j].schedule_week == 4 && week[j].schedule_type == 1) {
2703
-                    list[i].shangwu3 = week[j].name
2707
+                    list[i].shangwu3 = week[j].name+" "+week[i].dialysis_machine_name
2704 2708
                   }
2705 2709
                   //周四下午
2706 2710
                   if (week[j].schedule_week == 4 && week[j].schedule_type == 2) {
2707
-                    list[i].xiawu3 = week[j].name
2711
+                    list[i].xiawu3 = week[j].name+" "+week[i].dialysis_machine_name
2708 2712
                   }
2709 2713
                   //周四晚上
2710 2714
                   if (week[j].schedule_week == 4 && week[j].schedule_type == 3) {
2711
-                    list[i].wanshang3 = week[j].name
2715
+                    list[i].wanshang3 = week[j].name+" "+week[i].dialysis_machine_name
2712 2716
                   }
2713 2717
                   //周五上午
2714 2718
                   if (week[j].schedule_week == 5 && week[j].schedule_type == 1) {
2715
-                    list[i].shangwu4 = week[j].name
2719
+                    list[i].shangwu4 = week[j].name+" "+week[i].dialysis_machine_name
2716 2720
                   }
2717 2721
                   //周五下午
2718 2722
                   if (week[j].schedule_week == 5 && week[j].schedule_type == 2) {
2719
-                    list[i].xiawu4 = week[j].name
2723
+                    list[i].xiawu4 = week[j].name+" "+week[i].dialysis_machine_name
2720 2724
                   }
2721 2725
                   //周五晚上
2722 2726
                   if (week[j].schedule_week == 5 && week[j].schedule_type == 3) {
2723
-                    list[i].wanshang4 = week[j].name
2727
+                    list[i].wanshang4 = week[j].name+" "+week[i].dialysis_machine_name
2724 2728
                   }
2725 2729
                   //周六上午
2726 2730
                   if (week[j].schedule_week == 6 && week[j].schedule_type == 1) {
2727
-                    list[i].shangwu5 = week[j].name
2731
+                    list[i].shangwu5 = week[j].name+" "+week[i].dialysis_machine_name
2728 2732
                   }
2729 2733
                   //周六下午
2730 2734
                   if (week[j].schedule_week == 6 && week[j].schedule_type == 2) {
2731
-                    list[i].xiawu5 = week[j].name
2735
+                    list[i].xiawu5 = week[j].name+" "+week[i].dialysis_machine_name
2732 2736
                   }
2733 2737
                   //周六晚上
2734 2738
                   if (week[j].schedule_week == 6 && week[j].schedule_type == 3) {
2735
-                    list[i].wanshang5 = week[j].name
2739
+                    list[i].wanshang5 = week[j].name+" "+week[i].dialysis_machine_name
2736 2740
                   }
2737 2741
                   //周日上午
2738 2742
                   if (week[j].schedule_week == 7 && week[j].schedule_type == 1) {
2739
-                    list[i].shangwu6 = week[j].name
2743
+                    list[i].shangwu6 = week[j].name+" "+week[i].dialysis_machine_name
2740 2744
                   }
2741 2745
                   //周日下午
2742 2746
                   if (week[j].schedule_week == 7 && week[j].schedule_type == 2) {
2743
-                    list[i].xiawu6 = week[j].name
2747
+                    list[i].xiawu6 = week[j].name+" "+week[i].dialysis_machine_name
2744 2748
                   }
2745 2749
                   //周日晚上
2746 2750
                   if (week[j].schedule_week == 7 && week[j].schedule_type == 3) {
2747
-                    list[i].wanshang6 = week[j].name
2751
+                    list[i].wanshang6 = week[j].name+" "+week[i].dialysis_machine_name
2748 2752
                   }
2749 2753
                 }
2750 2754
 
@@ -2758,93 +2762,93 @@ export default {
2758 2762
                 if (list[i].机号 == nextWeek[j].number && list[i].区号 == nextWeek[j].zon_name) {
2759 2763
                   //周一
2760 2764
                   if (nextWeek[j].schedule_week == 1 && nextWeek[j].schedule_type == 1) {
2761
-                    list[i].shangwu7 = nextWeek[j].name
2765
+                    list[i].shangwu7 = nextWeek[j].name+" "+nextWeek[i].dialysis_machine_name
2762 2766
                   }
2763 2767
                   //周一下午
2764 2768
                   if (nextWeek[j].schedule_week == 1 && nextWeek[j].schedule_type == 2) {
2765
-                    list[i].xiawu7 = nextWeek[j].name
2769
+                    list[i].xiawu7 = nextWeek[j].name+" "+nextWeek[i].dialysis_machine_name
2766 2770
                   }
2767 2771
                   //周一晚上
2768 2772
                   if (nextWeek[j].schedule_week == 1 && nextWeek[j].schedule_type == 3) {
2769
-                    list[i].wanshang7 = nextWeek[j].name
2773
+                    list[i].wanshang7 = nextWeek[j].name+" "+nextWeek[i].dialysis_machine_name
2770 2774
                   }
2771 2775
 
2772 2776
                   //周二上午
2773 2777
                   if (nextWeek[j].schedule_week == 2 && nextWeek[j].schedule_type == 1) {
2774
-                    list[i].shangwu8 = nextWeek[j].name
2778
+                    list[i].shangwu8 = nextWeek[j].name+" "+nextWeek[i].dialysis_machine_name
2775 2779
                   }
2776 2780
                   //周二下午
2777 2781
                   if (nextWeek[j].schedule_week == 2 && nextWeek[j].schedule_type == 2) {
2778
-                    list[i].xiawu8 = nextWeek[j].name
2782
+                    list[i].xiawu8 = nextWeek[j].name+" "+nextWeek[i].dialysis_machine_name
2779 2783
                   }
2780 2784
                   //周二晚上
2781 2785
                   if (nextWeek[j].schedule_week == 2 && nextWeek[j].schedule_type == 3) {
2782
-                    list[i].wanshang8 = nextWeek[j].name
2786
+                    list[i].wanshang8 = nextWeek[j].name+" "+nextWeek[i].dialysis_machine_name
2783 2787
                   }
2784 2788
 
2785 2789
                   //周三上午
2786 2790
                   if (nextWeek[j].schedule_week == 3 && nextWeek[j].schedule_type == 1) {
2787
-                    list[i].shangwu9 = nextWeek[j].name
2791
+                    list[i].shangwu9 = nextWeek[j].name+" "+nextWeek[i].dialysis_machine_name
2788 2792
                   }
2789 2793
                   //周三下午
2790 2794
                   if (nextWeek[j].schedule_week == 3 && nextWeek[j].schedule_type == 2) {
2791
-                    list[i].xiawu9 = nextWeek[j].name
2795
+                    list[i].xiawu9 = nextWeek[j].name+" "+nextWeek[i].dialysis_machine_name
2792 2796
                   }
2793 2797
                   //周三晚上
2794 2798
                   if (nextWeek[j].schedule_week == 3 && nextWeek[j].schedule_type == 3) {
2795
-                    list[i].wanshang9 = nextWeek[j].name
2799
+                    list[i].wanshang9 = nextWeek[j].name+" "+nextWeek[i].dialysis_machine_name
2796 2800
                   }
2797 2801
 
2798 2802
                   //周四上午
2799 2803
                   if (nextWeek[j].schedule_week == 4 && nextWeek[j].schedule_type == 1) {
2800
-                    list[i].shangwu10 = nextWeek[j].name
2804
+                    list[i].shangwu10 = nextWeek[j].name+" "+nextWeek[i].dialysis_machine_name
2801 2805
                   }
2802 2806
                   //周四下午
2803 2807
                   if (nextWeek[j].schedule_week == 4 && nextWeek[j].schedule_type == 2) {
2804
-                    list[i].xiawu10 = nextWeek[j].name
2808
+                    list[i].xiawu10 = nextWeek[j].name+" "+nextWeek[i].dialysis_machine_name
2805 2809
                   }
2806 2810
                   //周四晚上
2807 2811
                   if (nextWeek[j].schedule_week == 4 && nextWeek[j].schedule_type == 3) {
2808
-                    list[i].wanshang10 = nextWeek[j].name
2812
+                    list[i].wanshang10 = nextWeek[j].name+" "+nextWeek[i].dialysis_machine_name
2809 2813
                   }
2810 2814
 
2811 2815
                   //周五上午
2812 2816
                   if (nextWeek[j].schedule_week == 5 && nextWeek[j].schedule_type == 1) {
2813
-                    list[i].shangwu11 = nextWeek[j].name
2817
+                    list[i].shangwu11 = nextWeek[j].name+" "+nextWeek[i].dialysis_machine_name
2814 2818
                   }
2815 2819
                   //周五下午
2816 2820
                   if (nextWeek[j].schedule_week == 5 && nextWeek[j].schedule_type == 2) {
2817
-                    list[i].xiawu11 = nextWeek[j].name
2821
+                    list[i].xiawu11 = nextWeek[j].name+" "+nextWeek[i].dialysis_machine_name
2818 2822
                   }
2819 2823
                   //周五晚上
2820 2824
                   if (nextWeek[j].schedule_week == 5 && nextWeek[j].schedule_type == 3) {
2821
-                    list[i].wanshang11 = nextWeek[j].name
2825
+                    list[i].wanshang11 = nextWeek[j].name+" "+nextWeek[i].dialysis_machine_name
2822 2826
                   }
2823 2827
 
2824 2828
                   //周六上午
2825 2829
                   if (nextWeek[j].schedule_week == 6 && nextWeek[j].schedule_type == 1) {
2826
-                    list[i].shangwu12 = nextWeek[j].name
2830
+                    list[i].shangwu12 = nextWeek[j].name+" "+nextWeek[i].dialysis_machine_name
2827 2831
                   }
2828 2832
                   //周六下午
2829 2833
                   if (nextWeek[j].schedule_week == 6 && nextWeek[j].schedule_type == 2) {
2830
-                    list[i].xiawu12 = nextWeek[j].name
2834
+                    list[i].xiawu12 = nextWeek[j].name+" "+nextWeek[i].dialysis_machine_name
2831 2835
                   }
2832 2836
                   //周六晚上
2833 2837
                   if (nextWeek[j].schedule_week == 6 && nextWeek[j].schedule_type == 3) {
2834
-                    list[i].wanshang12 = nextWeek[j].name
2838
+                    list[i].wanshang12 = nextWeek[j].name+" "+nextWeek[i].dialysis_machine_name
2835 2839
                   }
2836 2840
 
2837 2841
                   //周日上午
2838 2842
                   if (nextWeek[j].schedule_week == 7 && nextWeek[j].schedule_type == 1) {
2839
-                    list[i].shangwu13 = nextWeek[j].name
2843
+                    list[i].shangwu13 = nextWeek[j].name+" "+nextWeek[i].dialysis_machine_name
2840 2844
                   }
2841 2845
                   //周日下午
2842 2846
                   if (nextWeek[j].schedule_week == 7 && nextWeek[j].schedule_type == 2) {
2843
-                    list[i].xiawu13 = nextWeek[j].name
2847
+                    list[i].xiawu13 = nextWeek[j].name+" "+nextWeek[i].dialysis_machine_name
2844 2848
                   }
2845 2849
                   //周日晚上
2846 2850
                   if (nextWeek[j].schedule_week == 7 && nextWeek[j].schedule_type == 3) {
2847
-                    list[i].wanshang13 = nextWeek[j].name
2851
+                    list[i].wanshang13 = nextWeek[j].name+" "+nextWeek[i].dialysis_machine_name
2848 2852
                   }
2849 2853
                 }
2850 2854
 
@@ -2858,93 +2862,93 @@ export default {
2858 2862
                 if (list[i].机号 == lastWeek[j].number && list[i].区号 == lastWeek[j].zon_name) {
2859 2863
                   //周一
2860 2864
                   if (lastWeek[j].schedule_week == 1 && lastWeek[j].schedule_type == 1) {
2861
-                    list[i].shangwu14 = lastWeek[j].name
2865
+                    list[i].shangwu14 = lastWeek[j].name+" "+lastWeek[i].dialysis_machine_name
2862 2866
                   }
2863 2867
                   //周一下午
2864 2868
                   if (lastWeek[j].schedule_week == 1 && lastWeek[j].schedule_type == 2) {
2865
-                    list[i].xiawu14 = lastWeek[j].name
2869
+                    list[i].xiawu14 = lastWeek[j].name+" "+lastWeek[i].dialysis_machine_name
2866 2870
                   }
2867 2871
                   //周一晚上
2868 2872
                   if (lastWeek[j].schedule_week == 1 && lastWeek[j].schedule_type == 3) {
2869
-                    list[i].wanshang14 = lastWeek[j].name
2873
+                    list[i].wanshang14 = lastWeek[j].name+" "+lastWeek[i].dialysis_machine_name
2870 2874
                   }
2871 2875
 
2872 2876
                   //周二
2873 2877
                   if (lastWeek[j].schedule_week == 2 && lastWeek[j].schedule_type == 1) {
2874
-                    list[i].shangwu15 = lastWeek[j].name
2878
+                    list[i].shangwu15 = lastWeek[j].name+" "+lastWeek[i].dialysis_machine_name
2875 2879
                   }
2876 2880
                   //周二下午
2877 2881
                   if (lastWeek[j].schedule_week == 2 && lastWeek[j].schedule_type == 2) {
2878
-                    list[i].xiawu15 = lastWeek[j].name
2882
+                    list[i].xiawu15 = lastWeek[j].name+" "+lastWeek[i].dialysis_machine_name
2879 2883
                   }
2880 2884
                   //周二晚上
2881 2885
                   if (lastWeek[j].schedule_week == 2 && lastWeek[j].schedule_type == 3) {
2882
-                    list[i].wanshang15 = lastWeek[j].name
2886
+                    list[i].wanshang15 = lastWeek[j].name+" "+lastWeek[i].dialysis_machine_name
2883 2887
                   }
2884 2888
 
2885 2889
                   //周三
2886 2890
                   if (lastWeek[j].schedule_week == 3 && lastWeek[j].schedule_type == 1) {
2887
-                    list[i].shangwu16 = lastWeek[j].name
2891
+                    list[i].shangwu16 = lastWeek[j].name+" "+lastWeek[i].dialysis_machine_name
2888 2892
                   }
2889 2893
                   //周三下午
2890 2894
                   if (lastWeek[j].schedule_week == 3 && lastWeek[j].schedule_type == 2) {
2891
-                    list[i].xiawu16 = lastWeek[j].name
2895
+                    list[i].xiawu16 = lastWeek[j].name+" "+lastWeek[i].dialysis_machine_name
2892 2896
                   }
2893 2897
                   //周三晚上
2894 2898
                   if (lastWeek[j].schedule_week == 3 && lastWeek[j].schedule_type == 3) {
2895
-                    list[i].wanshang16 = lastWeek[j].name
2899
+                    list[i].wanshang16 = lastWeek[j].name+" "+lastWeek[i].dialysis_machine_name
2896 2900
                   }
2897 2901
 
2898 2902
                   //周四
2899 2903
                   if (lastWeek[j].schedule_week == 4 && lastWeek[j].schedule_type == 1) {
2900
-                    list[i].shangwu17 = lastWeek[j].name
2904
+                    list[i].shangwu17 = lastWeek[j].name+" "+lastWeek[i].dialysis_machine_name
2901 2905
                   }
2902 2906
                   //周四下午
2903 2907
                   if (lastWeek[j].schedule_week == 4 && lastWeek[j].schedule_type == 2) {
2904
-                    list[i].xiawu17 = lastWeek[j].name
2908
+                    list[i].xiawu17 = lastWeek[j].name+" "+lastWeek[i].dialysis_machine_name
2905 2909
                   }
2906 2910
                   //周四晚上
2907 2911
                   if (lastWeek[j].schedule_week == 4 && lastWeek[j].schedule_type == 3) {
2908
-                    list[i].wanshang17 = lastWeek[j].name
2912
+                    list[i].wanshang17 = lastWeek[j].name+" "+lastWeek[i].dialysis_machine_name
2909 2913
                   }
2910 2914
 
2911 2915
                   //周五
2912 2916
                   if (lastWeek[j].schedule_week == 5 && lastWeek[j].schedule_type == 1) {
2913
-                    list[i].shangwu18 = lastWeek[j].name
2917
+                    list[i].shangwu18 = lastWeek[j].name+" "+lastWeek[i].dialysis_machine_name
2914 2918
                   }
2915 2919
                   //周五下午
2916 2920
                   if (lastWeek[j].schedule_week == 5 && lastWeek[j].schedule_type == 2) {
2917
-                    list[i].xiawu18 = lastWeek[j].name
2921
+                    list[i].xiawu18 = lastWeek[j].name+" "+lastWeek[i].dialysis_machine_name
2918 2922
                   }
2919 2923
                   //周五晚上
2920 2924
                   if (lastWeek[j].schedule_week == 5 && lastWeek[j].schedule_type == 3) {
2921
-                    list[i].wanshang18 = lastWeek[j].name
2925
+                    list[i].wanshang18 = lastWeek[j].name+" "+lastWeek[i].dialysis_machine_name
2922 2926
                   }
2923 2927
 
2924 2928
                   //周六
2925 2929
                   if (lastWeek[j].schedule_week == 6 && lastWeek[j].schedule_type == 1) {
2926
-                    list[i].shangwu19 = lastWeek[j].name
2930
+                    list[i].shangwu19 = lastWeek[j].name+" "+lastWeek[i].dialysis_machine_name
2927 2931
                   }
2928 2932
                   //周六下午
2929 2933
                   if (lastWeek[j].schedule_week == 6 && lastWeek[j].schedule_type == 2) {
2930
-                    list[i].xiawu19 = lastWeek[j].name
2934
+                    list[i].xiawu19 = lastWeek[j].name+" "+lastWeek[i].dialysis_machine_name
2931 2935
                   }
2932 2936
                   //周六晚上
2933 2937
                   if (lastWeek[j].schedule_week == 6 && lastWeek[j].schedule_type == 3) {
2934
-                    list[i].wanshang19 = lastWeek[j].name
2938
+                    list[i].wanshang19 = lastWeek[j].name+" "+lastWeek[i].dialysis_machine_name
2935 2939
                   }
2936 2940
 
2937 2941
                   //周日
2938 2942
                   if (lastWeek[j].schedule_week == 7 && lastWeek[j].schedule_type == 1) {
2939
-                    list[i].shangwu20 = lastWeek[j].name
2943
+                    list[i].shangwu20 = lastWeek[j].name+" "+lastWeek[i].dialysis_machine_name
2940 2944
                   }
2941 2945
                   //周日下午
2942 2946
                   if (lastWeek[j].schedule_week == 7 && lastWeek[j].schedule_type == 2) {
2943
-                    list[i].xiawu20 = lastWeek[j].name
2947
+                    list[i].xiawu20 = lastWeek[j].name+" "+lastWeek[i].dialysis_machine_name
2944 2948
                   }
2945 2949
                   //周日晚上
2946 2950
                   if (lastWeek[j].schedule_week == 7 && lastWeek[j].schedule_type == 3) {
2947
-                    list[i].wanshang20 = lastWeek[j].name
2951
+                    list[i].wanshang20 = lastWeek[j].name+" "+lastWeek[i].dialysis_machine_name
2948 2952
                   }
2949 2953
                 }
2950 2954