导出

src/api/advice.js

@@ -212,13 +212,14 @@ export function DeleteAdviceTemplate(id, template_id, parent_id) {
   });
 }
 
-export function postAdviceTemplate(params, name, advice_type) {
+export function postAdviceTemplate(params, name,sort, advice_type) {
   return request({
     url:
       "/api/advicetemplate/create?template_name=" +
       name +
       "&advice_type=" +
-      advice_type,
+      advice_type
+      +"&sort="+sort,
     method: "post",
     data: params
   });

src/xt_pages/data/druguseTemplate.vue

@@ -129,7 +129,6 @@
                 prop="amount1"
                 align="center"
                 label="药品规格">
-                <!-- {{drugDesc(scope.row)}} -->
                 <template slot-scope="scope">
                   <span v-if="scope.row.advice_desc">{{scope.row.advice_desc}}{{scope.row.drug_spec_unit}}</span>
                 </template>
@@ -189,6 +188,13 @@
                 </template>
               </el-table-column>
 
+             <el-table-column prop="blood_flow_volume" align="center" label="排序">
+                <template slot-scope="scope">
+                  <span v-if="scope.row.sort == 0"></span>
+                  <span v-if="scope.row.sort!=0">{{scope.row.sort}}</span>
+                </template>
+              </el-table-column>
+
               <el-table-column
                 align="center"
                 label="操作"
@@ -228,7 +234,9 @@
                   <el-form-item label="模版名称" style="width: 300px" prop="name">
                     <el-input v-model="form.name"></el-input>
                   </el-form-item>
-
+                 <el-form-item label="排序" style="width: 300px" prop="name">
+                    <el-input v-model="form.sort" v-type="number"></el-input>
+                  </el-form-item>
                   <el-form-item label="模版类型" prop="advice_type">
                     <el-radio-group v-model="form.advice_type">
                       <el-radio :label="0">临时</el-radio>
@@ -711,11 +719,15 @@
             <!--增删改查都请求网络类型的dialog-->
             <el-dialog title="编辑医嘱模版" :visible.sync="templateTableTwoVisible" width="800px">
               <div>
-                <!--<el-form ref="form" :model="form" :rule="formRules" label-width="100px">-->
-                <!--<el-form-item label="模版名称" style="width: 300px" prop="name">-->
-                <!--<el-input v-model="form.name" ></el-input>-->
-                <!--</el-form-item>-->
-                <!--</el-form>-->
+                <el-form ref="form" :model="form" :rule="formRules" label-width="100px">
+                  <el-form-item label="模版名称" style="width: 300px" prop="name">
+                    <el-input v-model="form.name" ></el-input>
+                  </el-form-item>
+
+                   <el-form-item label="排序" style="width: 300px" prop="name">
+                    <el-input v-model="form.sort" ></el-input>
+                   </el-form-item>
+                </el-form>
 
 
                 <div class="txsj" style="text-align: center;margin-bottom: 30px">
@@ -1448,8 +1460,8 @@
         },
         form: {
           name: '',
-          advice_type: 0
-
+          advice_type: 0,
+          sort:"",
         },
         drugwayForm: {
           name: '',
@@ -1669,11 +1681,11 @@
         const params = {
           'data': this.adviceTableData
         }
-
+       
         let name = encodeURIComponent(this.form.name)
         console.log("params",params)
-
-        postAdviceTemplate(params, name, this.form.advice_type).then(response => {
+        let sort = this.form.sort
+        postAdviceTemplate(params, name,sort, this.form.advice_type).then(response => {
 
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
@@ -1691,6 +1703,7 @@
                 }
                 object['name'] = template.name
                 object['isNoSub'] = 2
+                object['sort'] = template.sort
                 this.adviceTemplates.unshift(object)
               }
             }
@@ -2145,6 +2158,7 @@
                 object['name'] = response.data.data.advice_templates[i].name
                 object['isNoSub'] = 1
                 object['template_id'] = response.data.data.advice_templates[i].id
+                object['sort'] = response.data.data.advice_templates[i].sort
                 this.adviceTemplates.push(object)
               }
 
@@ -2158,13 +2172,15 @@
                   }
                   object['isNoSub'] = 2
                   object['name'] = response.data.data.advice_templates[i].name
+                  object['sort'] = response.data.data.advice_templates[i].sort
                   this.adviceTemplates.push(object)
+
+
                 }
               }
             }
