yq1 1 year ago
parent
commit
9f6939b6be
1 changed files with 71 additions and 69 deletions
  1. 71 69
      src/xt_pages/workforce/appointment.vue

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

@@ -51,7 +51,6 @@
51 51
   </span>
52 52
     </el-dialog>
53 53
 
54
-
55 54
     <el-dialog
56 55
         title="提示"
57 56
         :visible.sync="isExistRepeatVisible"
@@ -835,13 +834,13 @@ export default {
835 834
 
836 835
           this.tableList.map(item => {
837 836
             data.push(Object.values(item))
838
-
839 837
           })
840 838
 
841 839
           const filename = '排班模版'
842 840
 
843
-
841
+          console.log('333333333',this.tableList),
844 842
           excel.export_json_to_excel({
843
+            
845 844
             multiHeader,
846 845
             header,
847 846
             merges,
@@ -2463,7 +2462,7 @@ export default {
2463 2462
       getThreeWeekList(params).then(response => {
2464 2463
         if (response.data.state == 1) {
2465 2464
           var partitions = response.data.data.partitions
2466
-
2465
+          console.log('yyyyyyy',response.data.data);
2467 2466
           const merges = ['A1:A2', 'B1:B2', 'C1:E1', 'F1:H1', 'I1:K1', 'L1:N1', 'O1:Q1', 'R1:T1', 'U1:W1', 'X1:Z1', 'AA1:AC1', 'AD1:AF1', 'AG1:AI1', 'AJ1:AL1', 'AM1:AO1', 'AP1:AR1', 'AS1:AU1', 'AV1:AX1', 'AY1:BA1', 'BB1:BD1', 'BE1:BG1', 'BH1:BJ1', 'BK1:BM1']
2468 2467
           var list = []
2469 2468
           let i = 0
@@ -2616,7 +2615,7 @@ export default {
2616 2615
           var end = this.getTimestamp(end_time) - 28800
2617 2616
           console.log("end", end)
2618 2617
           var scheduleList = response.data.data.list
2619
-
2618
+          // console.log('ttttttttt',scheduleList);
2620 2619
           var week = []
2621 2620
           var nextWeek = []
2622 2621
           var lastWeek = []
@@ -2656,30 +2655,33 @@ export default {
2656 2655
           console.log(week)
2657 2656
 
2658 2657
           if (week.length > 0) {
2658
+            // console.log('qqqqqqqqq',list);
2659
+            // console.log('wwwwwwwww',week);
2659 2660
             for (let i = 0; i < list.length; i++) {
2660 2661
               for (let j = 0; j < week.length; j++) {
2661 2662
                 if (list[i].机号 == week[j].number && list[i].区号 == week[j].zon_name) {
2662
-                  //  周一上午
2663
+                  //  周一上午 week[j].number week[j].zon_name
2663 2664
                   if (week[j].schedule_week == 1 && week[j].schedule_type == 1) {
2664
-                    console.log(week[j].name)
2665
-                    list[i].shangwu = week[j].name+" "+week[i].dialysis_machine_name
2665
+                    // console.log(week[j].name)
2666
+                    list[i].shangwu = week[j].name+" "+week[j].dialysis_machine_name
2667
+                    console.log('eeeeeee',list[i])
2666 2668
                   }
2667 2669
                   // 周一下午
2668 2670
                   if (week[j].schedule_week == 1 && week[j].schedule_type == 2) {
2669
-                    list[i].xiawu = week[j].name+" "+week[i].dialysis_machine_name
2671
+                    list[i].xiawu = week[j].name+" "+week[j].dialysis_machine_name
2670 2672
                   }
2671 2673
                   // 周一晚上
2672 2674
                   if (week[j].schedule_week == 1 && week[j].schedule_type == 3) {
2673
-                    list[i].wanshang = week[j].name+" "+week[i].dialysis_machine_name
2675
+                    list[i].wanshang = week[j].name+" "+week[j].dialysis_machine_name
2674 2676
                   }
2675 2677
 
2676 2678
                   //周二上午
2677 2679
                   if (week[j].schedule_week == 2 && week[j].schedule_type == 1) {
2678
-                    list[i].shangwu1 = week[j].name+" "+week[i].dialysis_machine_name
2680
+                    list[i].shangwu1 = week[j].name+" "+week[j].dialysis_machine_name
2679 2681
                   }
2680 2682
                   //周二下午
2681 2683
                   if (week[j].schedule_week == 2 && week[j].schedule_type == 2) {
2682
-                    list[i].xiawu1 = week[j].name+" "+week[i].dialysis_machine_name
2684
+                    list[i].xiawu1 = week[j].name+" "+week[j].dialysis_machine_name
2683 2685
                   }
2684 2686
                   //周二晚上
2685 2687
                   if (week[j].schedule_week == 2 && week[j].schedule_type == 3) {
@@ -2688,63 +2690,63 @@ export default {
2688 2690
 
2689 2691
                   //周三上午
2690 2692
                   if (week[j].schedule_week == 3 && week[j].schedule_type == 1) {
2691
-                    list[i].shangwu2 = week[j].name+" "+week[i].dialysis_machine_name
2693
+                    list[i].shangwu2 = week[j].name+" "+week[j].dialysis_machine_name
2692 2694
                   }
2693 2695
                   //周三下午
2694 2696
                   if (week[j].schedule_week == 3 && week[j].schedule_type == 2) {
2695
-                    list[i].xiawu2 = week[j].name+" "+week[i].dialysis_machine_name
2697
+                    list[i].xiawu2 = week[j].name+" "+week[j].dialysis_machine_name
2696 2698
                   }
2697 2699
                   //周三晚上
2698 2700
                   if (week[j].schedule_week == 3 && week[j].schedule_type == 3) {
2699
-                    list[i].wanshang2 = week[j].name+" "+week[i].dialysis_machine_name
2701
+                    list[i].wanshang2 = week[j].name+" "+week[j].dialysis_machine_name
2700 2702
                   }
2701 2703
                   //周四上午
2702 2704
                   if (week[j].schedule_week == 4 && week[j].schedule_type == 1) {
2703
-                    list[i].shangwu3 = week[j].name+" "+week[i].dialysis_machine_name
2705
+                    list[i].shangwu3 = week[j].name+" "+week[j].dialysis_machine_name
2704 2706
                   }
2705 2707
                   //周四下午
2706 2708
                   if (week[j].schedule_week == 4 && week[j].schedule_type == 2) {
2707
-                    list[i].xiawu3 = week[j].name+" "+week[i].dialysis_machine_name
2709
+                    list[i].xiawu3 = week[j].name+" "+week[j].dialysis_machine_name
2708 2710
                   }
2709 2711
                   //周四晚上
2710 2712
                   if (week[j].schedule_week == 4 && week[j].schedule_type == 3) {
2711
-                    list[i].wanshang3 = week[j].name+" "+week[i].dialysis_machine_name
2713
+                    list[i].wanshang3 = week[j].name+" "+week[j].dialysis_machine_name
2712 2714
                   }
2713 2715
                   //周五上午
2714 2716
                   if (week[j].schedule_week == 5 && week[j].schedule_type == 1) {
2715
-                    list[i].shangwu4 = week[j].name+" "+week[i].dialysis_machine_name
2717
+                    list[i].shangwu4 = week[j].name+" "+week[j].dialysis_machine_name
2716 2718
                   }
2717 2719
                   //周五下午
2718 2720
                   if (week[j].schedule_week == 5 && week[j].schedule_type == 2) {
2719
-                    list[i].xiawu4 = week[j].name+" "+week[i].dialysis_machine_name
2721
+                    list[i].xiawu4 = week[j].name+" "+week[j].dialysis_machine_name
2720 2722
                   }
2721 2723
                   //周五晚上
2722 2724
                   if (week[j].schedule_week == 5 && week[j].schedule_type == 3) {
2723
-                    list[i].wanshang4 = week[j].name+" "+week[i].dialysis_machine_name
2725
+                    list[i].wanshang4 = week[j].name+" "+week[j].dialysis_machine_name
2724 2726
                   }
2725 2727
                   //周六上午
2726 2728
                   if (week[j].schedule_week == 6 && week[j].schedule_type == 1) {
2727
-                    list[i].shangwu5 = week[j].name+" "+week[i].dialysis_machine_name
2729
+                    list[i].shangwu5 = week[j].name+" "+week[j].dialysis_machine_name
2728 2730
                   }
2729 2731
                   //周六下午
2730 2732
                   if (week[j].schedule_week == 6 && week[j].schedule_type == 2) {
2731
-                    list[i].xiawu5 = week[j].name+" "+week[i].dialysis_machine_name
2733
+                    list[i].xiawu5 = week[j].name+" "+week[j].dialysis_machine_name
2732 2734
                   }
2733 2735
                   //周六晚上
2734 2736
                   if (week[j].schedule_week == 6 && week[j].schedule_type == 3) {
2735
-                    list[i].wanshang5 = week[j].name+" "+week[i].dialysis_machine_name
2737
+                    list[i].wanshang5 = week[j].name+" "+week[j].dialysis_machine_name
2736 2738
                   }
2737 2739
                   //周日上午
2738 2740
                   if (week[j].schedule_week == 7 && week[j].schedule_type == 1) {
2739
-                    list[i].shangwu6 = week[j].name+" "+week[i].dialysis_machine_name
2741
+                    list[i].shangwu6 = week[j].name+" "+week[j].dialysis_machine_name
2740 2742
                   }
2741 2743
                   //周日下午
2742 2744
                   if (week[j].schedule_week == 7 && week[j].schedule_type == 2) {
2743
-                    list[i].xiawu6 = week[j].name+" "+week[i].dialysis_machine_name
2745
+                    list[i].xiawu6 = week[j].name+" "+week[j].dialysis_machine_name
2744 2746
                   }
2745 2747
                   //周日晚上
2746 2748
                   if (week[j].schedule_week == 7 && week[j].schedule_type == 3) {
2747
-                    list[i].wanshang6 = week[j].name+" "+week[i].dialysis_machine_name
2749
+                    list[i].wanshang6 = week[j].name+" "+week[j].dialysis_machine_name
2748 2750
                   }
2749 2751
                 }
2750 2752
 
@@ -2758,93 +2760,93 @@ export default {
2758 2760
                 if (list[i].机号 == nextWeek[j].number && list[i].区号 == nextWeek[j].zon_name) {
2759 2761
                   //周一
2760 2762
                   if (nextWeek[j].schedule_week == 1 && nextWeek[j].schedule_type == 1) {
2761
-                    list[i].shangwu7 = nextWeek[j].name+" "+nextWeek[i].dialysis_machine_name
2763
+                    list[i].shangwu7 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
2762 2764
                   }
2763 2765
                   //周一下午
2764 2766
                   if (nextWeek[j].schedule_week == 1 && nextWeek[j].schedule_type == 2) {
2765
-                    list[i].xiawu7 = nextWeek[j].name+" "+nextWeek[i].dialysis_machine_name
2767
+                    list[i].xiawu7 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
2766 2768
                   }
2767 2769
                   //周一晚上
2768 2770
                   if (nextWeek[j].schedule_week == 1 && nextWeek[j].schedule_type == 3) {
2769
-                    list[i].wanshang7 = nextWeek[j].name+" "+nextWeek[i].dialysis_machine_name
2771
+                    list[i].wanshang7 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
2770 2772
                   }
2771 2773
 
2772 2774
                   //周二上午
2773 2775
                   if (nextWeek[j].schedule_week == 2 && nextWeek[j].schedule_type == 1) {
2774
-                    list[i].shangwu8 = nextWeek[j].name+" "+nextWeek[i].dialysis_machine_name
2776
+                    list[i].shangwu8 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
2775 2777
                   }
2776 2778
                   //周二下午
2777 2779
                   if (nextWeek[j].schedule_week == 2 && nextWeek[j].schedule_type == 2) {
2778
-                    list[i].xiawu8 = nextWeek[j].name+" "+nextWeek[i].dialysis_machine_name
2780
+                    list[i].xiawu8 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
2779 2781
                   }
2780 2782
                   //周二晚上
2781 2783
                   if (nextWeek[j].schedule_week == 2 && nextWeek[j].schedule_type == 3) {
2782
-                    list[i].wanshang8 = nextWeek[j].name+" "+nextWeek[i].dialysis_machine_name
2784
+                    list[i].wanshang8 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
2783 2785
                   }
2784 2786
 
2785 2787
                   //周三上午
2786 2788
                   if (nextWeek[j].schedule_week == 3 && nextWeek[j].schedule_type == 1) {
2787
-                    list[i].shangwu9 = nextWeek[j].name+" "+nextWeek[i].dialysis_machine_name
2789
+                    list[i].shangwu9 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
2788 2790
                   }
2789 2791
                   //周三下午
2790 2792
                   if (nextWeek[j].schedule_week == 3 && nextWeek[j].schedule_type == 2) {
2791
-                    list[i].xiawu9 = nextWeek[j].name+" "+nextWeek[i].dialysis_machine_name
2793
+                    list[i].xiawu9 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
2792 2794
                   }
2793 2795
                   //周三晚上
2794 2796
                   if (nextWeek[j].schedule_week == 3 && nextWeek[j].schedule_type == 3) {
2795
-                    list[i].wanshang9 = nextWeek[j].name+" "+nextWeek[i].dialysis_machine_name
2797
+                    list[i].wanshang9 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
2796 2798
                   }
2797 2799
 
2798 2800
                   //周四上午
2799 2801
                   if (nextWeek[j].schedule_week == 4 && nextWeek[j].schedule_type == 1) {
2800
-                    list[i].shangwu10 = nextWeek[j].name+" "+nextWeek[i].dialysis_machine_name
2802
+                    list[i].shangwu10 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
2801 2803
                   }
2802 2804
                   //周四下午
2803 2805
                   if (nextWeek[j].schedule_week == 4 && nextWeek[j].schedule_type == 2) {
2804
-                    list[i].xiawu10 = nextWeek[j].name+" "+nextWeek[i].dialysis_machine_name
2806
+                    list[i].xiawu10 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
2805 2807
                   }
2806 2808
                   //周四晚上
2807 2809
                   if (nextWeek[j].schedule_week == 4 && nextWeek[j].schedule_type == 3) {
2808
-                    list[i].wanshang10 = nextWeek[j].name+" "+nextWeek[i].dialysis_machine_name
2810
+                    list[i].wanshang10 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
2809 2811
                   }
2810 2812
 
2811 2813
                   //周五上午
2812 2814
                   if (nextWeek[j].schedule_week == 5 && nextWeek[j].schedule_type == 1) {
2813
-                    list[i].shangwu11 = nextWeek[j].name+" "+nextWeek[i].dialysis_machine_name
2815
+                    list[i].shangwu11 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
2814 2816
                   }
2815 2817
                   //周五下午
2816 2818
                   if (nextWeek[j].schedule_week == 5 && nextWeek[j].schedule_type == 2) {
2817
-                    list[i].xiawu11 = nextWeek[j].name+" "+nextWeek[i].dialysis_machine_name
2819
+                    list[i].xiawu11 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
2818 2820
                   }
2819 2821
                   //周五晚上
2820 2822
                   if (nextWeek[j].schedule_week == 5 && nextWeek[j].schedule_type == 3) {
2821
-                    list[i].wanshang11 = nextWeek[j].name+" "+nextWeek[i].dialysis_machine_name
2823
+                    list[i].wanshang11 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
2822 2824
                   }
2823 2825
 
2824 2826
                   //周六上午
2825 2827
                   if (nextWeek[j].schedule_week == 6 && nextWeek[j].schedule_type == 1) {
2826
-                    list[i].shangwu12 = nextWeek[j].name+" "+nextWeek[i].dialysis_machine_name
2828
+                    list[i].shangwu12 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
2827 2829
                   }
2828 2830
                   //周六下午
2829 2831
                   if (nextWeek[j].schedule_week == 6 && nextWeek[j].schedule_type == 2) {
2830
-                    list[i].xiawu12 = nextWeek[j].name+" "+nextWeek[i].dialysis_machine_name
2832
+                    list[i].xiawu12 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
2831 2833
                   }
2832 2834
                   //周六晚上
2833 2835
                   if (nextWeek[j].schedule_week == 6 && nextWeek[j].schedule_type == 3) {
2834
-                    list[i].wanshang12 = nextWeek[j].name+" "+nextWeek[i].dialysis_machine_name
2836
+                    list[i].wanshang12 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
2835 2837
                   }
2836 2838
 
2837 2839
                   //周日上午
2838 2840
                   if (nextWeek[j].schedule_week == 7 && nextWeek[j].schedule_type == 1) {
2839
-                    list[i].shangwu13 = nextWeek[j].name+" "+nextWeek[i].dialysis_machine_name
2841
+                    list[i].shangwu13 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
2840 2842
                   }
2841 2843
                   //周日下午
2842 2844
                   if (nextWeek[j].schedule_week == 7 && nextWeek[j].schedule_type == 2) {
2843
-                    list[i].xiawu13 = nextWeek[j].name+" "+nextWeek[i].dialysis_machine_name
2845
+                    list[i].xiawu13 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
2844 2846
                   }
2845 2847
                   //周日晚上
2846 2848
                   if (nextWeek[j].schedule_week == 7 && nextWeek[j].schedule_type == 3) {
2847
-                    list[i].wanshang13 = nextWeek[j].name+" "+nextWeek[i].dialysis_machine_name
2849
+                    list[i].wanshang13 = nextWeek[j].name+" "+nextWeek[j].dialysis_machine_name
2848 2850
                   }
2849 2851
                 }
2850 2852
 
@@ -2858,93 +2860,93 @@ export default {
2858 2860
                 if (list[i].机号 == lastWeek[j].number && list[i].区号 == lastWeek[j].zon_name) {
2859 2861
                   //周一
2860 2862
                   if (lastWeek[j].schedule_week == 1 && lastWeek[j].schedule_type == 1) {
2861
-                    list[i].shangwu14 = lastWeek[j].name+" "+lastWeek[i].dialysis_machine_name
2863
+                    list[i].shangwu14 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
2862 2864
                   }
2863 2865
                   //周一下午
2864 2866
                   if (lastWeek[j].schedule_week == 1 && lastWeek[j].schedule_type == 2) {
2865
-                    list[i].xiawu14 = lastWeek[j].name+" "+lastWeek[i].dialysis_machine_name
2867
+                    list[i].xiawu14 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
2866 2868
                   }
2867 2869
                   //周一晚上
2868 2870
                   if (lastWeek[j].schedule_week == 1 && lastWeek[j].schedule_type == 3) {
2869
-                    list[i].wanshang14 = lastWeek[j].name+" "+lastWeek[i].dialysis_machine_name
2871
+                    list[i].wanshang14 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
2870 2872
                   }
2871 2873
 
2872 2874
                   //周二
2873 2875
                   if (lastWeek[j].schedule_week == 2 && lastWeek[j].schedule_type == 1) {
2874
-                    list[i].shangwu15 = lastWeek[j].name+" "+lastWeek[i].dialysis_machine_name
2876
+                    list[i].shangwu15 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
2875 2877
                   }
2876 2878
                   //周二下午
2877 2879
                   if (lastWeek[j].schedule_week == 2 && lastWeek[j].schedule_type == 2) {
2878
-                    list[i].xiawu15 = lastWeek[j].name+" "+lastWeek[i].dialysis_machine_name
2880
+                    list[i].xiawu15 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
2879 2881
                   }
2880 2882
                   //周二晚上
2881 2883
                   if (lastWeek[j].schedule_week == 2 && lastWeek[j].schedule_type == 3) {
2882
-                    list[i].wanshang15 = lastWeek[j].name+" "+lastWeek[i].dialysis_machine_name
2884
+                    list[i].wanshang15 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
2883 2885
                   }
2884 2886
 
2885 2887
                   //周三
2886 2888
                   if (lastWeek[j].schedule_week == 3 && lastWeek[j].schedule_type == 1) {
2887
-                    list[i].shangwu16 = lastWeek[j].name+" "+lastWeek[i].dialysis_machine_name
2889
+                    list[i].shangwu16 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
2888 2890
                   }
2889 2891
                   //周三下午
2890 2892
                   if (lastWeek[j].schedule_week == 3 && lastWeek[j].schedule_type == 2) {
2891
-                    list[i].xiawu16 = lastWeek[j].name+" "+lastWeek[i].dialysis_machine_name
2893
+                    list[i].xiawu16 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
2892 2894
                   }
2893 2895
                   //周三晚上
2894 2896
                   if (lastWeek[j].schedule_week == 3 && lastWeek[j].schedule_type == 3) {
2895
-                    list[i].wanshang16 = lastWeek[j].name+" "+lastWeek[i].dialysis_machine_name
2897
+                    list[i].wanshang16 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
2896 2898
                   }
2897 2899
 
2898 2900
                   //周四
2899 2901
                   if (lastWeek[j].schedule_week == 4 && lastWeek[j].schedule_type == 1) {
2900
-                    list[i].shangwu17 = lastWeek[j].name+" "+lastWeek[i].dialysis_machine_name
2902
+                    list[i].shangwu17 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
2901 2903
                   }
2902 2904
                   //周四下午
2903 2905
                   if (lastWeek[j].schedule_week == 4 && lastWeek[j].schedule_type == 2) {
2904
-                    list[i].xiawu17 = lastWeek[j].name+" "+lastWeek[i].dialysis_machine_name
2906
+                    list[i].xiawu17 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
2905 2907
                   }
2906 2908
                   //周四晚上
2907 2909
                   if (lastWeek[j].schedule_week == 4 && lastWeek[j].schedule_type == 3) {
2908
-                    list[i].wanshang17 = lastWeek[j].name+" "+lastWeek[i].dialysis_machine_name
2910
+                    list[i].wanshang17 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
2909 2911
                   }
2910 2912
 
2911 2913
                   //周五
2912 2914
                   if (lastWeek[j].schedule_week == 5 && lastWeek[j].schedule_type == 1) {
2913
-                    list[i].shangwu18 = lastWeek[j].name+" "+lastWeek[i].dialysis_machine_name
2915
+                    list[i].shangwu18 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
2914 2916
                   }
2915 2917
                   //周五下午
2916 2918
                   if (lastWeek[j].schedule_week == 5 && lastWeek[j].schedule_type == 2) {
2917
-                    list[i].xiawu18 = lastWeek[j].name+" "+lastWeek[i].dialysis_machine_name
2919
+                    list[i].xiawu18 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
2918 2920
                   }
2919 2921
                   //周五晚上
2920 2922
                   if (lastWeek[j].schedule_week == 5 && lastWeek[j].schedule_type == 3) {
2921
-                    list[i].wanshang18 = lastWeek[j].name+" "+lastWeek[i].dialysis_machine_name
2923
+                    list[i].wanshang18 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
2922 2924
                   }
2923 2925
 
2924 2926
                   //周六
2925 2927
                   if (lastWeek[j].schedule_week == 6 && lastWeek[j].schedule_type == 1) {
2926
-                    list[i].shangwu19 = lastWeek[j].name+" "+lastWeek[i].dialysis_machine_name
2928
+                    list[i].shangwu19 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
2927 2929
                   }
2928 2930
                   //周六下午
2929 2931
                   if (lastWeek[j].schedule_week == 6 && lastWeek[j].schedule_type == 2) {
2930
-                    list[i].xiawu19 = lastWeek[j].name+" "+lastWeek[i].dialysis_machine_name
2932
+                    list[i].xiawu19 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
2931 2933
                   }
2932 2934
                   //周六晚上
2933 2935
                   if (lastWeek[j].schedule_week == 6 && lastWeek[j].schedule_type == 3) {
2934
-                    list[i].wanshang19 = lastWeek[j].name+" "+lastWeek[i].dialysis_machine_name
2936
+                    list[i].wanshang19 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
2935 2937
                   }
2936 2938
 
2937 2939
                   //周日
2938 2940
                   if (lastWeek[j].schedule_week == 7 && lastWeek[j].schedule_type == 1) {
2939
-                    list[i].shangwu20 = lastWeek[j].name+" "+lastWeek[i].dialysis_machine_name
2941
+                    list[i].shangwu20 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
2940 2942
                   }
2941 2943
                   //周日下午
2942 2944
                   if (lastWeek[j].schedule_week == 7 && lastWeek[j].schedule_type == 2) {
2943
-                    list[i].xiawu20 = lastWeek[j].name+" "+lastWeek[i].dialysis_machine_name
2945
+                    list[i].xiawu20 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
2944 2946
                   }
2945 2947
                   //周日晚上
2946 2948
                   if (lastWeek[j].schedule_week == 7 && lastWeek[j].schedule_type == 3) {
2947
-                    list[i].wanshang20 = lastWeek[j].name+" "+lastWeek[i].dialysis_machine_name
2949
+                    list[i].wanshang20 = lastWeek[j].name+" "+lastWeek[j].dialysis_machine_name
2948 2950
                   }
2949 2951
                 }
2950 2952