Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

src/api/drug/drug.js

   })
 }
 
+export function getInventoryDetailPrintList(params) {
+  return request({
+    url: '/api/drug/getinventorydetailprintlist',
+    method: 'Get',
+    params: params
+  })
+}
+
 export function SaveDrugProofInventory(params) {
   return request({
     url: '/api/drug/savedrugproofinventory',

src/api/patient.js

     params:params
   })
 }
+
+export function getContextScheduleList(params){
+  return request({
+    url:"/api/patient/getcontextschedulelist",
+    method:"get",
+    params:params
+  })
+}

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

                         </div>
                         mmol/L
                       </div>
-                      <div class="inline_block" style="margin-left: 10px">
+                      <div class="inline_block" style="margin-left: 10px" v-if="org_id!=10478">
                         碳酸氢根：
                         <div
                           class="under_line"
                         </div>
                         mmol/L
                       </div>
-                      <div class="inline_block" style="margin-left: 10px">
+                      <div class="inline_block" style="margin-left: 10px" v-if="org_id!=10478">
                         流量：
                         <div
                           class="under_line"

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyFive.vue

                                 <span v-else style="display:flex;align-items:center;justify-content:space-around;height:36px;">
                                     <img style="height:30px;" :src="setAdminUserES(monitor_record, 'monitoring_nurse')" alt srcset />
                                 </span> -->
-
-                                <span v-if="setAdminUserES(monitor_record, 'creator') == ''">
+                                <span v-if="monitor_record.creator >0">
+                                  <span v-if="setAdminUserES(monitor_record, 'creator') == ''">
                                     {{ getAdminUser(monitor_record, 'creator') }}
+                                  </span>
+                                  <span v-else style="display:flex;align-items:center;justify-content:space-around;height:36px;">
+                                      <img style="height:30px;" :src="setAdminUserES(monitor_record, 'creator')" alt srcset />
+                                  </span>
                                 </span>
-                                <span v-else style="display:flex;align-items:center;justify-content:space-around;height:36px;">
-                                    <img style="height:30px;" :src="setAdminUserES(monitor_record, 'creator')" alt srcset />
+                                <span v-if="monitor_record.creator ==0">
+                                  <span v-if="setAdminUserES(monitor_record, 'modify') == ''">
+                                    {{ getAdminUser(monitor_record, 'modify') }}
+                                  </span>
+                                  <span v-else style="display:flex;align-items:center;justify-content:space-around;height:36px;">
+                                      <img style="height:30px;" :src="setAdminUserES(monitor_record, 'modify')" alt srcset />
+                                  </span>
                                 </span>
+                                
                             </td>
                           </tr>
                           <!-- <tr

