新分支

src/api/drug/drug.js

@@ -452,6 +452,14 @@ export function getInventoryDetailList(params) {
   })
 }
 
+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/router/index.js

@@ -8,8 +8,7 @@ import device from './modules/device'
 import dialysis from './modules/dialysis'
 import patient from './modules/patient'
 import qcd from './modules/qcd'
-// import Dialysisanalysis from './modules/Dialysisanalysis'//
-import role from './modules/role'
+import Dialysisanalysis from './modules/Dialysisanalysis'
 import stock from './modules/stock'
 import weight_sign from './modules/weight_sign'
 import workforce from './modules/workforce'
@@ -204,7 +203,7 @@ var _asy_router_map = [
   integration,
   basicConfig,
   supply,
-  // Dialysisanalysis,// 新菜单6.1
+  Dialysisanalysis,// 新菜单6.1
 ]
 
 var is_asy_router = process.env.NODE_ENV === 'production' // true; 设置为 true 强制进行路由验证

src/xt_pages/Dialysisanalysis/hemoglobin/hemoglobinall.vue

@@ -81,6 +81,146 @@
         </el-table-column>
       </el-table>
     </div>
+    <el-dialog
+      width="1000px" class="registerDialog" :visible.sync="detailVisibility"
+      :close-on-click-modal="isClose"
+      :close-on-press-escape="isClose"
+    >
+      <el-row :gutter="25">
+        <el-col :span="5">
+          <div class="block">
+            <span>查询时间:</span>
+            <el-select size="small" v-model="time_type_two" placeholder="请选择"
+                       style="width:100px;margin-left:5px;" @change="changeItemTwo">
+              <el-option
+                v-for="item,index in times"
+                :key="index"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+          </div>
+        </el-col>
+        <el-col :span="10">
+          <div>
+            <el-date-picker
+              style="width: 120px"
+              v-model="start_time_one"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
+              type="date"
+
+              placeholder="选择日期">
+            </el-date-picker>
+            <span>-</span>
+            <el-date-picker
+              style="width: 120px"
+              v-model="end_time_one"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
+              type="date"
+              placeholder="选择日期">
+            </el-date-picker>
+          </div>
+        </el-col>
+
+        <el-col :span="4">
+          <div>
+
+            <el-select size="small" v-model="statistics_type" placeholder="请选择"
+                       style="width:100px;margin-left:5px;">
+              <el-option
+                v-for="item,index in statistics_types"
+                :key="index"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+
+          </div>
+        </el-col>
+
+        <!--        <el-col :span="4">-->
+        <!--          <div>-->
+        <!--            <el-select size="small" v-model="sort_type" placeholder="请选择"-->
+        <!--                       style="width:100px;margin-left:5px;">-->
+        <!--              <el-option-->
+        <!--                v-for="item,index in sort_types"-->
+        <!--                :key="index"-->
+        <!--                :label="item.label"-->
+        <!--                :value="item.value">-->
+        <!--              </el-option>-->
+        <!--            </el-select>-->
+        <!--          </div>-->
+        <!--        </el-col>-->
+
+        <el-col :span="4">
+          <div >
+            <el-input v-model="keyword" placeholder="请输入患者姓名或透析号"></el-input>
+          </div>
+        </el-col>
+
+        <el-col :span="2">
+          <div>
+            <el-button @click="getDataTwo()">查询</el-button>
+          </div>
+        </el-col>
+
+        <el-col :span="2">
+          <div>
+            <el-button @click="exportAction()">导出</el-button>
+          </div>
+        </el-col>
+
+        <!--        <el-col :span="2">-->
+        <!--          <div>-->
+        <!--            <el-button @click="getDataTwo()">打印</el-button>-->
+        <!--          </div>-->
+        <!--        </el-col>-->
+
+
+
+
+
+      </el-row>
+
+      <el-table
+        :data="patientTableData"
+        border
+        ref="table"
+        max-height="500px"
+        style="width: 100%">
+        <el-table-column
+          prop="dialysis_no"
+          align="center"
+          label="透析号"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="name"
+          label="患者姓名"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="date"
+          label="检查日期"
+        >
+        </el-table-column>
+
+        <el-table-column
+          prop="inspect_value"
+          label="结果"
+        >
+        </el-table-column>
+
+      </el-table>
+
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="detailVisibility = false">取消</el-button>
+        <el-button type="primary" @click="detailVisibility = false">确定</el-button>
+      </div>
+    </el-dialog>
+
   </div>
 </template>
 <script>
@@ -512,7 +652,6 @@ export default {
       return sums
     },
     handleClick(row) {
-      console.log(row)
       if(row.name == "不达标值患者"){
         this.statistics_type = 1
       }else if(row.name == "达标值患者"){

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -1051,7 +1051,7 @@
                         </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"
@@ -1066,7 +1066,7 @@
                         </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

@@ -1438,13 +1438,23 @@
                                 <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

@@ -1979,7 +1979,7 @@ export default {
       }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

@@ -1066,7 +1066,7 @@
                       </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"
@@ -1080,7 +1080,7 @@
                       </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/template/DialysisPrintOrderSixtyFive.vue

@@ -1,9 +1,9 @@
 <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">
@@ -1374,12 +1374,7 @@
                     <tbody>
                       <tr>
                         <td
-                          :colspan="
-                            prescription.mode_id == 2 ||
-                            prescription.mode_id == 5
-                              ? 14
-                              : 13
-                          "
+                          :colspan="14"
                           style="
                             letter-spacing: 5px;
                             text-align: center;
@@ -1433,12 +1428,12 @@
                         <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
@@ -3279,7 +3274,7 @@ export default {
       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/outpatientCharges/costComparison.vue

@@ -85,6 +85,9 @@ c<template>
                         type="index"
                 >
                 </el-table-column>
+              <el-table-column align="center" prop="name" label="对账日期">
+                <template slot-scope="scope">{{getTimes(scope.row.ctime)}}</template>
+              </el-table-column>
                 <el-table-column align="center" prop="name" label="对账结果">
                     <template slot-scope="scope">{{'平'}}</template>
                 </el-table-column>

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

@@ -207,7 +207,7 @@
            <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

@@ -35,43 +35,44 @@
                 <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>  
@@ -134,6 +135,7 @@ export default {
             page:1,
             storehouse_id:0,
             houseList:[],
+            ids:[]
         }
     },
     methods:{
@@ -144,7 +146,7 @@ export default {
             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
@@ -208,7 +210,18 @@ export default {
          }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

@@ -74,7 +74,7 @@
 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 {
@@ -123,8 +123,9 @@ 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

@@ -131,7 +131,7 @@ export default {
     },
     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

@@ -108,6 +108,7 @@ export default {
             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/user/components/PatientDetail.vue

@@ -365,6 +365,27 @@
                 </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="备注 : "
@@ -1272,6 +1293,7 @@ const defaultForm = {
   doctor:"",
   record_number:"",
   patient_source:"",
+  patient_start_time:"",
 };
 
 export default {
@@ -1615,7 +1637,12 @@ 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

@@ -410,6 +410,26 @@
                 </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="备注 : "
@@ -1078,6 +1098,7 @@ const defaultForm = {
   zb_patient_id:"",
   doctor:"",
   patient_source:0,
+  patient_start_time:"",
   formItem: [
     {
       id: 0,
@@ -1958,7 +1979,13 @@ 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.checkIdCardNo();
           } else {
             this.$notify.error({
@@ -2001,7 +2028,14 @@ export default {
       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/scheduleTablePrint.vue

@@ -47,133 +47,133 @@
                 <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>