长沙南雅打印单问题修改

src/xt_pages/dialysis/details/assessmentAfter.vue

@@ -40,7 +40,7 @@
         <li v-if="isShow('实际置换量')">
           <label>实际置换量 : </label>
           <span class="content">{{ actual_displacement }}</span>
-          <span class="unit" v-if="this.$store.getters.xt_user.template_info.template_id != 40">ml</span>
+          <span class="unit" v-if="this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21">ml</span>
           <span class="unit" v-else>L</span>
         </li>
         <li v-if="isShow('压迫后内瘘震颤')">

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -982,7 +982,7 @@
               </el-row>
 
               <el-row :gutter="20">
-                    <el-col :span="8">
+                    <el-col :span="8" v-if="isShows('处方钠')">
                         <el-form-item label="处方钠： ">
                             <el-input
                                   
@@ -991,7 +991,7 @@
                             ></el-input>
                         </el-form-item>
                     </el-col>
-                    <el-col :span="8">
+                    <el-col :span="8"  v-if="isShows('开始钠')">
                         <el-form-item label="开始钠： ">
                             <el-input
                                  
@@ -1000,7 +1000,7 @@
                             ></el-input>
                         </el-form-item>
                     </el-col>
-                    <el-col :span="8">
+                    <el-col :span="8" v-if="isShows('钠曲线')">
                         <el-form-item label="钠曲线： ">
                             <el-input
                                   
@@ -1012,8 +1012,8 @@
                 </el-row>
 
               <el-row :gutter="20">
-                    <el-col :span="24">
-                        <el-form-item label="病情处理： ">
+                    <el-col :span="24"  v-if="isShows('病情处理')">
+                        <el-form-item  label="病情处理： ">
                             <el-input
                                     type="textarea"
                                     v-model="dialysisPrescription.treatment_remark"

src/xt_pages/dialysis/doctorAdvicePrintOne.vue

@@ -16,15 +16,14 @@
                 <p style="width: 960px;text-align: right;margin: 0 auto 10px;">日期：{{ time }}</p>
                 <table class="table dialysisTable" border="1" cellspacing="0" cellpadding="0">
                     <tr>
-                    <th width="40px">姓名</th>
-                   
+                    <th width="20px">姓名</th>
                     <th width="100px">医嘱内容</th>
-                    
+                     <th width="50px">执行护士</th>
                     </tr>
                     <template v-for="(schedules, zone_name, index) in scheduleMap">
                     <tr :key="index">
                         <td>{{ zone_name }}</td>
-                       
+                        <td></td>
                         <td></td>
                        
                     </tr>
@@ -75,9 +74,11 @@
                                 {{ advice.prescribing_number
                                 }}{{ advice.prescribing_number_unit }}
                             </span>
-                          
+                            <span>{{ advice.delivery_way }}</span>
+                            <span>{{ advice.execution_frequency }}</span>
                            
                             </td>
+                            <td>{{ getName(advice.execution_staff) }}</td>
                            
                         </tr>
                         </template>
@@ -95,14 +96,15 @@
                 <p style="width: 960px;text-align: right;margin: 0 auto 10px;">日期：{{ time }}</p>
                 <table class="table dialysisTable" border="1" cellspacing="0" cellpadding="0">
                     <tr>
-                    <th width="40px">姓名</th>
+                    <th width="20px">姓名</th>
                     <th width="100px">医嘱内容</th>
-                   
+                    <th width="20px">执行护士</th>
                     </tr>
                     <template v-for="(schedules, zone_name, index) in scheduleMap">
                     <tr :key="index">
                         <td>{{ zone_name }}</td>
                         <td></td>
+                        <td></td>
                     </tr>
                     <template v-for="schedule in schedules">
                         <template v-for="(group, group_index) in schedule.new_advice">
@@ -158,9 +160,11 @@
                                 {{ advice.prescribing_number
                                 }}{{ advice.prescribing_number_unit }}
                             </span>
+                            <span>{{ advice.delivery_way }}</span>
+                            <span>{{ advice.execution_frequency }}</span>
                            
                             </td>
-                          
+                            <td>{{ getName(advice.execution_staff) }}</td>
                         </tr>
                         </template>
                     </template>

src/xt_pages/dialysis/newDoctorAdvice.vue

@@ -1478,7 +1478,7 @@ export default {
        this.requestSchedualDoctors(this.time);
      },
     handleRowClick (row) {
-     console.log("row232323232",row)
+    
     },
     tableRowClassName({row, rowIndex}) {
         row.index = rowIndex
@@ -1488,7 +1488,7 @@ export default {
        
       },
     handleCurrentChangeList(row){
-      console.log("row233232232332",row)
+     
       this.selecting_schs.push(row)
       this.current_row= row
       this.is_status = 2

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyOne.vue

@@ -1097,7 +1097,7 @@
                               </div>
                               mmol/L
                             </div>
-                            <div class="inline_block" style="margin-left: 10px">
+                            <!-- <div class="inline_block" style="margin-left: 10px">
                              透析液流量：
                               <div
                                 class="under_line"
@@ -1110,7 +1110,7 @@
                                 }}
                               </div>
                               ml/min
-                            </div>
+                            </div> -->
                           </div>
                           <div
                             class="row"

src/xt_pages/workforce/components/editTableData.vue

@@ -2257,6 +2257,7 @@ export default {
         name: null,
       },
       cellflag: 0,
+      schedulesGroup:[],
     };
   },
 