src/xt_pages/dialysis/dialysisPrintOrder.vue

       }else if (this.org_template_info.template_id == 65 || this.org_template_info.template_id == 6) {
         console.log("进来")
         printJS({
-          printable: "dialysis-print-box",
+          printable: "dialysis-print-box-1",
           type: "html",
           style: style12,
           scanStyles: false,

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

                       </div>
                       mmol/L
                     </div>
-                    <div class="inline_block" style="margin-left: 10px">
+                    <div class="inline_block" style="margin-left: 10px" v-if="org_id!=10478">
                       碳酸氢根：
                       <div
                         class="under_line"
                       </div>
                       mmol/L
                     </div>
-                    <div class="inline_block" style="margin-left: 10px">
+                    <div class="inline_block" style="margin-left: 10px" v-if="org_id!=10478">
                       流量：
                       <div
                         class="under_line"
                         <td
                           style="font-size: 16px"
                           width="10%"
-                          v-if="org_id == 10223"
+                          v-if="org_id == 10223 || org_id == 9538"
                         >
                           核对护士
                         </td>
                             getTime(advice.execution_time, "{h}:{i}")
                           }}</span>
                         </td>
-                        <td height="32px" v-if="org_id == 10223">
+                        <td height="32px" v-if="org_id == 10223 || org_id == 9538">
                           <span v-if="setAdminUserES(advice.checker) == ''">{{
                             getAdminUser(advice.checker)
                           }}</span>

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyFive.vue

 <template>
   <div>
     <el-button type="primary" @click="checkData">一键核对</el-button>
-    <div id="dialysis-print-box">
+    <div id="dialysis-print-box-1">
       <div
-        id="dialysis-print-box"
+        id="dialysis-print-box-1"
         class="dialysis-print-order print-template-two print_page_main_content"
       >
         <div style="display: inline-block; width: 100%; text-align: center">
                     <tbody>
                       <tr>
                         <td
-                          :colspan="
-                            prescription.mode_id == 2 ||
-                            prescription.mode_id == 5
-                              ? 14
-                              : 13
-                          "
+                          :colspan="14"
                           style="
                             letter-spacing: 5px;
                             text-align: center;
                         <td width="50">
                           <span v-if="monitor.creator == 0">
                             <span
-                            v-if="setAdminUserES(monitor.modifier) == ''"
-                            >{{ getAdminUser(monitor.modifier) }}</span
+                            v-if="setAdminUserES(monitor.modify) == ''"
+                            >{{ getAdminUser(monitor.modify) }}</span
                           >
                           <img
                             style="height: 30px"
-                            :src="setAdminUserES(monitor.modifier)"
+                            :src="setAdminUserES(monitor.modify)"
                             alt=""
                             srcset=""
                             v-else
       this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
 
       const style =
-        '@media print {.dialysis-print-order{width:960px;margin:0 auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}';
+        '@media print {.dialysis-print-order{width:960px;margin:0 auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px}.dialysis-print-order .print-table-no{width:100%;text-align:left;border-collapse:collapse;font-size:14px} .dialysis-print-order .under_line {display: inline-block;border-bottom: 1px solid #999;text-align:left;white-space: nowrap;width: 50%;} .dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}';
 
       if (this.org_template_info.template_id == 1) {
         printJS({

src/xt_pages/sign/Contextowner.vue

             </el-row>
             <div class="page_lineUp">
                 <div class="lineUpTitle">
-                    <!-- <div>{{ this.$store.getters.xt_user.org.org_name }}<span>&nbsp;&nbsp;温馨提示：请注意排队叫号，依次叫号就诊上机，谢谢配合</span></div>
-                    <div>{{ newdate }}&nbsp;&nbsp;{{ time }}</div> -->
                 </div>
                 <div class="lineUpMain">
                     <div class="lineUpMainLeft">
                             <p style="width:55%">透析时间</p>
                             
                         </div>
-                        <!-- <div class="lineUpList">
-                            <div class="lineUpListOne" v-for="(item,index) in lineUpList" :key="index">
-                                <p style="width:12%" v-if="$store.getters.xt_user.org.id !=0 && $store.getters.xt_user.org.id!=10440">
-                                    <span v-if="item.schedule_type == 1">上午</span>
-                                    <span v-if="item.schedule_type == 2">下午</span>
-                                    <span v-if="item.schedule_type == 3">晚上</span>
-                                    {{ item.queue_no }}号
-                                </p>
-                                <p style="width:14%">{{ item.patient_name }}</p>
-                                <p style="width:14%" v-if="$store.getters.xt_user.org.id !=0 && $store.getters.xt_user.org.id !=10440">{{ item.dialysis_no }}</p>
-                                <p style="width:14%">{{ item.partition_name + item.bed_name }}</p>
-                                <p style="width:14%">
-                                    <span v-if="item.status == 1">待接诊</span>
-                                    <span v-if="item.status == 2">接诊中</span>
-                                    <span v-if="item.status == 3">待上机</span>
-                                    <span v-if="item.status == 4">透析中</span>
-                                    <span v-if="item.status == 5">已下机</span>
-                                </p>
-                                <p style="width:14%">{{ item.start_time ? getDates(item.start_time) : '--' }}</p>
-                                <p style="width:16%">{{ item.end_time && item.start_time ? getDates(item.end_time) : '--' }}</p>
-                            </div>
-                        </div> -->
                     </div> 
-                    <!-- <div class="callingBox">
-                        <div :class="(queueConfig.jzjhyc == 1 && queueConfig.sjjhyc == 0) ? 'callingBoxLeft1' : 'callingBoxLeft'" v-if="queueConfig.jzjhyc == 1">
-                            <div class="callingTitle"><span style="margin: 0 auto;">接<br />诊<br />叫<br />号</span></div>
-                            <div style="flex: 1;justify-content: space-between;display: flex;flex-direction: column;">
-                                <div class="callingTop" style="margin-bottom:10px;">
-                                    <div class="callingTopTip"><span style="margin: 0 auto;">正在<br />接诊</span></div>
-                                    <div class="callingContent">
-                                        <div>
-                                            <p><span v-for="(item,index) in (receivingPatient || '').slice(0,3)" :key="index">{{ item.patient_name }}、</span></p>
-                                            <p><span v-for="(item,index) in (receivingPatient || '').slice(3,6)" :key="index">{{ item.patient_name }}、</span></p>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="callingTop" style="border-radius: 0 0 15px 0;">
-                                    <div class="callingTopTip"><span style="margin: 0 auto;">等待<br />接诊</span></div>
-                                    <div class="callingContent">
-                                        <div>
-                                            <p><span v-for="(item,index) in (waitDoctorList || '').slice(0,3)" :key="index">{{ item.patient_name }}、</span></p>
-                                            <p><span v-for="(item,index) in (waitDoctorList || '').slice(3,6)" :key="index">{{ item.patient_name }}、</span></p>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
+                    <div class="lineUpList">
+                        <div class="lineUpListOne" v-for="(item,index) in lineUpList" :key="index">
+                            <p style="width:12%" > {{ index+1 }} </p>
+                            <p style="width:14%">{{ getPatientName(item.patient_id)}}</p>
+                            <p style="width:14%">{{ getDialysisNo(item.patient_id) }}</p>
+                            <p style="width:55%">{{getContent(item.child) }}</p>
                         </div>
-                        <div :class="(queueConfig.jzjhyc == 0 && queueConfig.sjjhyc == 1) ? 'callingBoxLeft1' : 'callingBoxLeft'" v-if="queueConfig.sjjhyc == 1">
-                            <div class="callingTitle newCallingTitle"><span style="margin: 0 auto;">上<br />机<br />叫<br />号</span></div>
-                            <div style="flex: 1;justify-content: space-between;display: flex;flex-direction: column;">
-                                <div class="callingTop" style="margin-bottom:10px;">
-                                    <div class="callingTopTip newCallingTopTip"><span style="margin: 0 auto;">正在<br />叫号</span></div>
-                                    <div class="callingContent newCallingContent">
-                                        <div>
-                                            <p><span v-for="(item,index) in (upPatientList || '').slice(0,3)" :key="index">{{ item.patient_name }}、</span></p>
-                                            <p><span v-for="(item,index) in (upPatientList || '').slice(3,6)" :key="index">{{ item.patient_name }}、</span></p>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="callingTop" style="border-radius: 0 0 15px 0;">
-                                    <div class="callingTopTip newCallingTopTip"><span style="margin: 0 auto;">等待<br />叫号</span></div>
-                                    <div class="callingContent newCallingContent">
-                                        <div>
-                                            <p><span v-for="(item,index) in (receivingPatient || '').slice(0,3)" :key="index">{{ item.patient_name }}、</span></p>
-                                            <p><span v-for="(item,index) in (receivingPatient || '').slice(3,6)" :key="index">{{ item.patient_name }}、</span></p>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div> -->
+                    </div>
                 </div> 
                 
              </div>
                         </div>
                         <div class="lineUpList">
                             <div class="lineUpListOne" v-for="(item,index) in lineUpList" :key="index">
-                                <p style="width:12%" > {{ item.xuhao }} </p>
-                                <p style="width:14%">{{ item.name }}</p>
-                                <p style="width:14%">{{ item.toux }}</p>
-                                <p style="width:55%">{{ item.touxtime }}</p>
-                                
-                                <!-- <p style="width:14%">{{ item.patient_name }}</p>
-                                <p style="width:14%">{{ item.partition_name + item.bed_name }}</p>
-                                <p style="width:14%">{{ item.start_time ? getDates(item.start_time) : '--' }}</p>
-                                <p style="width:16%">{{ item.end_time && item.start_time ? getDates(item.end_time) : '--' }}</p> -->
+                                <p style="width:12%" > {{ index+1 }} </p>
+                                <p style="width:14%">{{ getPatientName(item.patient_id)}}</p>
+                                <p style="width:14%">{{ getDialysisNo(item.patient_id) }}</p>
+                                <p style="width:55%">{{getContent(item.child) }}</p>
                             </div>
                         </div>
                     </div> 
 </template>
 
 <script>
+import {getContextScheduleList} from "@/api/patient"
 const moment = require('moment')
 import BreadCrumb from "../components/bread-crumb";
 import screenfull from "screenfull";
+import { uParseTime } from '@/utils/tools'
 export default {
     components:{
         BreadCrumb
             ],
             dialogTableVisible:false,
             showSetting: false,
-            lineUpList:[
-                {xuhao:1,name:'张三',toux:1001,touxtime:'07-05 周一上午 HD 8号床  周三上午HD 9号床 周六上午HD 9号床'},
-                // {xuhao:2,name:'李四',toux:1002,touxtime:'2023-07-03'},
-                // {xuhao:3,name:'王五',toux:1003,touxtime:'2023-07-03'},
-                // {xuhao:4,name:'赵六',toux:1004,touxtime:'2023-07-03'},
-                // {xuhao:1,name:'肖雪',toux:1001,touxtime:'2023-07-03'},
-                // {xuhao:2,name:'小舞',toux:1002,touxtime:'2023-07-03'},
-                // {xuhao:3,name:'小明',toux:1003,touxtime:'2023-07-03'},
-                // {xuhao:4,name:'小红',toux:1004,touxtime:'2023-07-03'},
-                // {xuhao:1,name:'小雪',toux:1001,touxtime:'2023-07-03'},
-                // {xuhao:2,name:'小王',toux:1002,touxtime:'2023-07-03'},
-                // {xuhao:3,name:'小爱同学',toux:1003,touxtime:'2023-07-03'},
-                // {xuhao:4,name:'小亦',toux:1004,touxtime:'2023-07-03'},
-            ],
+            lineUpList:[],
             count:0,
             page:1,
             timer:null,
 
             voice:true,
             a:1,
-            newTimes:null
-            
+            newTimes:null,
+            limit:6,
+            page:1,
+            total:0,
+            patientList:[],
+            deviceNumberList:[],
+            schedule:[],
         }
     },
     computed: {
         },
     },
     created(){
+        this.getlist()
         if(sessionStorage.getItem('lineUpKey') != null){
             if(sessionStorage.getItem('lineUpKey') == 1){
                 this.dialogTableVisible = true
                 }
             }, 1000);
         }
-        // this.websocketMess();
+       
     },
     mounted(){
         
-        // this.timer = setInterval(() => {
-        //     if(this.page < Math.ceil(this.count / 6)){
-        //         console.log('执行',Math.ceil(this.count / 6),this.page)
-        //         this.page++
-        //         let obj = {
-        //             cmd: "queue/queuelist",
-        //             data: {page:this.page,size:6,sort:0}
-        //         };
-        //         this.websocketSend(obj)
-        //         setTimeout(() => {
-        //             this.websocketMess();
-        //         }, 1000);
-        //     }
-        //     else{
-        //         console.log('执行22223333')
-        //         this.page = 1
-        //         let a = {
-        //             cmd: "queue/queuelist",
-        //             data: {page:this.page,size:6,sort:0}
-        //         };
-        //         this.websocketSend(a)
-        //         setTimeout(() => {
-        //             // this.websocketMess();
-        //             this.lineUpList
-        //         }, 1000);
+        this.timer = setInterval(() => {
+            if(this.page < Math.ceil(this.count / 6)){
+                console.log('执行',Math.ceil(this.count / 6),this.page)
+                this.page++
+                 this.getlist()
+                setTimeout(() => {
+                    this.websocketMess();
+                }, 1000);
+            }
+            else{
+                console.log('执行22223333')
+                this.page = 1
+                this.getlist()
+                setTimeout(() => {
+                    // this.websocketMess();
+                    this.lineUpList
+                }, 1000);
                 
-        //     }
-        //     console.log('切换时间',this.queueConfig)
-        // }, 1000 * parseInt(this.queueConfig.qhsj));
-        // this.timerID = setInterval(() => {
-        //     this.updateTime()
-        // }, 1000);
-        // this.newTimes = setInterval(() => {
-        //     // this.reload()
-        //     console.log('1222222333333333');
-        //     sessionStorage.setItem('lineUpKey',1);
-        //     window.location.reload()
-        // }, 1000 * 60 * 30);
+            }
+            console.log('切换时间',this.queueConfig)
+        }, 1000 * parseInt(this.queueConfig.qhsj));
+        this.timerID = setInterval(() => {
+            this.updateTime()
+        }, 1000);
+        this.newTimes = setInterval(() => {
+            // this.reload()
+            console.log('1222222333333333');
+            sessionStorage.setItem('lineUpKey',1);
+            window.location.reload()
+        }, 1000 * 60 * 30);
     },
     beforeDestroy(){
         clearInterval(this.timer);// 清除定时器
         this.timer = null
         clearInterval(this.timerID);
         this.timerID = null;// 清除定时器
-        // clearInterval(this.newTimes);　　// 清除定时器
-        // this.newTimes = null
         let unObj = {
             cmd:'queue/unjoin',
             data:{type:2}
         }
         this.websocketSend(unObj)
-        // this.timer = null;
-        // let obj = {
-        //     cmd: "queue/join",
-        //     data: {type:1},
-        // };
-        // this.websocketSend(obj)
     },
     methods:{
         websocketSend(data) {
         },
         getDates(time){
             return moment(time * 1000).format('HH:mm:ss')
-        }
+        },
+        getlist(){
+            var params = {
+              limit:this.limit,
+              page:this.page,
+              start_time:"2023-07-03",
+              end_time:"2023-07-09"
+            }
+          getContextScheduleList(params).then(response=>{
+             if(response.data.state ==1){
+               var schedule = response.data.data.schedule
+               
+               this.lineUpList = schedule
+               var list = response.data.data.list
+               console.log("list232322323",list)
+               for(let i=0;i<schedule.length;i++){
+                  if(schedule[i].mode_id ==1){
+                    schedule[i].mode_name = "HD"
+                  }
+                  if(schedule[i].mode_id ==2){
+                    schedule[i].mode_name = "HDF"
+                  }
+                  if(schedule[i].mode_id ==3){
+                    schedule[i].mode_name = "HD+HP"
+                  }
+
+                  if(schedule[i].mode_id ==4){
+                    schedule[i].mode_name = "HP"
+                  }
+
+                  if(schedule[i].mode_id ==5){
+                    schedule[i].mode_name = "HF"
+                  }
+
+                  
+                  if(schedule[i].mode_id ==6){
+                    schedule[i].mode_name = "SCUF"
+                  }
+
+                  if(schedule[i].mode_id ==7){
+                    schedule[i].mode_name = "IUF"
+                  }
+
+                  if(schedule[i].mode_id ==8){
+                    schedule[i].mode_name = "HFHD"
+                  }
+
+                  if(schedule[i].mode_id ==9){
+                    schedule[i].mode_name = "HFHD+HP"
+                  }
+                  
+                  if(schedule[i].mode_id ==10){
+                    schedule[i].mode_name = "PHF"
+                  }
+
+                  if(schedule[i].mode_id ==11){
+                    schedule[i].mode_name = "HFR"
+                  }
+
+                  if(schedule[i].mode_id ==12){
+                    schedule[i].mode_name = "HDF+HP"
+                  }
+
+                  if(schedule[i].mode_id ==13){
+                    schedule[i].mode_name = "CRRT"
+                  }
+
+                  if(schedule[i].mode_id ==14){
+                    schedule[i].mode_name = "腹水回输"
+                  }
+
+                  if(schedule[i].mode_id ==15){
+                    schedule[i].mode_name = "IUF+HD"
+                  }
+
+                  if(schedule[i].mode_id ==19){
+                    schedule[i].mode_name = "IUF+HD"
+                  }
+
+                  if(schedule[i].mode_id ==20){
+                    schedule[i].mode_name = "UF"
+                  }
+                  if(schedule[i].mode_id ==21){
+                    schedule[i].mode_name = "HD+"
+                  }
+
+                  if(schedule[i].mode_id ==22){
+                    schedule[i].mode_name = "血浆胆红素吸附+HDF"
+                  }
+
+                  if(schedule[i].mode_id ==23){
+                    schedule[i].mode_name = "血浆胆红素吸附"
+                  }
+
+                  if(schedule[i].mode_id ==24){
+                    schedule[i].mode_name = "I-HDF"
+                  }
+
+                  if(schedule[i].mode_id ==25){
+                    schedule[i].mode_name = "HD高通"
+                  }
+
+                  if(schedule[i].mode_id ==26){
+                    schedule[i].mode_name = "CVVH"
+                  }
+
+                  if(schedule[i].mode_id ==27){
+                    schedule[i].mode_name = "CVVHD"
+                  }
+
+                  if(schedule[i].mode_id ==28){
+                    schedule[i].mode_name = "CVVHDF"
+                  }
+                  
+                  if(schedule[i].mode_id ==29){
+                    schedule[i].mode_name = "PE"
+                  }
+
+                  if(schedule[i].mode_id ==30){
+                    schedule[i].mode_name = "血浆胆红素吸附+HP"
+                  }
+
+                  if(schedule[i].mode_id ==31){
+                    schedule[i].mode_name = "HPD"
+                  }
+
+                  if(schedule[i].mode_id ==32){
+                    schedule[i].mode_name = "HDP"
+                  }
+
+
+
+
+
+                  if(schedule[i].schedule_week ==1){
+                    schedule[i].schedule_week_name = "周一"
+                  }
+                  if(schedule[i].schedule_week ==2){
+                    schedule[i].schedule_week_name = "周二"
+                  }
+                  if(schedule[i].schedule_week ==3){
+                    schedule[i].schedule_week_name = "周三"
+                  }
+                  if(schedule[i].schedule_week ==4){
+                    schedule[i].schedule_week_name = "周四"
+                  }
+                  if(schedule[i].schedule_week ==5){
+                    schedule[i].schedule_week_name = "周五"
+                  }
+                  if(schedule[i].schedule_week ==6){
+                    schedule[i].schedule_week_name = "周六"
+                  }
+                  if(schedule[i].schedule_week ==7){
+                    schedule[i].schedule_week_name = "周日"
+                  }
+
+                  if(schedule[i].schedule_type ==1){
+                    schedule[i].schedule_type_name = "上午"
+                  }
+                  if(schedule[i].schedule_type ==2){
+                    schedule[i].schedule_type_name = "下午"
+                  }
+                  if(schedule[i].schedule_type ==3){
+                    schedule[i].schedule_type_name = "晚上"
+                  }
+                
+                  schedule[i].child = []
+                 for(let j=0;j<list.length;j++){
+                    
+                    if(schedule[i].patient_id == list[j].patient_id){
+                       schedule[i].child.push(list[j])
+                    }
+                 }
+               } 
+               console.log("schedule",schedule)
+               this.schedule = schedule
+             
+               var total = response.data.data.total
+               console.log("total+23323223",total)
+               var patients =  response.data.data.patients
+               console.log("patinets",patients)
+               this.patientList = patients
+
+               this.deviceNumberList =  response.data.data.devicenumber
+
+
+             }
+          })  
+        },
+        getPatientName(patient_id){
+          var name = ""
+          for(let i=0;i<this.patientList.length;i++){
+            if(patient_id == this.patientList[i].id){
+               name = this.patientList[i].name
+            }
+          }
+          return name
+        },
+        getDialysisNo(patient_id){
+          var dialysis_no = ""
+          for(let i=0;i<this.patientList.length;i++){
+            if(patient_id == this.patientList[i].id){
+                dialysis_no = this.patientList[i].dialysis_no
+            }
+          }
+          return dialysis_no
+        },
+        getContent(schedule){
+          var str = ""
+          if(schedule!=null && schedule.length >0){
+            for(let i=0;i<schedule.length;i++){
+                schedule[i].bed_number = this.getNumberName(schedule[i].bed_id)
+                if(schedule[i].mode_id ==1){
+                    schedule[i].mode_name = "HD"
+                  }
+                  if(schedule[i].mode_id ==2){
+                    schedule[i].mode_name = "HDF"
+                  }
+                  if(schedule[i].mode_id ==3){
+                    schedule[i].mode_name = "HD+HP"
+                  }
+
+                  if(schedule[i].mode_id ==4){
+                    schedule[i].mode_name = "HP"
+                  }
+
+                  if(schedule[i].mode_id ==5){
+                    schedule[i].mode_name = "HF"
+                  }
+
+                  
+                  if(schedule[i].mode_id ==6){
+                    schedule[i].mode_name = "SCUF"
+                  }
+
+                  if(schedule[i].mode_id ==7){
+                    schedule[i].mode_name = "IUF"
+                  }
+
+                  if(schedule[i].mode_id ==8){
+                    schedule[i].mode_name = "HFHD"
+                  }
+
+                  if(schedule[i].mode_id ==9){
+                    schedule[i].mode_name = "HFHD+HP"
+                  }
+                  
+                  if(schedule[i].mode_id ==10){
+                    schedule[i].mode_name = "PHF"
+                  }
+
+                  if(schedule[i].mode_id ==11){
+                    schedule[i].mode_name = "HFR"
+                  }
+
+                  if(schedule[i].mode_id ==12){
+                    schedule[i].mode_name = "HDF+HP"
+                  }
+
+                  if(schedule[i].mode_id ==13){
+                    schedule[i].mode_name = "CRRT"
+                  }
+
+                  if(schedule[i].mode_id ==14){
+                    schedule[i].mode_name = "腹水回输"
+                  }
+
+                  if(schedule[i].mode_id ==15){
+                    schedule[i].mode_name = "IUF+HD"
+                  }
+
+                  if(schedule[i].mode_id ==19){
+                    schedule[i].mode_name = "IUF+HD"
+                  }
+
+                  if(schedule[i].mode_id ==20){
+                    schedule[i].mode_name = "UF"
+                  }
+                  if(schedule[i].mode_id ==21){
+                    schedule[i].mode_name = "HD+"
+                  }
+
+                  if(schedule[i].mode_id ==22){
+                    schedule[i].mode_name = "血浆胆红素吸附+HDF"
+                  }
+
+                  if(schedule[i].mode_id ==23){
+                    schedule[i].mode_name = "血浆胆红素吸附"
+                  }
+
+                  if(schedule[i].mode_id ==24){
+                    schedule[i].mode_name = "I-HDF"
+                  }
+
+                  if(schedule[i].mode_id ==25){
+                    schedule[i].mode_name = "HD高通"
+                  }
+
+                  if(schedule[i].mode_id ==26){
+                    schedule[i].mode_name = "CVVH"
+                  }
+
+                  if(schedule[i].mode_id ==27){
+                    schedule[i].mode_name = "CVVHD"
+                  }
+
+                  if(schedule[i].mode_id ==28){
+                    schedule[i].mode_name = "CVVHDF"
+                  }
+                  
+                  if(schedule[i].mode_id ==29){
+                    schedule[i].mode_name = "PE"
+                  }
+
+                  if(schedule[i].mode_id ==30){
+                    schedule[i].mode_name = "血浆胆红素吸附+HP"
+                  }
+
+                  if(schedule[i].mode_id ==31){
+                    schedule[i].mode_name = "HPD"
+                  }
+
+                  if(schedule[i].mode_id ==32){
+                    schedule[i].mode_name = "HDP"
+                  }
+
+
+                  if(schedule[i].schedule_week ==1){
+                    schedule[i].schedule_week_name = "周一"
+                  }
+                  if(schedule[i].schedule_week ==2){
+                    schedule[i].schedule_week_name = "周二"
+                  }
+                  if(schedule[i].schedule_week ==3){
+                    schedule[i].schedule_week_name = "周三"
+                  }
+                  if(schedule[i].schedule_week ==4){
+                    schedule[i].schedule_week_name = "周四"
+                  }
+                  if(schedule[i].schedule_week ==5){
+                    schedule[i].schedule_week_name = "周五"
+                  }
+                  if(schedule[i].schedule_week ==6){
+                    schedule[i].schedule_week_name = "周六"
+                  }
+                  if(schedule[i].schedule_week ==7){
+                    schedule[i].schedule_week_name = "周日"
+                  }
+
+                  if(schedule[i].schedule_type ==1){
+                    schedule[i].schedule_type_name = "上午"
+                  }
+                  if(schedule[i].schedule_type ==2){
+                    schedule[i].schedule_type_name = "下午"
+                  }
+                  if(schedule[i].schedule_type ==3){
+                    schedule[i].schedule_type_name = "晚上"
+                  }
+                
+              str += " "+this.getTime(schedule[i].schedule_date)+" "+schedule[i].schedule_week_name + " " +schedule[i].schedule_type_name +" " + schedule[i].mode_name+"," 
+            }
+          }
+          return str
+        },
+        getTime(val) {
+         if(val < 0){
+           return ""
+         }
+         if(val == ""){
+          return ""
+         }else {
+          return uParseTime(val, '{m}-{d}')
+         }
+      },
+      getNumberName(id){
+         var number = ""
+         for(let i=0;i<this.deviceNumberList.length;i++){
+           if(id == this.deviceNumberList[i].bed_id){
+             number = this.deviceNumberList[i].bed_number
+           }
+         }
+         return number
+      }
     }
 }
 </script>