-
-            console.log(this.adviceTemplates)
-
+             this.adviceTemplates.sort(this.sortData)
+             console.log("列表",this.adviceTemplates)
             // 处理单元格合并的数据
             this.handleSpanTempArr()
           }
@@ -2462,7 +2478,8 @@
             return 'success-row'
           }
         }
-      }, cellMouseEnter: function(row, column, cell, event) {
+      }, 
+      cellMouseEnter: function(row, column, cell, event) {
         if (column.label == '模版名称') {
           this.sameRowArr.forEach((arr, i) => {
             if (arr.indexOf(row.index) != -1) {
@@ -2678,25 +2695,33 @@
         this.sameRowArr = sameRowArr
       },
        handleUpdateAdviceTemplate(row, index) {
+       
         this.current_template_id = row.template_id
         this.current_template_name = row.name
         this.form.name = row.name
         this.form.advice_type = row.advice_type
+        if(row.sort == 0){
+          row.sort = ""
+        }else{
+          this.form.sort = row.sort
+        }
         this.templateTableTwoVisible = true
         this.adviceTableDataTwo = []
+      
         for (let i = 0; i < this.adviceTemplates.length; i++) {
           if (this.adviceTemplates[i].template_id == row.template_id) {
             this.adviceTableDataTwo.push(this.adviceTemplates[i])
           }
         }
+        this.getAdviceConfig()
       },
       modifyTemplateName() {
         const params = {
           template_name: this.form.name,
-          template_id: this.current_template_id
+          template_id: this.current_template_id,
+          sort:this.form.sort,
         }
-        console.log("params---",params)
-
+      
         updateTemplateName(params).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
@@ -2918,6 +2943,9 @@
         console.log('results',results)
         cb(results);
       },
+     sortData(a, b) {
+       return a.sort - b.sort
+     }
     }
   }
 </script>

src/xt_pages/data/printTemplate/schedulePrint.vue

@@ -0,0 +1,165 @@
+<template>
+    <div
+      v-loading="loading"
+      element-loading-text="服务器处理数据中，请稍候......."
+      element-loading-spinner="el-icon-loading"
+      element-loading-background="rgba(0, 0, 0, 0.8)"
+    >
+    <p style="margin-top: 10px;margin-bottom: 30px">
+        请选择你需要打印的排班打印单样式
+    </p>
+    <el-row :gutter="20" type="flex" justify="center">
+        <el-col :span="6" style="text-align: center">
+        <div
+            @click="imgClick('https://kuyi.shengws.com/tempSchedule1.jpg')"
+        >
+            <el-tooltip
+            class="item"
+            effect="dark"
+            :hide-after="2000"
+            content="点击查看大图"
+            placement="top-start"
+            >
+         
+            <el-image
+                style="width: 200px; height: 200px"
+                :src="require('@/assets/home/111.jpg')"
+            ></el-image>
+
+            </el-tooltip>
+        </div>
+        <el-radio v-model="radio" label="1" @change="change">模版一</el-radio>
+        </el-col>
+        <el-col
+        :span="6"
+        style="margin-left: 100px;margin-right: 100px;text-align: center"
+        >
+        <div
+            @click="imgClick('https://kuyi.shengws.com/tempSchedule2.jpg')"
+
+        >
+            <el-tooltip
+            class="item"
+            effect="dark"
+            content="点击查看大图"
+            placement="top-start"
+            :hide-after="2000"
+            >
+          
+
+            <el-image
+                style="width: 200px; height: 200px"
+                :src="require('@/assets/home/222.jpg')"
+            ></el-image>
+            </el-tooltip>
+        </div>
+        <el-radio v-model="radio" label="2" @change="change">模版二</el-radio
+        >
+        </el-col>
+    </el-row>
+   
+
+
+      <el-image-viewer
+        v-if="showViewer"
+        :on-close="closeViewer"
+        :url-list="imgs"
+      ></el-image-viewer>
+
+    </div>
+  </div>
+</template>
+
+<script>
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
+import ElImageViewer from 'element-ui/packages/image/src/image-viewer'
+import { getScheduleTemplate, postScheduleTemplate } from "@/api/schedule";
+import store from "@/store";
+
+export default {
+  name: "printTemplate",
+  components: { ElImageViewer, BreadCrumb },
+  data() {
+    return {
+      showViewer:false,
+      crumbs: [
+        { path: false, name: "管理中心" },
+        { path: "data/print", name: "打印模版" }
+      ],
+      imgUrl_One: require("@/assets/home/111.jpg"),
+      imgUrl_Two: require("@/assets/home/222.jpg"),
+   
+
+      imgs:[],
+
+      imgs_one: ["https://kuyi.shengws.com/template1.png"],
+      imgs_two: ["https://kuyi.shengws.com/template2.png"],
+      delay: 500,
+      radio: 0,
+      tempRadio: 0,
+      loading: false
+    };
+  },
+  methods: {
+    imgClick(val){
+      this.imgs = []
+      this.imgs.push(val)
+      this.showViewer = true
+
+    },
+    closeViewer() {
+      this.showViewer = false
+    },
+    change: function(val) {
+       var params = {
+            template_id:val
+        }
+     postScheduleTemplate(params).then(response=>{
+         if(response.data.state == 1){
+            var template = response.data.data.template
+            this.$message.success("保存成功!")
+            this.getlist()
+         }   
+      })
+    },
+    getlist(){
+       getScheduleTemplate().then(response=>{
+          if(response.data.state == 1){
+            var template = response.data.data.template
+            console.log("template222222",template)
+            if(template.template_id == 0){
+               this.radio = "1"
+            }
+            if(template.template_id!=0){
+               this.radio = template.template_id.toString()
+            }
+           
+          }
+       })
+    }
+  },
+  created() {
+    this.getlist()
+  }
+};
+</script>
+
+<style scoped>
+.el-row {
+  margin-bottom: 20px;
+
+  & :last-child {
+    margin-bottom: 0;
+  }
+}
+.el-col {
+  border-radius: 4px;
+}
+</style>
+<style lang="scss">
+.app-print {
+  .el-radio__label {
+    padding-left: 10px;
+  }
+}
+</style>

src/xt_pages/dialysis/PatientBox.vue

@@ -551,6 +551,7 @@ export default {
           this.getLongAdvice()
         } else {
           this.$message.error(resp.msg);
+         
         }
 
         if (this.lastDialysisPrescribe != null) {

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -344,6 +344,11 @@
           <span class="content">{{this.prescription.plasma_separator}}</span>
         </li>
 
+       <li v-if="isShow('胆红素吸附柱')">
+          <label>胆红素吸附柱: </label>
+          <span class="content">{{this.prescription.bilirubin_adsorption_column}}</span>
+        </li>
+
       </ul>
     </div>
     <div style="color:#34495e;margin: 12px 100px 0 100px;">备注: <span style="color:#409eff;">{{ note }}</span></div>

src/xt_pages/dialysis/details/assessmentBefore.vue

@@ -363,6 +363,12 @@
           <span class="content">{{this.record.estimated_food_intake}}</span>
           <span class="unit"></span>
         </li>
+
+       <li v-if="isShow('透析期间血压')">
+          <label>透析期间血压: </label>
+          <span class="content">{{this.record.blood_pressure_during_dialysis}}</span>
+          <span class="unit"></span>
+        </li>
        
       </ul>
     </div>

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

@@ -570,6 +570,12 @@
              <el-input v-model="assessmentBeforeDislysis.estimated_food_intake"></el-input>
             </el-form-item>
           </el-col>
+
+         <el-col :span="8">
+            <el-form-item label="透析期间血压:" v-if="isShow('透析期间血压')">
+             <el-input v-model="assessmentBeforeDislysis.blood_pressure_during_dialysis"></el-input>
+            </el-form-item>
+          </el-col>
          
           <el-col :span="24">
             <el-form-item label="备注： ">
@@ -738,6 +744,7 @@
           pre_dialysis_drugs:"",
           period:"",
           estimated_food_intake:"",
+          blood_pressure_during_dialysis:"",
         },
 
         InnerDialogProps: {

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

@@ -402,6 +402,14 @@
              </el-form-item>
           </el-col>
 
+         
+         <el-col :span="8" v-if="isShows('胆红素吸附柱')">
+             <el-form-item label="胆红素吸附柱:">
+                  <el-input v-model="dialysisPrescription.bilirubin_adsorption_column" @focus="showInnerDialog('10')"></el-input>
+             </el-form-item>
+         </el-col>
+
+
           <el-col :span="8" v-if="isShows('体液过多症状')">
             <el-form-item label="体液过多症状：">
               <el-select
@@ -1076,6 +1084,7 @@
           single_water:"",
           replacement_flow:"",
           plasma_separator:"",
+          bilirubin_adsorption_column:"",
         },
 
         anticoagulant: {
@@ -1101,6 +1110,7 @@
         dialyzers:[],
         illnessList:[],
         plasmaSeparatorList:[],
+        bilirubinAdsorptionColumn:[],
       }
     },
     methods: {
@@ -1194,6 +1204,16 @@
             this.InnerDialogProps.selected = this.dialysisPrescription.plasma_separator
             this.InnerDialogProps.isShowTextArea = false
             break
+
+           case '10': // 胆红素吸附柱
+
+           
+            this.InnerDialogProps.values = this.bilirubinAdsorptionColumn
+            this.InnerDialogProps.titles = '胆红素吸附柱'
+            this.InnerDialogProps.type = 'bilirubin_adsorption_column'
+            this.InnerDialogProps.selected = this.dialysisPrescription.bilirubin_adsorption_column
+            this.InnerDialogProps.isShowTextArea = false
+            break
         }
       },
       innerDialogComfirm: function(val) {
@@ -1214,6 +1234,9 @@
           case 'plasma_separator':
           this.dialysisPrescription.plasma_separator = val.value.join(',')
           break
+          case 'bilirubin_adsorption_column':
+          this.dialysisPrescription.bilirubin_adsorption_column = val.value.join(',')
+          break
         }
       },
       innerDialogCancle: function() {
@@ -1665,7 +1688,8 @@
         return uParseTime(val, '{y}-{m}-{d} {h}:{i}')
       },
       show(pre,schedual,last,his_is_open) {
-        
+        console.log("pre222222",pre)
+       
         if(his_is_open == 1){
           this.is_open = 0
         }
@@ -3602,10 +3626,13 @@
       }
     },
     created(){
+      
       this.illnessList = getDataConfig('hemodialysis','illness')
-      console.log("列表22222222222",this.illnessList)
+      
       this.plasmaSeparatorList = getDataConfig('hemodialysis','plasma_separator')
-      console.log("列表333333333",this.plasmaSeparatorList)
+      
+      this.bilirubinAdsorptionColumn = getDataConfig('hemodialysis','bilirubin_adsorption_column')
+
     }
   }
 </script>