@@ -3943,8 +3944,296 @@ export default {
       this.$nextTick(() => {
         this.$refs.table.doLayout();
       });
+      
+      if(this.$store.getters.xt_user.template_info.org_id == 9671 || this.$store.getters.xt_user.template_info.org_id == 0 || this.$store.getters.xt_user.template_info.org_id == 3877){
+
+        //灌流 HD+HP
+        var Mon_M = 0
+        var Mon_A = 0
+        var Mon_N = 0
+
+        var Tue_M =0
+        var Tue_A = 0
+        var Tue_N = 0
+
+        var Wed_M = 0
+        var Wed_A = 0
+        var Wed_N = 0
+
+        var Thurs_M = 0
+        var Thurs_A = 0
+        var Thurs_N = 0
+
+        var Fri_M = 0
+        var Fri_A = 0
+        var Fri_N = 0
+
+        var Sat_M = 0
+        var Sat_A = 0
+        var Sat_N = 0
+
+        var Sun_M = 0
+        var Sun_A = 0
+        var Sun_N = 0
+
+        //血滤 HDF
+        var Mon_M_One = 0
+        var Mon_A_One = 0
+        var Mon_N_One = 0
+
+        var Tue_M_One =0
+        var Tue_A_One = 0
+        var Tue_N_One = 0
+
+        var Wed_M_One = 0
+        var Wed_A_One = 0
+        var Wed_N_One = 0
+
+        var Thurs_M_One = 0
+        var Thurs_A_One = 0
+        var Thurs_N_One = 0
+
+        var Fri_M_One = 0
+        var Fri_A_One = 0
+        var Fri_N_One = 0
+
+        var Sat_M_One = 0
+        var Sat_A_One = 0
+        var Sat_N_One = 0
+
+        var Sun_M_One = 0
+        var Sun_A_One = 0
+        var Sun_N_One= 0
+
+        if(this.schedulesGroup!=null && this.schedulesGroup.length >0){
+          
+          for(let i=0;i<this.schedulesGroup.length;i++){
+            //灌流
+            //礼拜一上午
+            if(this.schedulesGroup[i].schedule_week == 1 && this.schedulesGroup[i].schedule_type == 1 && this.schedulesGroup[i].mode_id == 3){
+              Mon_M = this.schedulesGroup[i].Count
+            }
+            //礼拜一下午
+            if(this.schedulesGroup[i].schedule_week == 1 && this.schedulesGroup[i].schedule_type == 2 && this.schedulesGroup[i].mode_id == 3){
+              Mon_A = this.schedulesGroup[i].Count
+            }
+            //礼拜一晚上
+            if(this.schedulesGroup[i].schedule_week == 1 && this.schedulesGroup[i].schedule_type == 3 && this.schedulesGroup[i].mode_id == 3){
+              Mon_N = this.schedulesGroup[i].Count
+            }
+
+            //礼拜二上午
+            if(this.schedulesGroup[i].schedule_week == 2 && this.schedulesGroup[i].schedule_type == 1 && this.schedulesGroup[i].mode_id == 3){
+              Tue_M = this.schedulesGroup[i].Count
+            }
+            //礼拜二下午
+            if(this.schedulesGroup[i].schedule_week == 2 && this.schedulesGroup[i].schedule_type == 2&& this.schedulesGroup[i].mode_id == 3){
+              Tue_A = this.schedulesGroup[i].Count
+            }
+            //礼拜二晚上
+            if(this.schedulesGroup[i].schedule_week == 2 && this.schedulesGroup[i].schedule_type == 3 && this.schedulesGroup[i].mode_id == 3){
+              Tue_N = this.schedulesGroup[i].Count
+            }
+
 
-      return sums;
+            //礼拜三上午
+            if(this.schedulesGroup[i].schedule_week == 3 && this.schedulesGroup[i].schedule_type == 1 && this.schedulesGroup[i].mode_id == 3){
+              Wed_M = this.schedulesGroup[i].Count
+            }
+            //礼拜三下午
+            if(this.schedulesGroup[i].schedule_week == 3 && this.schedulesGroup[i].schedule_type == 2 && this.schedulesGroup[i].mode_id == 3){
+              Wed_A = this.schedulesGroup[i].Count
+            }
+            //礼拜三晚上
+            if(this.schedulesGroup[i].schedule_week == 3 && this.schedulesGroup[i].schedule_type == 3 && this.schedulesGroup[i].mode_id == 3){
+              Wed_N = this.schedulesGroup[i].Count
+            }
+
+            //礼拜四上午
+            if(this.schedulesGroup[i].schedule_week == 4 && this.schedulesGroup[i].schedule_type == 1 && this.schedulesGroup[i].mode_id == 3){
+              Thurs_M = this.schedulesGroup[i].Count
+            }
+            //礼拜四下午
+            if(this.schedulesGroup[i].schedule_week == 4 && this.schedulesGroup[i].schedule_type == 2 && this.schedulesGroup[i].mode_id == 3){
+              Thurs_A = this.schedulesGroup[i].Count
+            }
+            //礼拜四晚上
+            if(this.schedulesGroup[i].schedule_week == 4 && this.schedulesGroup[i].schedule_type == 3 && this.schedulesGroup[i].mode_id == 3){
+              Thurs_N = this.schedulesGroup[i].Count
+            }
+
+            //礼拜五上午
+            if(this.schedulesGroup[i].schedule_week == 5 && this.schedulesGroup[i].schedule_type == 1 && this.schedulesGroup[i].mode_id == 3){
+              Fri_M = this.schedulesGroup[i].Count
+            }
+            //礼拜五下午
+            if(this.schedulesGroup[i].schedule_week == 5 && this.schedulesGroup[i].schedule_type == 2 && this.schedulesGroup[i].mode_id == 3){
+              Fri_A = this.schedulesGroup[i].Count
+            }
+            //礼拜五晚上
+            if(this.schedulesGroup[i].schedule_week == 5 && this.schedulesGroup[i].schedule_type == 3 && this.schedulesGroup[i].mode_id == 3){
+              Fri_N = this.schedulesGroup[i].Count
+            }
+
+
+            //礼拜六上午
+            if(this.schedulesGroup[i].schedule_week == 6 && this.schedulesGroup[i].schedule_type == 1  && this.schedulesGroup[i].mode_id == 3){
+              Sat_M = this.schedulesGroup[i].Count
+            }
+            //礼拜六下午
+            if(this.schedulesGroup[i].schedule_week == 6 && this.schedulesGroup[i].schedule_type == 2  && this.schedulesGroup[i].mode_id == 3){
+              Sat_A = this.schedulesGroup[i].Count
+            }
+            //礼拜六晚上
+            if(this.schedulesGroup[i].schedule_week == 6 && this.schedulesGroup[i].schedule_type == 3  && this.schedulesGroup[i].mode_id == 3){
+              Sat_N  = this.schedulesGroup[i].Count
+            }
+
+            //礼拜日上午
+            if(this.schedulesGroup[i].schedule_week == 7 && this.schedulesGroup[i].schedule_type == 1  && this.schedulesGroup[i].mode_id == 3){
+              Sun_M = this.schedulesGroup[i].Count
+            }
+            //礼拜日下午
+            if(this.schedulesGroup[i].schedule_week == 7 && this.schedulesGroup[i].schedule_type == 2  && this.schedulesGroup[i].mode_id == 3){
+              Sun_A = this.schedulesGroup[i].Count
+            }
+            //礼拜日晚上
+            if(this.schedulesGroup[i].schedule_week == 7 && this.schedulesGroup[i].schedule_type == 3  && this.schedulesGroup[i].mode_id == 3){
+              Sun_N = this.schedulesGroup[i].Count
+            }
+
+
+            //血滤
+              //礼拜一上午
+            if(this.schedulesGroup[i].schedule_week == 1 && this.schedulesGroup[i].schedule_type == 1 && this.schedulesGroup[i].mode_id == 2){
+              Mon_M_One = this.schedulesGroup[i].Count
+            }
+            //礼拜一下午
+            if(this.schedulesGroup[i].schedule_week == 1 && this.schedulesGroup[i].schedule_type == 2 && this.schedulesGroup[i].mode_id == 2){
+              Mon_A_One = this.schedulesGroup[i].Count
+            }
+            //礼拜一晚上
+            if(this.schedulesGroup[i].schedule_week == 1 && this.schedulesGroup[i].schedule_type == 3 && this.schedulesGroup[i].mode_id == 2){
+              Mon_N_One = this.schedulesGroup[i].Count
+            }
+
+            //礼拜二上午
+            if(this.schedulesGroup[i].schedule_week == 2 && this.schedulesGroup[i].schedule_type == 1 && this.schedulesGroup[i].mode_id == 2){
+              Tue_M_One = this.schedulesGroup[i].Count
+            }
+            //礼拜二下午
+            if(this.schedulesGroup[i].schedule_week == 2 && this.schedulesGroup[i].schedule_type == 2&& this.schedulesGroup[i].mode_id == 2){
+              Tue_A_One = this.schedulesGroup[i].Count
+            }
+            //礼拜二晚上
+            if(this.schedulesGroup[i].schedule_week == 2 && this.schedulesGroup[i].schedule_type == 3 && this.schedulesGroup[i].mode_id == 2){
+              Tue_N_One = this.schedulesGroup[i].Count
+            }
+
+
+            //礼拜三上午
+            if(this.schedulesGroup[i].schedule_week == 3 && this.schedulesGroup[i].schedule_type == 1 && this.schedulesGroup[i].mode_id == 2){
+              Wed_M_One = this.schedulesGroup[i].Count
+            }
+            //礼拜三下午
+            if(this.schedulesGroup[i].schedule_week == 3 && this.schedulesGroup[i].schedule_type == 2 && this.schedulesGroup[i].mode_id == 2){
+              Wed_A_One = this.schedulesGroup[i].Count
+            }
+            //礼拜三晚上
+            if(this.schedulesGroup[i].schedule_week == 3 && this.schedulesGroup[i].schedule_type == 3 && this.schedulesGroup[i].mode_id == 2){
+              Wed_N_One = this.schedulesGroup[i].Count
+            }
+
+            //礼拜四上午
+            if(this.schedulesGroup[i].schedule_week == 4 && this.schedulesGroup[i].schedule_type == 1 && this.schedulesGroup[i].mode_id == 2){
+              Thurs_M_One = this.schedulesGroup[i].Count
+              
+            }
+            //礼拜四下午
+            if(this.schedulesGroup[i].schedule_week == 4 && this.schedulesGroup[i].schedule_type == 2 && this.schedulesGroup[i].mode_id == 2){
+              Thurs_A_One = this.schedulesGroup[i].Count
+            }
+            //礼拜四晚上
+            if(this.schedulesGroup[i].schedule_week == 4 && this.schedulesGroup[i].schedule_type == 3 && this.schedulesGroup[i].mode_id == 2){
+              Thurs_N_One = this.schedulesGroup[i].Count
+            }
+
+            //礼拜五上午
+            if(this.schedulesGroup[i].schedule_week == 5 && this.schedulesGroup[i].schedule_type == 1 && this.schedulesGroup[i].mode_id == 2){
+              Fri_M_One = this.schedulesGroup[i].Count
+            }
+            //礼拜五下午
+            if(this.schedulesGroup[i].schedule_week == 5 && this.schedulesGroup[i].schedule_type == 2 && this.schedulesGroup[i].mode_id == 2){
+              Fri_A_One = this.schedulesGroup[i].Count
+            }
+            //礼拜五晚上
+            if(this.schedulesGroup[i].schedule_week == 5 && this.schedulesGroup[i].schedule_type == 3 && this.schedulesGroup[i].mode_id == 2){
+              Fri_N_One = this.schedulesGroup[i].Count
+            }
+
+
+            //礼拜六上午
+            if(this.schedulesGroup[i].schedule_week == 6 && this.schedulesGroup[i].schedule_type == 1 && this.schedulesGroup[i].mode_id == 2){
+              Sat_M_One = this.schedulesGroup[i].Count
+            }
+            //礼拜六下午
+            if(this.schedulesGroup[i].schedule_week == 6 && this.schedulesGroup[i].schedule_type == 2 && this.schedulesGroup[i].mode_id == 2){
+              Sat_A_One = this.schedulesGroup[i].Count
+            }
+            //礼拜六晚上
+            if(this.schedulesGroup[i].schedule_week == 6 && this.schedulesGroup[i].schedule_type == 3 && this.schedulesGroup[i].mode_id == 2){
+             Sat_N_One  = this.schedulesGroup[i].Count
+            }
+
+            //礼拜日上午
+            if(this.schedulesGroup[i].schedule_week == 7 && this.schedulesGroup[i].schedule_type == 1 && this.schedulesGroup[i].mode_id == 2){
+              Sun_M_One = this.schedulesGroup[i].Count
+            }
+            //礼拜日下午
+            if(this.schedulesGroup[i].schedule_week == 7 && this.schedulesGroup[i].schedule_type == 2 && this.schedulesGroup[i].mode_id == 2){
+              Sun_A_One = this.schedulesGroup[i].Count
+            }
+            //礼拜日晚上
+            if(this.schedulesGroup[i].schedule_week == 7 && this.schedulesGroup[i].schedule_type == 3 && this.schedulesGroup[i].mode_id == 2){
+              Sun_N_One = this.schedulesGroup[i].Count
+            }
+
+        }
+      }
+
+            sums[2] = "总人数:"+ sums[2]  +"人"+ " " + "灌流:"+Mon_M +"人" +" "+ "血滤:" + Mon_M_One +"人"
+            sums[3] = "总人数:"+ sums[3]  +"人"+ " " + "灌流:"+Mon_A +"人" +" "+ "血滤:" + Mon_A_One  +"人" 
+            sums[4] = "总人数:"+ sums[4]  +"人"+ " " + "灌流:"+Mon_N +"人" +" "+ "血滤:" + Mon_N_One +"人"  
+
+            sums[5] = "总人数:"+ sums[5]  +"人"+ " " + "灌流:"+Tue_M +"人" +" "+ "血滤:" + Tue_M_One +"人"  
+            sums[6] = "总人数:"+ sums[6]  +"人"+ " " + "灌流:"+Tue_A +"人" +" "+ "血滤:" + Tue_A_One +"人"  
+            sums[7] = "总人数:"+ sums[7]  +"人"+ " " + "灌流:"+Tue_N +"人" +" "+ "血滤:" + Tue_N_One +"人"  
+
+            sums[8] = "总人数:"+ sums[8]  +"人"+ " " + "灌流:"+Wed_M +"人" +" "+ "血滤:" + Wed_M_One +"人"  
+            sums[9] = "总人数:"+ sums[9]  +"人"+ " " + "灌流:"+Wed_A +"人" +" "+ "血滤:" + Wed_A_One  +"人"  
+            sums[10] = "总人数:"+ sums[10]  +"人"+ " " + "灌流:"+Wed_N +"人" +" "+ "血滤:" +Wed_N_One +"人"  
+
+            sums[11] = "总人数:"+ sums[11]  +"人"+ " " + "灌流:"+Thurs_M +"人" +" "+ "血滤:" + Thurs_M_One +"人"  
+            sums[12] = "总人数:"+ sums[12]  +"人"+ " " + "灌流:"+Thurs_A +"人" +" "+ "血滤:" + Thurs_A_One  +"人"  
+            sums[13] = "总人数:"+ sums[13]  +"人"+ " " + "灌流:"+Thurs_N +"人" +" "+ "血滤:" + Thurs_N_One +"人"  
+
+            sums[14] = "总人数:"+ sums[14]  +"人"+ " " + "灌流:"+Fri_M +"人" +" "+ "血滤:" + Fri_M_One +"人"  
+            sums[15] = "总人数:"+ sums[15]  +"人"+ " " + "灌流:"+Fri_A +"人" +" "+ "血滤:" + Fri_A_One +"人"  
+            sums[16] = "总人数:"+ sums[16]  +"人"+ " " + "灌流:"+Fri_N +"人" +" "+ "血滤:" + Fri_N_One +"人"  
+
+            sums[17] = "总人数:"+ sums[17]  +"人"+ " " + "灌流:"+Sat_M +"人" +" "+ "血滤:" + Sat_M_One +"人"  
+            sums[18] = "总人数:"+ sums[18]  +"人"+ " " + "灌流:"+Sat_A +"人" +" "+ "血滤:" + Sat_A_One +"人"  
+            sums[19] = "总人数:"+ sums[19]  +"人"+ " " + "灌流:"+Sat_N +"人" +" "+ "血滤:" + Sat_N_One +"人"  
+
+            sums[20] = "总人数:"+ sums[20]  +"人"+ " " + "灌流:"+Sun_M +"人" +" "+ "血滤:" + Sun_M_One +"人"  
+            sums[21] = "总人数:"+ sums[21]  +"人"+ " " + "灌流:"+Sun_A +"人" +" "+ "血滤:" + Sun_A_One +"人"  
+            sums[22] = "总人数:"+ sums[22]  +"人"+ " " + "灌流:"+Sun_N +"人" +" "+ "血滤:" + Sun_N_One +"人"  
+            return sums;
+        }
+
+      if(this.$store.getters.xt_user.template_info.org_id != 9671 && this.$store.getters.xt_user.template_info.org_id != 0 && this.$store.getters.xt_user.template_info.org_id != 3877){
+        return sums;
+      }
     },
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
       var that = this;