src/xt_pages/stock/drugs/components/drugQuery.vue

            <el-pagination
             @size-change="handleSizeChange"
             @current-change="handleCurrentChange"
-            :page-sizes="[10, 50, 100,200,500,1000]"
+            :page-sizes="[10, 50, 100,200,300,400,500,1000]"
             :page-size="10"
             background
             align="right"

src/xt_pages/stock/drugs/inventoryDetails.vue

                 <el-button size="small" type="primary">导出</el-button>
             </div> -->
         </div>
-        <el-table :data="tableData" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }" style="width:100%">
+        <el-table :data="tableData" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }" style="width:100%"  @selection-change="changePrice" >
+           <el-table-column type="selection" width="50" align="center"> </el-table-column>
             <el-table-column prop="date" label="药品名称" align="center">
                <template slot-scope="scope">
                  {{scope.row.drug_name}}
                </template>
             </el-table-column>
-            <el-table-column  prop="name" label="规格" width="200"  align="center">
+            <el-table-column  prop="name" label="规格" width="100"  align="center">
               <template slot-scope="scope">
                  {{scope.row.specification_name}}
                </template>
             </el-table-column>
-            <el-table-column prop="name" label="单位" width="100"  align="center">
+            <el-table-column prop="name" label="单位" width="80"  align="center">
                 <template slot-scope="scope">
                   {{scope.row.warehousing_unit}}
                </template>
             </el-table-column>
           