src/xt_pages/dialysis/details/index.vue

@@ -985,6 +985,13 @@ export default {
             if (prescription.body_fluid == -2) {
               prescription.body_fluid = 0
             }
+            if(prescription.bilirubin_adsorption_column == 0){
+               prescription.bilirubin_adsorption_column  = ""
+            }
+
+             if(prescription.plasma_separator == 0){
+               prescription.plasma_separator  = ""
+            }
           }
 
           var solution = resp.data.solution // 透析方案
@@ -997,6 +1004,9 @@ export default {
             if (predialysis_evaluation.blood_access_part_id == -2) {
               predialysis_evaluation.blood_access_part_id = 0
             }
+            if(predialysis_evaluation.blood_pressure_during_dialysis == 0){
+              predialysis_evaluation.blood_pressure_during_dialysis = ""
+            }
           }
           var doctor_advices = resp.data.doctor_advices // 临时医嘱
 

src/xt_pages/dialysis/template/dialysisPrintOrderTwo.vue

@@ -2,7 +2,7 @@
   <div id="dialysis-print-box-1">
     <div id="dialysis-print-box-1-1" :class="(this.monitors.length > 8 && this.print_length == 8) || (this.monitors.length > 9 && this.print_length == 9) ? 'margin-bottom-900 dialysis-print-order print-template-two print_page_main_content' : 'margin-bottom-50 dialysis-print-order print-template-two print_page_main_content'">
       <div class="order-yy-name">{{ orgname }}</div>