@@ -4013,7 +4302,8 @@ export default {
           this.weekDays = response.data.data.days;
           this.toDay = response.data.data.today;
           var theSchedules = response.data.data.schdules;
-
+          var schedulesGroup = response.data.data.schedulesGroup
+          this.schedulesGroup = schedulesGroup
           var that = this;
 
           this.scheduleZone.forEach(function (zone, index) {

src/xt_pages/workforce/components/nextTableWeeks.vue

@@ -683,7 +683,7 @@ export default {
             path: '/schedule/remind/print/setting/one?week_type=' + this.week_type + '&week_time=' + this.week_time + '&zone=' + str + '&prestatus=' + this.pre_status+"&type="+2
           })
           }
-        if(this.org_id!=9671 && this.org_id!=9675 && this.org_id!=10340){
+        if(this.org_id!=9671 && this.org_id!=9675 && this.org_id!=10340 && this.org_id!=0){
           var zone = this.zone
         var newArr = []
         for(let i=0;i<this.zoneList.length;i++){

src/xt_pages/workforce/components/tableData.vue

@@ -387,7 +387,7 @@
           ></schedule-item>
         </el-table-column>
       </el-table-column>
-
+    
 <!--      <el-table-column-->
 <!--        prop="total"-->
 <!--        label="总数"-->
@@ -870,7 +870,7 @@ export default {
       isShowShangWu:true,
       isShowXiaWu:true,
       isShowWanShang:true,
-
+      schedulesGroup:[]
 
     };
   },
@@ -895,7 +895,7 @@ export default {
         this.isShowXiaWu = true
         this.isShowWanShang = true
       }
-      console.log(this.source_scheduleZone)
+      // console.log(this.source_scheduleZone)
       //删除对应数据
       var list = this.source_scheduleZone
       var list1 = this.source_scheduleZone
@@ -968,9 +968,9 @@ export default {
 
 
     }, week_type:function () {
-      console.log(this.week_type)
-      console.log(this.schedule_type)
-      console.log(this.scheduleZone)
+      // console.log(this.week_type)
+      // console.log(this.schedule_type)
+      // console.log(this.scheduleZone)
 
       this.isShowOne = false
       this.isShowTwo = false
@@ -1064,7 +1064,7 @@ export default {
           var partitions = response.data.data.partitions
           console.log("partitions",partitions)
           this.theWeek.thisWeek = response.data.data.theWeek
-          console.log("这个周",response.data.data.theWeek)
+          
           this.theWeek.lastWeek = this.theWeek.thisWeek - 1
           this.theWeek.nextWeek = this.theWeek.thisWeek + 1
           this.theWeek.nextTwoWeek = this.theWeek.thisWeek + 2
@@ -1086,6 +1086,7 @@ export default {
                   cut: jihao.number,
                   jihao_id: jihao.id,
                   sort:jihao.sort,
+
                   Mon_M: {
                     schedule_id: 0,
                     mode_id: 0,
@@ -1093,6 +1094,8 @@ export default {
                     patient_id: 0,
                     patient: '',
                     dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
                   },
                   Mon_A: {
                     schedule_id: 0,
@@ -1101,6 +1104,8 @@ export default {
                     patient_id: 0,
                     patient: '',
                     dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
                   },
                   Mon_N: {
                     schedule_id: 0,
@@ -1109,6 +1114,8 @@ export default {
                     patient_id: 0,
                     patient: '',
                     dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
                   },
                   Tue_M: {
                     schedule_id: 0,
@@ -1117,6 +1124,8 @@ export default {
                     patient_id: 0,
                     patient: '',
                     dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
                   },
                   Tue_A: {
                     schedule_id: 0,
@@ -1125,6 +1134,8 @@ export default {
                     patient_id: 0,
                     patient: '',
                     dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
                   },
                   Tue_N: {
                     schedule_id: 0,
@@ -1133,6 +1144,8 @@ export default {
                     patient_id: 0,
                     patient: '',
                     dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
                   },
                   Wed_M: {
                     schedule_id: 0,
@@ -1141,6 +1154,8 @@ export default {
                     patient_id: 0,
                     patient: '',
                     dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
                   },
                   Wed_A: {
                     schedule_id: 0,
@@ -1149,6 +1164,8 @@ export default {
                     patient_id: 0,
                     patient: '',
                     dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
                   },
                   Wed_N: {
                     schedule_id: 0,
@@ -1157,6 +1174,8 @@ export default {
                     patient_id: 0,
                     patient: '',
                     dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
                   },
                   Thurs_M: {
                     schedule_id: 0,
@@ -1165,6 +1184,8 @@ export default {
                     patient_id: 0,
                     patient: '',
                     dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
                   },
                   Thurs_A: {
                     schedule_id: 0,
@@ -1173,6 +1194,8 @@ export default {
                     patient_id: 0,
                     patient: '',
                     dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
                   },
                   Thurs_N: {
                     schedule_id: 0,
@@ -1181,6 +1204,8 @@ export default {
                     patient_id: 0,
                     patient: '',
                     dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
                   },
                   Fri_M: {
                     schedule_id: 0,
@@ -1189,6 +1214,8 @@ export default {
                     patient_id: 0,
                     patient: '',
                     dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
                   },
                   Fri_A: {
                     schedule_id: 0,
@@ -1197,6 +1224,8 @@ export default {
                     patient_id: 0,
                     patient: '',
                     dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
                   },
                   Fri_N: {
                     schedule_id: 0,
@@ -1205,6 +1234,8 @@ export default {
                     patient_id: 0,
                     patient: '',
                     dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
                   },
                   Sat_M: {
                     schedule_id: 0,
@@ -1213,6 +1244,8 @@ export default {
                     patient_id: 0,
                     patient: '',
                     dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
                   },
                   Sat_A: {
                     schedule_id: 0,
@@ -1221,6 +1254,8 @@ export default {
                     patient_id: 0,
                     patient: '',
                     dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
                   },
                   Sat_N: {
                     schedule_id: 0,
@@ -1229,6 +1264,8 @@ export default {
                     patient_id: 0,
                     patient: '',
                     dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
                   },
                   Sun_A: {
                     schedule_id: 0,
@@ -1237,6 +1274,8 @@ export default {
                     patient_id: 0,
                     patient: '',
                     dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
                   },
                   Sun_N: {
                     schedule_id: 0,
@@ -1245,6 +1284,8 @@ export default {
                     patient_id: 0,
                     patient: '',
                     dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
                   },
                   Sun_M: {
                     schedule_id: 0,
@@ -1253,6 +1294,8 @@ export default {
                     patient_id: 0,
                     patient: '',
                     dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
                   },
                   total: 0
                 }
@@ -1262,9 +1305,10 @@ export default {
               })
             })
           }
-          console.log("34455555566666",this.scheduleZone)
+          
           this.scheduleZone.sort(this.compare('sort'))
           this.source_scheduleZone = this.scheduleZone
+          console.log("34455555566666",this.source_scheduleZone)
         })
      },
 
@@ -1312,9 +1356,13 @@ export default {
       this.getSchedulePatients();
     },
     getSummaries(param) {
+    
+     
       const { columns, data } = param;
       const sums = [];
+    
       columns.forEach((column, index) => {
+       
         if (index === 0 ) {
           sums[index] = "总数";
           return;
@@ -1325,20 +1373,7 @@ export default {
         }
 
         const values = data.map(item => item[column.property]);
-        console.log(values)
-        // if (index === 23) {
-        //   sums[index] = values.reduce((prev, curr) => {
-        //     const value = Number(curr);
-        //     if (!isNaN(value)) {
-        //       return prev + curr;
-        //     } else {
-        //       return prev;
-        //     }
-        //   }, 0);
-        //   sums[index];
-        //   return;
-        // }
-
+        
         sums[index] = values.reduce((prev, curr) => {
           if (typeof curr["mode_id"] === "undefined") {
             return prev;
@@ -1355,8 +1390,296 @@ export default {
       this.$nextTick(() => {
         this.$refs.table.doLayout();
       });
+    if(this.$store.getters.xt_user.template_info.org_id == 9671 || this.$store.getters.xt_user.template_info.org_id == 0 || this.$store.getters.xt_user.template_info.org_id == 3877){
+
+      //灌流 HD+HP
+      var Mon_M = 0
+      var Mon_A = 0
+      var Mon_N = 0
+
+      var Tue_M =0
+      var Tue_A = 0
+      var Tue_N = 0
+
+      var Wed_M = 0
+      var Wed_A = 0
+      var Wed_N = 0
+
+      var Thurs_M = 0
+      var Thurs_A = 0
+      var Thurs_N = 0
+
+      var Fri_M = 0
+      var Fri_A = 0
+      var Fri_N = 0
+
+      var Sat_M = 0
+      var Sat_A = 0
+      var Sat_N = 0
+
+      var Sun_M = 0
+      var Sun_A = 0
+      var Sun_N = 0
+
+      //血滤 HDF
+      var Mon_M_One = 0
+      var Mon_A_One = 0
+      var Mon_N_One = 0
+
+      var Tue_M_One =0
+      var Tue_A_One = 0
+      var Tue_N_One = 0
+
+      var Wed_M_One = 0
+      var Wed_A_One = 0
+      var Wed_N_One = 0
+
+      var Thurs_M_One = 0
+      var Thurs_A_One = 0
+      var Thurs_N_One = 0
+
+      var Fri_M_One = 0
+      var Fri_A_One = 0
+      var Fri_N_One = 0
+
+      var Sat_M_One = 0
+      var Sat_A_One = 0
+      var Sat_N_One = 0
+
+      var Sun_M_One = 0
+      var Sun_A_One = 0
+      var Sun_N_One= 0
+
+      if(this.schedulesGroup!=null && this.schedulesGroup.length >0){
+        
+        for(let i=0;i<this.schedulesGroup.length;i++){
+          //灌流
+          //礼拜一上午
+          if(this.schedulesGroup[i].schedule_week == 1 && this.schedulesGroup[i].schedule_type == 1 && this.schedulesGroup[i].mode_id == 3){
+            Mon_M = this.schedulesGroup[i].Count
+          }
+           //礼拜一下午
+           if(this.schedulesGroup[i].schedule_week == 1 && this.schedulesGroup[i].schedule_type == 2 && this.schedulesGroup[i].mode_id == 3){
+            Mon_A = this.schedulesGroup[i].Count
+          }
+           //礼拜一晚上
+           if(this.schedulesGroup[i].schedule_week == 1 && this.schedulesGroup[i].schedule_type == 3 && this.schedulesGroup[i].mode_id == 3){
+            Mon_N = this.schedulesGroup[i].Count
+          }
+
+           //礼拜二上午
+           if(this.schedulesGroup[i].schedule_week == 2 && this.schedulesGroup[i].schedule_type == 1 && this.schedulesGroup[i].mode_id == 3){
+            Tue_M = this.schedulesGroup[i].Count
+          }
+           //礼拜二下午
+           if(this.schedulesGroup[i].schedule_week == 2 && this.schedulesGroup[i].schedule_type == 2&& this.schedulesGroup[i].mode_id == 3){
+            Tue_A = this.schedulesGroup[i].Count
+          }
+           //礼拜二晚上
+           if(this.schedulesGroup[i].schedule_week == 2 && this.schedulesGroup[i].schedule_type == 3 && this.schedulesGroup[i].mode_id == 3){
+            Tue_N = this.schedulesGroup[i].Count
+          }
+
+
+          //礼拜三上午
+          if(this.schedulesGroup[i].schedule_week == 3 && this.schedulesGroup[i].schedule_type == 1 && this.schedulesGroup[i].mode_id == 3){
+            Wed_M = this.schedulesGroup[i].Count
+          }
+           //礼拜三下午
+           if(this.schedulesGroup[i].schedule_week == 3 && this.schedulesGroup[i].schedule_type == 2 && this.schedulesGroup[i].mode_id == 3){
+            Wed_A = this.schedulesGroup[i].Count
+          }
+           //礼拜三晚上
+           if(this.schedulesGroup[i].schedule_week == 3 && this.schedulesGroup[i].schedule_type == 3 && this.schedulesGroup[i].mode_id == 3){
+            Wed_N = this.schedulesGroup[i].Count
+          }
+
+           //礼拜四上午
+          if(this.schedulesGroup[i].schedule_week == 4 && this.schedulesGroup[i].schedule_type == 1 && this.schedulesGroup[i].mode_id == 3){
+            Thurs_M = this.schedulesGroup[i].Count
+          }
+           //礼拜四下午
+           if(this.schedulesGroup[i].schedule_week == 4 && this.schedulesGroup[i].schedule_type == 2 && this.schedulesGroup[i].mode_id == 3){
+            Thurs_A = this.schedulesGroup[i].Count
+          }
+           //礼拜四晚上
+           if(this.schedulesGroup[i].schedule_week == 4 && this.schedulesGroup[i].schedule_type == 3 && this.schedulesGroup[i].mode_id == 3){
+            Thurs_N = this.schedulesGroup[i].Count
+          }
+
+           //礼拜五上午
+          if(this.schedulesGroup[i].schedule_week == 5 && this.schedulesGroup[i].schedule_type == 1 && this.schedulesGroup[i].mode_id == 3){
+            Fri_M = this.schedulesGroup[i].Count
+          }
+           //礼拜五下午
+           if(this.schedulesGroup[i].schedule_week == 5 && this.schedulesGroup[i].schedule_type == 2 && this.schedulesGroup[i].mode_id == 3){
+            Fri_A = this.schedulesGroup[i].Count
+          }
+           //礼拜五晚上
+           if(this.schedulesGroup[i].schedule_week == 5 && this.schedulesGroup[i].schedule_type == 3 && this.schedulesGroup[i].mode_id == 3){
+            Fri_N = this.schedulesGroup[i].Count
+          }
+
+
+          //礼拜六上午
+           if(this.schedulesGroup[i].schedule_week == 6 && this.schedulesGroup[i].schedule_type == 1  && this.schedulesGroup[i].mode_id == 3){
+            Sat_M = this.schedulesGroup[i].Count
+          }
+           //礼拜六下午
+           if(this.schedulesGroup[i].schedule_week == 6 && this.schedulesGroup[i].schedule_type == 2  && this.schedulesGroup[i].mode_id == 3){
+            Sat_A = this.schedulesGroup[i].Count
+          }
+           //礼拜六晚上
+           if(this.schedulesGroup[i].schedule_week == 6 && this.schedulesGroup[i].schedule_type == 3  && this.schedulesGroup[i].mode_id == 3){
+            Sat_N = this.schedulesGroup[i].Count
+          }
+
+           //礼拜日上午
+          if(this.schedulesGroup[i].schedule_week == 7 && this.schedulesGroup[i].schedule_type == 1  && this.schedulesGroup[i].mode_id == 3){
+            Sun_M = this.schedulesGroup[i].Count
+          }
+           //礼拜日下午
+           if(this.schedulesGroup[i].schedule_week == 7 && this.schedulesGroup[i].schedule_type == 2  && this.schedulesGroup[i].mode_id == 3){
+            Sun_A = this.schedulesGroup[i].Count
+          }
+           //礼拜日晚上
+           if(this.schedulesGroup[i].schedule_week == 7 && this.schedulesGroup[i].schedule_type == 3  && this.schedulesGroup[i].mode_id == 3){
+            Sun_N = this.schedulesGroup[i].Count
+          }
+
+
+           //血滤
+            //礼拜一上午
+          if(this.schedulesGroup[i].schedule_week == 1 && this.schedulesGroup[i].schedule_type == 1 && this.schedulesGroup[i].mode_id == 2){
+            Mon_M_One = this.schedulesGroup[i].Count
+          }
+           //礼拜一下午
+           if(this.schedulesGroup[i].schedule_week == 1 && this.schedulesGroup[i].schedule_type == 2 && this.schedulesGroup[i].mode_id == 2){
+            Mon_A_One = this.schedulesGroup[i].Count
+          }
+           //礼拜一晚上
+           if(this.schedulesGroup[i].schedule_week == 1 && this.schedulesGroup[i].schedule_type == 3 && this.schedulesGroup[i].mode_id == 2){
+            Mon_N_One = this.schedulesGroup[i].Count
+          }
+
+           //礼拜二上午
+           if(this.schedulesGroup[i].schedule_week == 2 && this.schedulesGroup[i].schedule_type == 1 && this.schedulesGroup[i].mode_id == 2){
+            Tue_M_One = this.schedulesGroup[i].Count
+          }
+           //礼拜二下午
+           if(this.schedulesGroup[i].schedule_week == 2 && this.schedulesGroup[i].schedule_type == 2&& this.schedulesGroup[i].mode_id == 2){
+            Tue_A_One = this.schedulesGroup[i].Count
+          }
+           //礼拜二晚上
+           if(this.schedulesGroup[i].schedule_week == 2 && this.schedulesGroup[i].schedule_type == 3 && this.schedulesGroup[i].mode_id == 2){
+            Tue_N_One = this.schedulesGroup[i].Count
+          }
+
+
+          //礼拜三上午
+          if(this.schedulesGroup[i].schedule_week == 3 && this.schedulesGroup[i].schedule_type == 1 && this.schedulesGroup[i].mode_id == 2){
+            Wed_M_One = this.schedulesGroup[i].Count
+          }
+           //礼拜三下午
+           if(this.schedulesGroup[i].schedule_week == 3 && this.schedulesGroup[i].schedule_type == 2 && this.schedulesGroup[i].mode_id == 2){
+            Wed_A_One = this.schedulesGroup[i].Count
+          }
+           //礼拜三晚上
+           if(this.schedulesGroup[i].schedule_week == 3 && this.schedulesGroup[i].schedule_type == 3 && this.schedulesGroup[i].mode_id == 2){
+            Wed_N_One = this.schedulesGroup[i].Count
+          }
 
+           //礼拜四上午
+          if(this.schedulesGroup[i].schedule_week == 4 && this.schedulesGroup[i].schedule_type == 1 && this.schedulesGroup[i].mode_id == 2){
+            Thurs_M_One = this.schedulesGroup[i].Count
+            
+          }
+           //礼拜四下午
+           if(this.schedulesGroup[i].schedule_week == 4 && this.schedulesGroup[i].schedule_type == 2 && this.schedulesGroup[i].mode_id == 2){
+            Thurs_A_One = this.schedulesGroup[i].Count
+          }
+           //礼拜四晚上
+           if(this.schedulesGroup[i].schedule_week == 4 && this.schedulesGroup[i].schedule_type == 3 && this.schedulesGroup[i].mode_id == 2){
+            Thurs_N_One = this.schedulesGroup[i].Count
+          }
+
+           //礼拜五上午
+          if(this.schedulesGroup[i].schedule_week == 5 && this.schedulesGroup[i].schedule_type == 1 && this.schedulesGroup[i].mode_id == 2){
+            Fri_M_One = this.schedulesGroup[i].Count
+          }
+           //礼拜五下午
+           if(this.schedulesGroup[i].schedule_week == 5 && this.schedulesGroup[i].schedule_type == 2 && this.schedulesGroup[i].mode_id == 2){
+            Fri_A_One = this.schedulesGroup[i].Count
+          }
+           //礼拜五晚上
+           if(this.schedulesGroup[i].schedule_week == 5 && this.schedulesGroup[i].schedule_type == 3 && this.schedulesGroup[i].mode_id == 2){
+            Fri_N_One = this.schedulesGroup[i].Count
+          }
+
+
+          //礼拜六上午
+           if(this.schedulesGroup[i].schedule_week == 6 && this.schedulesGroup[i].schedule_type == 1 && this.schedulesGroup[i].mode_id == 2){
+            Sat_M_One = this.schedulesGroup[i].Count
+          }
+           //礼拜六下午
+           if(this.schedulesGroup[i].schedule_week == 6 && this.schedulesGroup[i].schedule_type == 2 && this.schedulesGroup[i].mode_id == 2){
+            Sat_A_One = this.schedulesGroup[i].Count
+          }
+           //礼拜六晚上
+           if(this.schedulesGroup[i].schedule_week == 6 && this.schedulesGroup[i].schedule_type == 3 && this.schedulesGroup[i].mode_id == 2){
+            Sat_N_One = this.schedulesGroup[i].Count
+          }
+
+           //礼拜日上午
+          if(this.schedulesGroup[i].schedule_week == 7 && this.schedulesGroup[i].schedule_type == 1 && this.schedulesGroup[i].mode_id == 2){
+            Sun_M_One = this.schedulesGroup[i].Count
+          }
+           //礼拜日下午
+           if(this.schedulesGroup[i].schedule_week == 7 && this.schedulesGroup[i].schedule_type == 2 && this.schedulesGroup[i].mode_id == 2){
+            Sun_A_One = this.schedulesGroup[i].Count
+          }
+           //礼拜日晚上
+           if(this.schedulesGroup[i].schedule_week == 7 && this.schedulesGroup[i].schedule_type == 3 && this.schedulesGroup[i].mode_id == 2){
+            Sun_N_One = this.schedulesGroup[i].Count
+          }
+  
+        }
+      }
+
+      sums[2] = "总人数:"+ sums[2]  +"人"+ " " + "灌流:"+Mon_M +"人" +" "+ "血滤:" + Mon_M_One +"人"
+      sums[3] = "总人数:"+ sums[3]  +"人"+ " " + "灌流:"+Mon_A +"人" +" "+ "血滤:" + Mon_A_One +"人" 
+      sums[4] = "总人数:"+ sums[4]  +"人"+ " " + "灌流:"+Mon_N +"人" +" "+ "血滤:" + Mon_N_One +"人"  
+
+      sums[5] = "总人数:"+ sums[5]  +"人"+ " " + "灌流:"+Tue_M +"人" +" "+ "血滤:" + Tue_M_One +"人"  
+      sums[6] = "总人数:"+ sums[6]  +"人"+ " " + "灌流:"+Tue_A +"人" +" "+ "血滤:" + Tue_A_One +"人"  
+      sums[7] = "总人数:"+ sums[7]  +"人"+ " " + "灌流:"+Tue_N +"人" +" "+ "血滤:" + Tue_N_One +"人"  
+
+      sums[8] = "总人数:"+ sums[8]  +"人"+ " " + "灌流:"+Wed_M +"人" +" "+ "血滤:" + Wed_M_One +"人"  
+      sums[9] = "总人数:"+ sums[9]  +"人"+ " " + "灌流:"+ Wed_A +"人" +" "+ "血滤:" + Wed_A_One +"人"  
+      sums[10] = "总人数:"+ sums[10]  +"人"+ " " + "灌流:"+Wed_N +"人" +" "+ "血滤:" +Wed_N_One +"人"  
+
+      sums[11] = "总人数:"+ sums[11]  +"人"+ " " + "灌流:"+Thurs_M +"人" +" "+ "血滤:" + Thurs_M_One +"人"  
+      sums[12] = "总人数:"+ sums[12]  +"人"+ " " + "灌流:"+Thurs_A +"人" +" "+ "血滤:" + Thurs_A_One +"人"  
+      sums[13] = "总人数:"+ sums[13]  +"人"+ " " + "灌流:"+Thurs_N +"人" +" "+ "血滤:" + Thurs_N_One +"人"  
+
+      sums[14] = "总人数:"+ sums[14]  +"人"+ " " + "灌流:"+Fri_M +"人" +" "+ "血滤:" + Fri_M_One +"人"  
+      sums[15] = "总人数:"+ sums[15]  +"人"+ " " + "灌流:"+Fri_A +"人" +" "+ "血滤:" + Fri_A_One +"人"  
+      sums[16] = "总人数:"+ sums[16]  +"人"+ " " + "灌流:"+Fri_N +"人" +" "+ "血滤:" + Fri_N_One +"人"  
+
+      sums[17] = "总人数:"+ sums[17]  +"人"+ " " + "灌流:"+Sat_M +"人" +" "+ "血滤:" + Sat_M_One +"人"  
+      sums[18] = "总人数:"+ sums[18]  +"人"+ " " + "灌流:"+Sat_A +"人" +" "+ "血滤:" + Sat_A_One +"人"  
+      sums[19] = "总人数:"+ sums[19]  +"人"+ " " + "灌流:"+Sat_N +"人" +" "+ "血滤:" + Sat_N_One +"人"  
+
+      sums[20] = "总人数:"+ sums[20]  +"人"+ " " + "灌流:"+Sun_M +"人" +" "+ "血滤:" + Sun_M_One +"人"  
+      sums[21] = "总人数:"+ sums[21]  +"人"+ " " + "灌流:"+Sun_A +"人" +" "+ "血滤:" + Sun_A_One +"人"  
+      sums[22] = "总人数:"+ sums[22]  +"人"+ " " + "灌流:"+Sun_N +"人" +" "+ "血滤:" + Sun_N_One +"人"  
       return sums;
+
+      }
+      
+      if(this.$store.getters.xt_user.template_info.org_id != 9671 && this.$store.getters.xt_user.template_info.org_id != 0 && this.$store.getters.xt_user.template_info.org_id != 3877){
+        return sums;
+      }
     },
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
 
@@ -1426,7 +1749,13 @@ export default {
           this.weekDays = response.data.data.days;
           this.toDay = response.data.data.today;
           var theSchedules = response.data.data.schdules;
+        
+          var schedulesGroup = response.data.data.schedulesGroup
+          this.schedulesGroup = schedulesGroup
+
+
 
+     
           var that = this;
 
           this.scheduleZone.forEach(function(zone, index) {
@@ -1437,6 +1766,8 @@ export default {
               patient_id: 0,
               patient: "",
               dialysis_machine_name:"",
+              schedule_date:"",
+              Count:0,
             };
             that.scheduleZone[index].Mon_A = {
               mode_id: 0,
@@ -1444,6 +1775,8 @@ export default {
               patient_id: 0,
               patient: "",
               dialysis_machine_name:"",
+              schedule_date:"",
+              Count:0,
             };
             that.scheduleZone[index].Mon_N = {
               mode_id: 0,
@@ -1451,6 +1784,8 @@ export default {
               patient_id: 0,
               patient: "",
               dialysis_machine_name:"",
+              schedule_date:"",
+              Count:0,
             };
             that.scheduleZone[index].Tue_M = {
               mode_id: 0,
@@ -1458,6 +1793,8 @@ export default {
               patient_id: 0,
               patient: "",
               dialysis_machine_name:"",
+              schedule_date:"",
+              Count:0,
             };
             that.scheduleZone[index].Tue_A = {
               mode_id: 0,
@@ -1465,6 +1802,8 @@ export default {
               patient_id: 0,
               patient: "",
               dialysis_machine_name:"",
+              schedule_date:"",
+              Count:0,
             };
             that.scheduleZone[index].Tue_N = {
               mode_id: 0,
@@ -1472,6 +1811,8 @@ export default {
               patient_id: 0,
               patient: "",
               dialysis_machine_name:"",
+              schedule_date:"",
+              Count:0,
             };
             that.scheduleZone[index].Wed_M = {
               mode_id: 0,
@@ -1479,6 +1820,8 @@ export default {
               patient_id: 0,
               patient: "",
               dialysis_machine_name:"",
+              schedule_date:"",
+              Count:0,
             };
             that.scheduleZone[index].Wed_A = {
               mode_id: 0,
@@ -1486,6 +1829,8 @@ export default {
               patient_id: 0,
               patient: "",
               dialysis_machine_name:"",
+              schedule_date:"",
+              Count:0,
             };
             that.scheduleZone[index].Wed_N = {
               mode_id: 0,
@@ -1493,6 +1838,9 @@ export default {
               patient_id: 0,
               patient: "",
               dialysis_machine_name:"",
+              schedule_date:"",
+              Count:0,
+              
             };
             that.scheduleZone[index].Thurs_M = {
               mode_id: 0,
@@ -1500,6 +1848,8 @@ export default {
               patient_id: 0,
               patient: "",
               dialysis_machine_name:"",
+              schedule_date:"",
+              Count:0,
             };
             that.scheduleZone[index].Thurs_A = {
               mode_id: 0,
@@ -1507,6 +1857,8 @@ export default {
               patient_id: 0,
               patient: "",
               dialysis_machine_name:"",
+              schedule_date:"",
+              Count:0,
             };
             that.scheduleZone[index].Thurs_N = {
               mode_id: 0,
@@ -1514,6 +1866,8 @@ export default {
               patient_id: 0,
               patient: "",
               dialysis_machine_name:"",
+              schedule_date:"",
+              Count:0,
             };
             that.scheduleZone[index].Fri_M = {
               mode_id: 0,
@@ -1521,6 +1875,8 @@ export default {
               patient_id: 0,
               patient: "",
               dialysis_machine_name:"",
+              schedule_date:"",
+              Count:0,
             };
             that.scheduleZone[index].Fri_A = {
               mode_id: 0,
@@ -1528,6 +1884,8 @@ export default {
               patient_id: 0,
               patient: "",
               dialysis_machine_name:"",
+              schedule_date:"",
+              Count:0,
             };
             that.scheduleZone[index].Fri_N = {
               mode_id: 0,
@@ -1535,6 +1893,8 @@ export default {
               patient_id: 0,
               patient: "",
               dialysis_machine_name:"",
+              schedule_date:"",
+              Count:0,
             };
             that.scheduleZone[index].Sat_M = {
               mode_id: 0,
@@ -1542,6 +1902,8 @@ export default {
               patient_id: 0,
               patient: "",
               dialysis_machine_name:"",
+              schedule_date:"",
+              Count:0,
             };
             that.scheduleZone[index].Sat_A = {
               mode_id: 0,
@@ -1549,6 +1911,8 @@ export default {
               patient_id: 0,
               patient: "",
               dialysis_machine_name:"",
+              schedule_date:"",
+              Count:0,
             };
             that.scheduleZone[index].Sat_N = {
               mode_id: 0,
@@ -1556,6 +1920,8 @@ export default {
               patient_id: 0,
               patient: "",
               dialysis_machine_name:"",
+              schedule_date:"",
+              Count:0,
             };
             that.scheduleZone[index].Sun_A = {
               mode_id: 0,
@@ -1563,6 +1929,8 @@ export default {
               patient_id: 0,
               patient: "",
               dialysis_machine_name:"",
+              schedule_date:"",
+              Count:0,
             };
             that.scheduleZone[index].Sun_N = {
               mode_id: 0,
@@ -1570,6 +1938,8 @@ export default {
               patient_id: 0,
               patient: "",
               dialysis_machine_name:"",
+              schedule_date:"",
+              Count:0,
             };
             that.scheduleZone[index].Sun_M = {
               mode_id: 0,
@@ -1577,11 +1947,14 @@ export default {
               patient_id: 0,
               patient: "",
               dialysis_machine_name:"",
+              schedule_date:"",
+              Count:0,
             };
 
 
 
 
+
             that.scheduleZone[index].total = 0;
 
             if (response.data.data.schdules.length > 0) {
@@ -1605,11 +1978,8 @@ export default {
                       patient: schedule.patient,
                       dialysis_machine_name:schedule.dialysis_machine_name,
                       patient_contagions: schedule.patient_contagions,
-                      mode_name:
-                        typeof that.modeOptions[schedule.mode_id] ===
-                        "undefined"
-                          ? ""
-                          : that.modeOptions[schedule.mode_id].name
+                      schedule_date:schedule.schedule_date,
+                      mode_name: typeof that.modeOptions[schedule.mode_id] ==="undefined"? "": that.modeOptions[schedule.mode_id].name
                     };
                     that.scheduleZone[index].total += 1;
 
@@ -1621,7 +1991,7 @@ export default {
           });
 
           this.source_scheduleZone = this.scheduleZone
-
+          console.log("------------aaaa",this.source_scheduleZone)
         } else {
           this.$message.error("网络错误");
           return false;
@@ -2457,7 +2827,7 @@ export default {
         start_sch:first_monday,
         end_sch:end_monday,
       };
-      console.log("params",params)
+      // console.log("params",params)
       getSearchResult(params).then(response => {
         if (response.data.state == 1) {
           this.schedulePatients = response.data.data.schdules;
@@ -2676,7 +3046,7 @@ export default {
     }
     var nowDate = year + "-" + month + "-" + day
     var date = new Date(nowDate + " 00:00:00")
-    console.log("date23232323232323",date.getTime()/1000)
+   
     this.now_time = date.getTime()/1000
     this.getAllZones()
 

src/xt_pages/workforce/components/tableDataModeTwo.vue

@@ -1039,7 +1039,7 @@ export default {
             })
           })
         }
-        console.log("34455555566666",this.scheduleZone)
+        // console.log("34455555566666",this.scheduleZone)
         this.scheduleZone.sort(this.compare('sort'))
       })
     },

src/xt_pages/workforce/components/tableWeeks.vue

@@ -888,7 +888,7 @@
       ,
       signPrint() {
 
-        if(this.org_id == 9671 || this.org_id == 9675 || this.org_id == 10340){
+        if(this.org_id == 9671 || this.org_id == 9675 || this.org_id == 10340 || this.org_id == 0){
          var zone = this.zone
           console.log("zone23232",zone)
           var newArr = []

src/xt_pages/workforce/printOne.vue

@@ -46,11 +46,14 @@
                   <td :width="td_1_width">分区</td>
 
                   <td :width="td_3_width">病人姓名</td>
+
+                  <td :width="td_3_width">统计</td>
                 </tr>
               </thead>
               <tbody>
                 <tr v-for="(it, i) in item.zones" :key="i">
                   <td :width="td_1_width">
+                    总人数: {{getZonePatient(it.partition_id)}}<span v-if="getZonePatient(it.partition_id)>0">人</span><br>
                     {{ getZoneName(it.partition_id) }}
                   </td>
                   <td :width="td_3_width" valign="top">
@@ -64,6 +67,26 @@
                       </div>
                     </div>
                   </td>
+                  <td :width="td_3_width">
+                     
+                    <span v-if="getMonPatient(it.partition_id)>0 || getMonAfterPatient(it.partition_id)>0 || getNightPatient(it.partition_id) >0"></span> 血滤(HDF):<br>
+                     <span v-if="getMonPatient(it.partition_id)>0">上午:{{getMonPatient(it.partition_id)}}人</span><br>
+                      {{getMonPatientName(it.partition_id)}} <br>
+                     <span v-if="getMonAfterPatient(it.partition_id)>0">下午：{{getMonAfterPatient(it.partition_id)}}人</span>  <br>
+                       {{getMonAfterPatientName(it.partition_id) }} <br>
+                     <span v-if="getNightPatient(it.partition_id) >0">晚上：{{getNightPatient(it.partition_id)}}人 </span> <br>
+                        {{getNightPatientName(it.partition_id) }}
+
+
+                     <br>
+                     <span v-if="getMonPatientOne(it.partition_id)>0 || getMonAfterPatientOne(it.partition_id)>0 || getNightPatientOne(it.partition_id) >0">灌流(HD+HP):</span><br>
+                     <span v-if="getMonPatientOne(it.partition_id)>0">上午:{{getMonPatientOne(it.partition_id)}}人</span><br>
+                      {{getMonPatientNameOne(it.partition_id)}} <br>
+                     <span v-if="getMonAfterPatientOne(it.partition_id)>0">下午：{{getMonAfterPatientOne(it.partition_id)}}人</span>  <br>
+                       {{getMonAfterPatientNameOne(it.partition_id) }} <br>
+                     <span v-if="getNightPatientOne(it.partition_id) >0">晚上：{{getNightPatientOne(it.partition_id)}}人 </span> <br>
+                      {{getNightPatientNameOne(it.partition_id) }}
+                  </td>
                 </tr>
               </tbody>
             </table>
@@ -491,7 +514,7 @@ export default {
                 }
               }
             }
-            console.log('arr23322332', arr)
+            console.log('排班数据------------------', arr)
 
             this.tableData = arr
           }
@@ -684,6 +707,212 @@ export default {
         }
       }
       return name
+    },
+    getZonePatient(partition_id){
+       
+      var arr = []
+      if(this.list!=null && this.list.length >0){
+        for(let i=0;i<this.list.length;i++){
+           if(partition_id == this.list[i].partition_id){
+               arr.push(this.list[i])
+           }
+        }
+      }
+
+      if(arr.length >0){
+         return arr.length
+      }else{
+        return ""
+      }
+
+    },
+    getMonPatient(partition_id){
+      var arr = []
+      if(this.list!=null && this.list.length >0){
+        for(let i=0;i<this.list.length;i++){
+           if(partition_id == this.list[i].partition_id && this.list[i].mode_id == 2 && this.list[i].schedule_type ==1){
+               arr.push(this.list[i])
+           }
+        }
+      }
+      if(arr.length >0){
+         return arr.length
+      }else{
+        return ""
+      }
+    },
+    getMonPatientOne(partition_id){
+      var arr = []
+      if(this.list!=null && this.list.length >0){
+        for(let i=0;i<this.list.length;i++){
+           if(partition_id == this.list[i].partition_id && this.list[i].mode_id == 3 && this.list[i].schedule_type ==1){
+               arr.push(this.list[i])
+           }
+        }
+      }
+      if(arr.length >0){
+         return arr.length
+      }else{
+        return ""
+      }
+    },
+    getMonPatientName(partition_id){
+      var arr = []
+      if(this.list!=null && this.list.length >0){
+        for(let i=0;i<this.list.length;i++){
+           if(partition_id == this.list[i].partition_id && this.list[i].mode_id == 2 && this.list[i].schedule_type ==1){
+               arr.push(this.list[i].name)
+           }
+        }
+      }
+      if(arr.length >0){
+        var str = arr.join(",")
+        return str
+      }else{
+        return ""
+      }
+    },
+    getMonPatientNameOne(partition_id){
+      var arr = []
+      if(this.list!=null && this.list.length >0){
+        for(let i=0;i<this.list.length;i++){
+           if(partition_id == this.list[i].partition_id && this.list[i].mode_id == 3 && this.list[i].schedule_type ==1){
+               arr.push(this.list[i].name)
+           }
+        }
+      }
+      if(arr.length >0){
+        var str = arr.join(",")
+        return str
+      }else{
+        return ""
+      }
+    },
+    getMonAfterPatient(partition_id){
+      var arr = []
+      if(this.list!=null && this.list.length >0){
+        for(let i=0;i<this.list.length;i++){
+           if(partition_id == this.list[i].partition_id && this.list[i].mode_id == 2 && this.list[i].schedule_type ==2){
+               arr.push(this.list[i])
+           }
+        }
+      }
+      if(arr.length >0){
+         return arr.length
+      }else{
+        return ""
+      }
+    },
+    getMonAfterPatientOne(partition_id){
+      var arr = []
+      if(this.list!=null && this.list.length >0){
+        for(let i=0;i<this.list.length;i++){
+           if(partition_id == this.list[i].partition_id && this.list[i].mode_id == 3 && this.list[i].schedule_type ==2){
+               arr.push(this.list[i])
+           }
+        }
+      }
+      if(arr.length >0){
+         return arr.length
+      }else{
+        return ""
+      }
+    },
+    getMonAfterPatientName(partition_id){
+      var arr = []
+      if(this.list!=null && this.list.length >0){
+        for(let i=0;i<this.list.length;i++){
+           if(partition_id == this.list[i].partition_id && this.list[i].mode_id == 2 && this.list[i].schedule_type ==2){
+               arr.push(this.list[i].name)
+           }
+        }
+      }
+      if(arr.length >0){
+        var str = arr.join(",")
+        return str
+      }else{
+        return ""
+      }
+    },
+
+    getMonAfterPatientNameOne(partition_id){
+      var arr = []
+      if(this.list!=null && this.list.length >0){
+        for(let i=0;i<this.list.length;i++){
+           if(partition_id == this.list[i].partition_id && this.list[i].mode_id == 3 && this.list[i].schedule_type ==2){
+               arr.push(this.list[i].name)
+           }
+        }
+      }
+      if(arr.length >0){
+        var str = arr.join(",")
+        return str
+      }else{
+        return ""
+      }
+    },
+
+    getNightPatient(partition_id){
+      var arr = []
+      if(this.list!=null && this.list.length >0){
+        for(let i=0;i<this.list.length;i++){
+           if(partition_id == this.list[i].partition_id && this.list[i].mode_id == 2 && this.list[i].schedule_type ==3){
+               arr.push(this.list[i])
+           }
+        }
+      }
+      if(arr.length >0){
+         return arr.length
+      }else{
+        return ""
+      }
+    },
+    getNightPatientOne(partition_id){
+      var arr = []
+      if(this.list!=null && this.list.length >0){
+        for(let i=0;i<this.list.length;i++){
+           if(partition_id == this.list[i].partition_id && this.list[i].mode_id == 3 && this.list[i].schedule_type ==3){
+               arr.push(this.list[i])
+           }
+        }
+      }
+      if(arr.length >0){
+         return arr.length
+      }else{
+        return ""
+      }
+    },
+    getNightPatientName(partition_id){
+      var arr = []
+      if(this.list!=null && this.list.length >0){
+        for(let i=0;i<this.list.length;i++){
+           if(partition_id == this.list[i].partition_id && this.list[i].mode_id == 2 && this.list[i].schedule_type ==3){
+               arr.push(this.list[i].name)
+           }
+        }
+      }
+      if(arr.length >0){
+        var str = arr.join(",")
+        return str
+      }else{
+        return ""
+      }
+    },
+    getNightPatientNameOne(partition_id){
+      var arr = []
+      if(this.list!=null && this.list.length >0){
+        for(let i=0;i<this.list.length;i++){
+           if(partition_id == this.list[i].partition_id && this.list[i].mode_id == 3 && this.list[i].schedule_type ==3){
+               arr.push(this.list[i].name)
+           }
+        }
+      }
+      if(arr.length >0){
+        var str = arr.join(",")
+        return str
+      }else{
+        return ""
+      }
     }
   }
 }

src/xt_pages/workforce/remind_print_setting_one.vue

@@ -183,7 +183,7 @@
                 
                 <div class="printCell">
                   <span>
-                    分区/床号
+                    分区/床号：
                     <span  style="width:auto;">{{main_collection.zone.name}}/</span>
                     {{ main_collection.number.number }}
                     <!-- <span style="width:auto;" v-if="main_collection.schedule_type == 1">上午</span>
@@ -192,6 +192,16 @@
                   </span>
                  
                 </div>
+
+                <div class="printCell">
+                  <span>
+                    排班备注：
+                    <span  style="width:auto;">
+                      {{ main_collection.dialysis_order.schedule_remark }}
+                    </span>
+                  </span>
+                 
+                </div>
               
               </div>
            </div>
@@ -504,14 +514,14 @@
           spinner: "el-icon-loading",
           background: "rgba(0, 0, 0, 0.7)"
         });
-        var now_time = parseInt(this.week_type) * 86400 + this.start_time
+        // var now_time = parseInt(this.week_type) * 86400 + this.start_time
 
         const weekOfDay = parseInt(moment().format('E'))
         const next_monday = moment().add((7 - weekOfDay) + 1, 'days').format('YYYY-MM-DD')
         console.log('卡 is h2323233232', this.toStamp(next_monday))
         const next_sunday = moment().add((7 - weekOfDay) + 7, 'days').format('YYYY-MM-DD')
         console.log('下周日', this.toStamp(next_sunday))
-
+        var now_time = parseInt(this.week_type - 1)*86400 + (this.getTimestamp(next_monday)/1000 -28800)
         const params = {
           start_time: this.toStamp(next_monday),
           end_time: this.toStamp(next_sunday),
@@ -723,7 +733,10 @@
         const myDate = new Date(date).getTime() / 1000 - 28800
         // const stmapEg = Date.parse(myDate) / 1000
         return myDate
-      }
+      },
+      getTimestamp(time) { //把时间日期转成时间戳
+      return (new Date(time)).getTime()
+    },
 
     }
   }

src/xt_permission.js

@@ -12,19 +12,19 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-  //   store.dispatch('VerifyConfigList', []).then(() => {
-  //     next()
-  //   })
-  // }
-  // if (store.getters.permission_routers === undefined) {
-  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
-  //     next()
-  //   })
-  // } else {
-  //   next()
-  // }
-  // return
+  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
+    store.dispatch('VerifyConfigList', []).then(() => {
+      next()
+    })
+  }
+  if (store.getters.permission_routers === undefined) {
+    store.dispatch('xt_GenerateRoutes', []).then(() => {
+      next()
+    })
+  } else {
+    next()
+  }
+  return
   // 线上注释
   NProgress.start()
   // console.log(store.getters.current_role_urls.indexOf(to.path))