-            <el-table-column prop="name" label="进价" width="100"  align="center">
+            <el-table-column prop="name" label="进价" width="80"  align="center">
                 <template slot-scope="scope">
                    {{scope.row.last_price}}
                 </template> 
             </el-table-column>
            
-            <el-table-column prop="name" label="生产厂商" width="200"  align="center">
+            <el-table-column prop="name" label="生产厂商" width="150"  align="center">
                 <template slot-scope="scope">
                   {{scope.row.manufacturer}}
                 </template> 
             </el-table-column>
            
            
-            <el-table-column prop="name" label="有效日期" width="200"  align="center">
+            <el-table-column prop="name" label="有效日期" width="150"  align="center">
                 <template slot-scope="scope">
                    {{getTime(scope.row.expiry_date)}}
                 </template>  
             </el-table-column>
 
-           <el-table-column prop="name" label="仓库名称" width="200"  align="center">
+           <el-table-column prop="name" label="仓库名称" width="150"  align="center">
                 <template slot-scope="scope">
                    {{getHouseName(scope.row.storehouse_id)}}
                 </template>  
             page:1,
             storehouse_id:0,
             houseList:[],
+            ids:[]
         }
     },
     methods:{
             this.$router.push({path:'/stock/drugs/inventoryPrint'}) 
         },
         print_1(){
-           this.$router.push({path:'/stock/drugs/print?storehouse_id='+this.storehouse_id+"&drug_name="+this.searchKey+"&limit="+this.limit+"&page="+this.page}) 
+           this.$router.push({path:'/stock/drugs/print?storehouse_id='+this.storehouse_id+"&drug_name="+this.searchKey+"&limit="+this.limit+"&page="+this.page+"&ids="+this.ids}) 
         },
         handleSizeChange(val){
          this.limit = val
          }else{
            return storehouse_name
          }