-      <div class="order-title">血液净化专科护理记录单</div>
+      <div class="order-title">血液净化透析治疗记录单</div>
       <div class="row">
         <div class="inline_block">
           科室：

src/xt_pages/outpatientDoctorStation/components/dialysisIndex.vue

@@ -536,7 +536,7 @@ export default {
         if (resp.state == 1) {
           var patient = resp.data.patient // 患者信息
           var schedual = resp.data.schedual // 患者排班信息
-          console.log("排班22222222222",schedual)
+         
           var prescription = resp.data.prescription // 透析处方
           if (prescription != null) {
             if (prescription.body_fluid == -2) {
@@ -545,7 +545,7 @@ export default {
           }
 
           var solution = resp.data.solution // 透析方案
-          console.log("透析方案22223333333333",solution)
+         
           var receiver_treatment_access = resp.data.receiver_treatment_access // 接诊评估
 
           var predialysis_evaluation = resp.data.predialysis_evaluation // 透前评估
@@ -739,7 +739,9 @@ export default {
           }
           this.device_number_map = device_number_map
         } else {
-          this.$message.error(resp.msg)
+         // this.$message.error(resp.msg)
+          console.log("报错提示")
+          this.$message.error("该患者今日未排班,无法使用此模块,请先排班!")
         }
 
         if (this.lastDialysisPrescribe != null) {

src/xt_pages/stock/stockQuery.vue

@@ -151,10 +151,7 @@
         <el-table-column label="剩余库存" align="center">
           <template slot-scope="scope">
             <span>{{
-              stockInCount(scope.row) -
-                salesReturnCount(scope.row) -
-                stockOutCount(scope.row) +
-                cancelStockCount(scope.row)
+              stockInCount(scope.row)- stockOutCount(scope.row) + cancelStockCount(scope.row)
             }}</span>
           </template>
         </el-table-column>

src/xt_pages/user/dialysisSolution.vue

@@ -518,6 +518,13 @@
              </el-form-item>
          </el-col>
 
+
+        <el-col :span="8" v-if="isShows('血浆分离器')">
+             <el-form-item label="血浆分离器:">
+               <el-input v-model="addPlan.bilirubin_adsorption_column" @focus="showInnerDialog('9')"></el-input>
+             </el-form-item>
+         </el-col>
+
           <el-col :span="8" v-if="isShows('目标KT/V')">
             <el-form-item label="目标KT/V">
               <el-input v-model="addPlan.target_ktv"></el-input>
@@ -718,6 +725,7 @@ export default {
         dialysis_dialyszers:'',
         dialysis_irrigation:'',
         plasma_separator:"",
+        bilirubin_adsorption_column:"",
       },
       childPlan: {
         mode: '',
@@ -846,7 +854,8 @@ export default {
      dialyzers:[],
      dialysis_dialyszers:'',
      dialysis_irrigation:"",
-     plasmaSeparatorList:[]
+     plasmaSeparatorList:[],
+     bilirubinAdsorptionColumn:[],
     }
   },
   watch: {
@@ -934,6 +943,15 @@ export default {
           this.InnerDialogProps.selected = this.addPlan.plasma_separator
           this.InnerDialogProps.isShowTextArea = false
 
+          break
+         case '9':
+         
+          this.InnerDialogProps.values = this.bilirubinAdsorptionColumn
+          this.InnerDialogProps.titles = '胆红素吸附柱'
+          this.InnerDialogProps.type = 'bilirubin_adsorption_column'
+          this.InnerDialogProps.selected = this.addPlan.bilirubin_adsorption_column
+          this.InnerDialogProps.isShowTextArea = false
+
           break
       }
     },
@@ -952,7 +970,9 @@ export default {
           break
         case 'plasma_separator':
           this.addPlan.plasma_separator = val.value.join(',')
-          console.log("333333",this.addPlan.plasma_separator)
+          break
+        case 'bilirubin_adsorption_column':
+          this.addPlan.bilirubin_adsorption_column = val.value.join(',')
           break
       }
     },
@@ -1399,6 +1419,7 @@ export default {
 
       this.addPlan.dialyzer_perfusion_apparatus = row.dialyzer_perfusion_apparatus.toString()
       this.addPlan.plasma_separator = row.plasma_separator.toString()
+      this.addPlan.bilirubin_adsorption_column = row.bilirubin_adsorption_column.toString()
       this.addPlan.dialysis_irrigation = row.dialysis_irrigation
       this.addPlan.dialysis_dialyszers = row.dialysis_dialyszers
       this.dialysis_irrigation = row.dialysis_irrigation
@@ -1498,6 +1519,7 @@ export default {
         dialysis_duration_minute: '30',
         created_time:"",
         plasma_separator:"",
+        bilirubin_adsorption_column:"",
       }
       this.addPlanTypeChange()
 
@@ -1837,7 +1859,7 @@ export default {
       'dialyzer_perfusion_apparatus'
     )
     this.plasmaSeparatorList = getDataConfig('hemodialysis','plasma_separator')
-    
+    this.bilirubinAdsorptionColumn = getDataConfig('hemodialysis','bilirubin_adsorption_column')
     this.queryParams.id = this.patientID
     // this.fetchAllDoctorAndNurse();
 

src/xt_pages/workforce/scheduleTablePrint.vue

@@ -678,7 +678,7 @@ export default {
                           }
 
                          //礼拜三晚上
-                         if(this.scheduleCountList[j].schedule_week == 3 && this.scheduleCountList[j].schedule_type == 2){
+                         if(this.scheduleCountList[j].schedule_week == 3 && this.scheduleCountList[j].schedule_type == 3){
                             
                               newArr[i].Wed_N.patient = this.scheduleCountList[j].Count
                           }
@@ -686,76 +686,76 @@ export default {
 
 
                         //礼拜四上午
-                         if(this.scheduleCountList[j].schedule_week == 3 && this.scheduleCountList[j].schedule_type == 1){
+                         if(this.scheduleCountList[j].schedule_week == 4 && this.scheduleCountList[j].schedule_type == 1){
                             
-                              newArr[i].Thurs_A.patient = this.scheduleCountList[j].Count
+                              newArr[i].Thurs_M.patient = this.scheduleCountList[j].Count
                           } 
 
                          //礼拜四下午
-                         if(this.scheduleCountList[j].schedule_week == 3 && this.scheduleCountList[j].schedule_type == 2){
+                         if(this.scheduleCountList[j].schedule_week == 4 && this.scheduleCountList[j].schedule_type == 2){
                             
-                              newArr[i].Thurs_M.patient = this.scheduleCountList[j].Count
+                              newArr[i].Thurs_A.patient = this.scheduleCountList[j].Count
                           }
 
                          //礼拜四晚上
-                         if(this.scheduleCountList[j].schedule_week == 3 && this.scheduleCountList[j].schedule_type == 2){
+                         if(this.scheduleCountList[j].schedule_week == 4 && this.scheduleCountList[j].schedule_type == 3){
                             
                               newArr[i].Thurs_N.patient = this.scheduleCountList[j].Count
                           }
 
 
                         //礼拜五上午
-                         if(this.scheduleCountList[j].schedule_week == 3 && this.scheduleCountList[j].schedule_type == 1){
+                         if(this.scheduleCountList[j].schedule_week == 5 && this.scheduleCountList[j].schedule_type == 1){
                             
-                              newArr[i].Fri_A.patient = this.scheduleCountList[j].Count
+                              newArr[i].Fri_M.patient = this.scheduleCountList[j].Count
                           } 
 
                          //礼拜五下午
-                         if(this.scheduleCountList[j].schedule_week == 3 && this.scheduleCountList[j].schedule_type == 2){
+                         if(this.scheduleCountList[j].schedule_week == 5 && this.scheduleCountList[j].schedule_type == 2){
                             
-                              newArr[i].Fri_M.patient = this.scheduleCountList[j].Count
+                              newArr[i].Fri_A.patient = this.scheduleCountList[j].Count
                           }
 
                          //礼拜五晚上
-                         if(this.scheduleCountList[j].schedule_week == 3 && this.scheduleCountList[j].schedule_type == 2){
+                         if(this.scheduleCountList[j].schedule_week == 5 && this.scheduleCountList[j].schedule_type == 3){
                             
                               newArr[i].Fri_N.patient = this.scheduleCountList[j].Count
                           }
 
 
                         //礼拜六上午
-                         if(this.scheduleCountList[j].schedule_week == 3 && this.scheduleCountList[j].schedule_type == 1){
+                         if(this.scheduleCountList[j].schedule_week == 6 && this.scheduleCountList[j].schedule_type == 1){
                             
-                              newArr[i].Sat_A.patient = this.scheduleCountList[j].Count
+                              newArr[i].Sat_M.patient = this.scheduleCountList[j].Count
                           } 
 
                          //礼拜六下午
-                         if(this.scheduleCountList[j].schedule_week == 3 && this.scheduleCountList[j].schedule_type == 2){
+                         if(this.scheduleCountList[j].schedule_week == 6 && this.scheduleCountList[j].schedule_type == 2){
                             
-                              newArr[i].Sat_M.patient = this.scheduleCountList[j].Count
+                              newArr[i].Sat_A.patient = this.scheduleCountList[j].Count
                           }
 
                          //礼拜六晚上
-                         if(this.scheduleCountList[j].schedule_week == 3 && this.scheduleCountList[j].schedule_type == 2){
+                         if(this.scheduleCountList[j].schedule_week == 6 && this.scheduleCountList[j].schedule_type == 3){
                             
                               newArr[i].Sat_N.patient = this.scheduleCountList[j].Count
                           }
                          
 
                           //礼拜日上午
-                         if(this.scheduleCountList[j].schedule_week == 3 && this.scheduleCountList[j].schedule_type == 1){
+                         if(this.scheduleCountList[j].schedule_week == 7 && this.scheduleCountList[j].schedule_type == 1){
                             
-                              newArr[i].Sun_A.patient = this.scheduleCountList[j].Count
+                              newArr[i].Sun_M.patient = this.scheduleCountList[j].Count
                           } 
 
                          //礼拜日下午
-                         if(this.scheduleCountList[j].schedule_week == 3 && this.scheduleCountList[j].schedule_type == 2){
+                         if(this.scheduleCountList[j].schedule_week == 7 && this.scheduleCountList[j].schedule_type == 2){
                             
-                              newArr[i].Sun_M.patient = this.scheduleCountList[j].Count
+                              newArr[i].Sun_A.patient = this.scheduleCountList[j].Count
                           }
 
                          //礼拜日晚上
-                         if(this.scheduleCountList[j].schedule_week == 3 && this.scheduleCountList[j].schedule_type == 2){
+                         if(this.scheduleCountList[j].schedule_week == 7 && this.scheduleCountList[j].schedule_type == 3){
                             
                               newArr[i].Sun_N.patient = this.scheduleCountList[j].Count
                           }