-       }
+       },
+       changePrice(val){  
+       
+        var arr = []
+        for(let i=0;i<val.length;i++){
+            arr.push(val[i].id)
+        }
+        var str = arr.join(",")
+        
+        console.log("str",str)
+        this.ids = str  
+      },
     },
     created(){
       this.getlist()

src/xt_pages/stock/drugs/print.vue

 import BreadCrumb from '@/xt_pages/components/bread-crumb'
 const moment = require('moment');
 import { uParseTime } from '@/utils/tools'
-import { getInventoryDetailList } from "@/api/drug/drug"
+import { getInventoryDetailPrintList } from "@/api/drug/drug"
 import print from "print-js";
 import { min } from 'moment';
 export default {
               page:this.$route.query.page,
               keyword:this.$route.query.drug_name,
               storehouse_id:this.$route.query.storehouse_id,
+              ids:this.$route.query.ids,
             }
-          getInventoryDetailList(params).then(response=>{
+          getInventoryDetailPrintList(params).then(response=>{
              if(response.data.state == 1){
               this.total =  response.data.data.total
               this.tableData = response.data.data.list

src/xt_pages/stock/inventoryDetails.vue

     },
     methods:{
         toprint(){
-          this.$router.push({path:'/stock/print_all?storehouse_id='+this.storehouse_id+"&good_name="+this.searchKey+"&limit="+this.limit+"&page="+this.page})
+          this.$router.push({path:'/stock/print_all?storehouse_id='+this.storehouse_id+"&good_name="+this.searchKey+"&limit="+this.limit+"&page="+this.page+"&ids="+this.ids})
         },
 
         search(){

src/xt_pages/stock/print_all.vue

             good_name:this.$route.query.good_name,
             limit:this.$route.query.limit,
             page:this.$route.query.page,
+            ids:this.$route.query.ids,
           }
          getPrintList(params).then(response=>{
            if(response.data.state == 1){

src/xt_pages/stock/query/goodNewQuery.vue

            <el-pagination
             @size-change="handleSizeChange"
             @current-change="handleCurrentChange"
-            :page-sizes="[10, 50, 100,200,500,1000]"
+            :page-sizes="[10, 50, 100,200,300,400,500,1000]"
             :page-size="10"
             background
             align="right"

src/xt_pages/user/components/PatientDetail.vue

                 </el-form-item>
               </el-col>
 
+              <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
+                <el-form-item
+                  label="患者去向时间 : "
+                >
+                <el-date-picker
+                  size="small"
+                  disabled
+                  v-model="form.patient_start_time"
+                  prefix-icon="el-icon-date"
+                  :editable="false"
+                  style="width: 150px;"
+                  type="date"
+                  placeholder="选择日期时间"
+                  align="right"
+                  format="yyyy-MM-dd"
+                  value-format="yyyy-MM-dd"
+                  @change="startTimeChange"
+                 ></el-date-picker>
+                </el-form-item>
+              </el-col>
+
                 <el-col :span="8" style="margin-bottom: 20px;">
                 <el-form-item
                   label="备注 : "
   doctor:"",
   record_number:"",
   patient_source:"",
+  patient_start_time:"",
 };
 
 export default {
             );
             
             this.form.patient_source = patietInfo.patient_source
-
+            if (patietInfo.patient_start_time != 0) {
+              this.form.patient_start_time = uParseTime(
+                patietInfo.patient_start_time,
+                "{y}-{m}-{d}"
+              );
+            }
             // this.form.initial = patietInfo.initial_dialysis + "";
             // this.form.dialysisTotal = patietInfo.total_dialysis + "";
             // this.form.assessment = patietInfo.evaluate;

src/xt_pages/user/components/PatientForm.vue

                 </el-form-item>
               </el-col>
 
+              <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
+                <el-form-item
+                  label="患者去向时间 : "
+                >
+                <el-date-picker
+                  size="small"
+                  v-model="form.patient_start_time"
+                  prefix-icon="el-icon-date"
+                  :editable="false"
+                  style="width: 150px;"
+                  type="date"
+                  placeholder="选择日期时间"
+                  align="right"
+                  format="yyyy-MM-dd"
+                  value-format="yyyy-MM-dd"
+                  @change="startTimeChange"
+                 ></el-date-picker>
+                </el-form-item>
+              </el-col>
+
               <el-col :span="8" style="margin-bottom: 20px;" :style="isEdit ? 'width:360px' : ''">
                 <el-form-item
                   label="备注 : "
   zb_patient_id:"",
   doctor:"",
   patient_source:0,
+  patient_start_time:"",
   formItem: [
     {
       id: 0,
 
          
             this.form.patient_source = patietInfo.patient_source
-            
+          
+            if (patietInfo.patient_start_time != 0) {
+              this.form.patient_start_time = uParseTime(
+                patietInfo.patient_start_time,
+                "{y}-{m}-{d}"
+              );
+            }
             this.checkIdCardNo();
           } else {
             this.$notify.error({
       if(val == 2){
         this.showOne = true
       }
-    }
+    },
+
+    getTime(value, temp) {
+      if (value != undefined) {
+        return uParseTime(value, temp);
+      }
+      return "";
+    },
 
     // fetchAllDoctorAndNurse() {
     // fetchAllDoctorAndNurse().then(response => {

src/xt_pages/workforce/components/editTableData.vue

       zoneIdList: [],
       strArr: "",
       patient_id_hover: 0,//高亮id
-
+      // Mouse_id_hover:0,
       now_time: "",
       activeItem: {
         day: null,
     },
     // 高亮
     hoverMouse(row, column, cell, event) {
-      console.log('sdf12344565');
-      if (row[column.property].schedule_id > 0) {
-        let patient_id = row[column.property].patient_id
-        this.patient_id_hover = patient_id
-      } else {
-        this.patient_id_hover = -1
-      }
+      // console.log('sdf12344565');
+      // if (row[column.property].schedule_id > 0) {
+      //   let patient_id = row[column.property].patient_id
+      //   this.Mouse_id_hover = patient_id
+      //   // this.cur_info.patient_id = row.id
+      // } else {
+      //   this.Mouse_id_hover = -1
+      // }
     },
     // 单元格的 className 的回调方法
     cellClass({ row, column, rowIndex, columnIndex }) {
             ) {
               return "hover-td schedule-table-cell-disable";
             } 
-            if(column.label == '晚'){
-              return 'evening_border schedule-table-cell-disable'
-            }
+            // if(column.label == '晚'){
+            //   return 'evening_border schedule-table-cell-disable'
+            // }
             return "schedule-table-cell-disable";
           } else {
-            if(column.label == '晚' ){
-                return 'evening_border'
-            }
+            // if(column.label == '晚' ){
+            //     return 'evening_border'
+            // }
             if (
                 row[column.property].patient_id > 0 &&
                 row[column.property].patient_id == this.patient_id_hover
       if(this.cur_info.patient_id == row.id){
         // console.log('patientClassrowIndex的数据',rowIndex);
         // console.log('row的数据',row);
-
         return 'highlight'
       }
     },

src/xt_pages/workforce/scheduleTablePrint.vue

                 <td style="min-width:40px;">
                     <span v-if="item.Mon_M.patient_id">
                         <span>{{ item.Mon_M.patient }}</span>
-                        <span>{{ item.Mon_M.mode_name }}</span>
+                        <span v-if="item.Mon_M.mode_name != 'HD'">{{ item.Mon_M.mode_name }}</span>
                     </span>
                 </td>
                 <td style="min-width:40px;">
                     <span v-if="item.Mon_A.patient_id">
                        
                         <span>{{ item.Mon_A.patient }}</span>
-                        <span>{{ item.Mon_A.mode_name }}</span>
+                        <span v-if="item.Mon_A.mode_name != 'HD'">{{ item.Mon_A.mode_name }}</span>
                     </span>
                 </td>
                 <td style="min-width:40px;">
                     <span v-if="item.Mon_N.patient_id">
                         
                         <span>{{ item.Mon_N.patient }}</span>
-                        <span>{{ item.Mon_N.mode_name }}</span>
+                        <span v-if="item.Mon_N.mode_name != 'HD'">{{ item.Mon_N.mode_name }}</span>
                     </span>
                 </td>
                 <td style="min-width:40px;">
                     <span v-if="item.Tue_M.patient_id">
                         
                         <span>{{ item.Tue_M.patient }}</span>
-                        <span>{{ item.Tue_M.mode_name }}</span>
+                        <span  v-if="item.Tue_M.mode_name != 'HD'">{{ item.Tue_M.mode_name }}</span>
                     </span>
                 </td>
                 <td style="min-width:40px;">
                     <span v-if="item.Tue_A.patient_id">
                         
                         <span>{{ item.Tue_A.patient }}</span>
-                        <span>{{ item.Tue_A.mode_name }}</span>
+                        <span  v-if="item.Tue_A.mode_name != 'HD'">{{ item.Tue_A.mode_name }}</span>
                     </span>
                 </td>
                 <td style="min-width:40px;">
                     <span v-if="item.Tue_N.patient_id">
                         
                         <span>{{ item.Tue_N.patient }}</span>
-                        <span>{{ item.Tue_N.mode_name }}</span>
+                        <span v-if="item.Tue_N.mode_name != 'HD'">{{ item.Tue_N.mode_name }}</span>
                     </span>
                 </td>
                 <td style="min-width:40px;">
                     <span v-if="item.Wed_M.patient_id">
                         
                         <span>{{ item.Wed_M.patient }}</span>
-                        <span>{{ item.Wed_M.mode_name }}</span>
+                        <span v-if="item.Wed_M.mode_name != 'HD'">{{ item.Wed_M.mode_name }}</span>
                     </span>
                 </td>
                 <td style="min-width:40px;">
                     <span v-if="item.Wed_A.patient_id">
                         <span>{{ item.Wed_A.patient }}</span>
-                        <span>{{ item.Wed_A.mode_name }}</span>
+                        <span v-if="item.Wed_A.mode_name != 'HD'">{{ item.Wed_A.mode_name }}</span>
                     </span>
                 </td>
                 <td style="min-width:40px;">
                     <span v-if="item.Wed_N.patient_id">
                         <span>{{ item.Wed_N.patient }}</span>
-                        <span>{{ item.Wed_N.mode_name }}</span>
+                        <span v-if="item.Wed_N.mode_name != 'HD'">{{ item.Wed_N.mode_name }}</span>
                     </span>
                 </td>
                 <td style="min-width:40px;">
                     <span v-if="item.Thurs_M.patient_id">     
                         <span>{{ item.Thurs_M.patient }}</span>
-                        <span>{{ item.Thurs_M.mode_name }}</span>
+                        <span  v-if="item.Thurs_M.mode_name != 'HD'">{{ item.Thurs_M.mode_name }}</span>
                     </span>
                 </td>
                 <td style="min-width:40px;">
                     <span v-if="item.Thurs_A.patient_id">                   
                         <span>{{ item.Thurs_A.patient }}</span>
-                        <span>{{ item.Thurs_A.mode_name }}</span>
+                        <span v-if="item.Thurs_A.mode_name != 'HD'">{{ item.Thurs_A.mode_name }}</span>
                     </span>
                 </td>
                 <td style="min-width:40px;">
                     <span v-if="item.Thurs_N.patient_id">           
                         <span>{{ item.Thurs_N.patient }}</span>
-                        <span>{{ item.Thurs_N.mode_name }}</span>
+                        <span  v-if="item.Thurs_N.mode_name != 'HD'">{{ item.Thurs_N.mode_name }}</span>
                     </span>
                 </td>
                 <td style="min-width:40px;">
                     <span v-if="item.Fri_M.patient_id">                  
                         <span>{{ item.Fri_M.patient }}</span>
-                        <span>{{ item.Fri_M.mode_name }}</span>
+                        <span v-if="item.Fri_M.mode_name != 'HD'">{{ item.Fri_M.mode_name }}</span>
                     </span>
                 </td>
                 <td style="min-width:40px;">
                     <span v-if="item.Fri_A.patient_id">                     
                         <span>{{ item.Fri_A.patient }}</span>
-                        <span>{{ item.Fri_A.mode_name }}</span>
+                        <span v-if="item.Fri_A.mode_name != 'HD'">{{ item.Fri_A.mode_name }}</span>
                     </span>
                 </td>
                 <td style="min-width:40px;">
                     <span v-if="item.Fri_N.patient_id">                      
                         <span>{{ item.Fri_N.patient }}</span>
-                        <span>{{ item.Sat_M.mode_name }}</span>
+                        <span v-if="item.Fri_N.mode_name != 'HD'">{{ item.Sat_M.mode_name }}</span>
                     </span>
                 </td>
                 <td style="min-width:40px;">
                     <span v-if="item.Sat_M.patient_id">                      
                         <span>{{ item.Sat_M.patient }}</span>
-                        <span>{{ item.Sat_M.mode_name }}</span>
+                        <span  v-if="item.Sat_M.mode_name != 'HD'">{{ item.Sat_M.mode_name }}</span>
                     </span>
                 </td>
                 <td style="min-width:40px;">
                     <span v-if="item.Sat_A.patient_id">                       
                         <span>{{ item.Sat_A.patient }}</span>
-                        <span>{{ item.Sat_A.mode_name }}</span>
+                        <span v-if="item.Sat_A.mode_name != 'HD'">{{ item.Sat_A.mode_name }}</span>
                     </span>
                 </td>
                 <td style="min-width:40px;">
                     <span v-if="item.Sat_N.patient_id">
                         <span>{{ item.Sat_N.patient }}</span>
-                        <span>{{ item.Sat_N.mode_name }}</span>
+                        <span v-if="item.Sat_N.mode_name != 'HD'">{{ item.Sat_N.mode_name }}</span>
                     </span>
                 </td>
                 <td style="min-width:40px;">
                     <span v-if="item.Sun_M.patient_id">
                         <span>{{ item.Sun_M.patient }}</span>
-                        <span>{{ item.Sun_M.mode_name }}</span>
+                        <span v-if="item.Sun_M.mode_name != 'HD'">{{ item.Sun_M.mode_name }}</span>
                     </span>
                 </td>
                 <td style="min-width:40px;">
                     <span v-if="item.Sun_A.patient_id">
                         <span>{{ item.Sun_A.patient }}</span>
-                        <span>{{ item.Sun_A.mode_name }}</span>
+                        <span v-if="item.Sun_A.mode_name != 'HD'">{{ item.Sun_A.mode_name }}</span>
                     </span>
                 </td>
                 <td style="min-width:40px;">
                     <span v-if="item.Sun_N.patient_id">
                         <span>{{ item.Sun_N.patient }}</span>
-                        <span>{{ item.Sun_N.mode_name }}</span>
+                        <span v-if="item.Sun_N.mode_name != 'HD'">{{ item.Sun_N.mode_name }}</span>
                     </span>
                 </td>
                 <td>{{item.total}}</td>