Merge branch '2022-10-17_vue_schedule_branch' of http://git.shengws.com/csx/Vue_New into 20220812

src/api/his/his.js

@@ -435,14 +435,14 @@ export function getMonthHisPateintInfo(params) {
     params: params
   })
 }
-
-export function getAllOrders(params) {
-  return request({
-    url: '/api/orders',
-    method: 'get',
-    params: params
-  })
-}
+//
+// export function getAllOrders(params) {
+//   return request({
+//     url: '/api/orders',
+//     method: 'get',
+//     params: params
+//   })
+// }
 
 export function Inhopitalcheck(params) {
   return request({
@@ -708,3 +708,10 @@ export function getHisDataSix(params) {
   })
 }
 
+export function getAllOrders(params) {
+  return request({
+    url: '/handleData10106',
+    method: 'get',
+    params: params
+  })
+}

src/api/schedule_template/patient.js

@@ -1,53 +0,0 @@
-import request from '@/utils/request'
-
-export function getTemplateInitData() {
-  return request({
-    url: '/api/schtemp/p/initdata',
-    method: 'get',
-  })
-}
-
-export function setTemplateMode(mode) {
-  var params = {
-    mode: mode,
-  }
-  return request({
-    url: '/api/schtemp/p/setmode',
-    method: 'post',
-    params: params,
-  })
-}
-
-export function updateSchedules(template_id, add_schs, del_schs, change_schs) {
-  var params = {
-    template_id: template_id,
-    add_schs: add_schs,
-    del_schs: del_schs,
-    change_schs: change_schs,
-  }
-  return request({
-    url: '/api/schtemp/p/update_sch',
-    method: 'post',
-    params: params,
-  })
-}
-
-export function getTemplateScheduleSearchResult(params) {
-  return request({
-    url: '/api/schedule_template/search',
-    method: 'Get',
-    params: params
-  })
-}
-
-
-export function cancelScheduleTemplate(params) {
-  return request({
-    url: '/api/schedule_template/cancel',
-    method: 'Post',
-    params: params
-  })
-}
-
-
-

src/api/schedule_template/sch_template.js

@@ -0,0 +1,127 @@
+import request from '@/utils/request'
+
+export function getTemplateInitData(obj) {
+  return request({
+    url: '/api/schtemp/p/initdata',
+    method: 'get',
+    params: obj,
+
+  })
+}
+
+export function getTemplateInitDataTwo(obj) {
+  return request({
+    url: '/api/schtemp/p/initdata',
+    method: 'get',
+    params: obj,
+  })
+}
+
+export function setTemplateMode(mode,week_time) {
+  var params = {
+    mode: mode,
+    week_time:week_time,
+
+  }
+  return request({
+    url: '/api/schtemp/p/setmode',
+    method: 'post',
+    params: params,
+  })
+}
+
+export function updateSchedules(template_id, add_schs, del_schs, change_schs) {
+  var params = {
+    template_id: template_id,
+    add_schs: add_schs,
+    del_schs: del_schs,
+    change_schs: change_schs,
+  }
+  return request({
+    url: '/api/schtemp/p/update_sch',
+    method: 'post',
+    params: params,
+  })
+}
+
+export function getTemplateScheduleSearchResult(params) {
+  return request({
+    url: '/api/schedule_template/search',
+    method: 'Get',
+    params: params
+  })
+}
+
+
+export function cancelScheduleTemplate(params) {
+  return request({
+    url: '/api/schedule_template/cancel',
+    method: 'Post',
+    params: params
+  })
+}
+
+
+
+export function patientLists(params) {
+  return request({
+    url: '/api/patients/list',
+    method: 'get',
+    params: params
+  })
+}
+
+
+export function PostSearchSmartSchPatient(params) {
+  return request({
+    url: '/api/schedule/smartpatientsch',
+    method: 'get',
+    params: params
+  })
+}
+
+
+export function getPatientSmartSch(params) {
+  return request({
+    url: '/api/patient/smartpatientsch',
+    method: 'get',
+    params: params
+  })
+}
+
+
+export function getSmartDevices(params) {
+  return request({
+    url: '/api/device/get',
+    method: 'get',
+    params: params
+  })
+}
+
+
+export function getPatientSmartSchTemplate(params) {
+  return request({
+    url: '/api/patient/smartpatientschtemplate',
+    method: 'get',
+    params: params
+  })
+}
+
+
+
+export function PostSearchSmartSchTemplatePatient(params) {
+  return request({
+    url: '/api/schedule/smartpatientschtemplate',
+    method: 'get',
+    params: params
+  })
+}
+
+
+export function BatchSmartSch(params,patient_id) {
+  return request({
+    url: '/api/smartsch/batch?patient_id='+patient_id,
+    method: 'post',
+    data: params
+  })
+}

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -2562,6 +2562,7 @@ export default {
                     this.$emit('editKeepLoad', false)
                     this.$parent.getInitData()
                     this.$parent.getInitDataOne()
+                    this.getlist()
                   } else {
                     this.$message.error(response.data.msg)
                     this.$emit('editKeepLoad', false)

src/xt_pages/hospitalStation/doctorDesk.vue

@@ -1233,7 +1233,7 @@
                     medical_code: prescription.project[b].project.medical_code,
                     unit: prescription.project[b].unit,
                     type: prescription.project[b].type,
-                    
+
 
                   }
 
@@ -1244,7 +1244,7 @@
                     obj['medical_code'] = prescription.project[b].project.medical_code
                     obj['project_name'] = prescription.project[b].project.project_name
                     obj['project'] = prescription.project[b].project
-                  
+
 
                   } else if (prescription.project[b].type == 3) {
                     if(prescription.project[b].team_id > 0){
@@ -1254,7 +1254,7 @@
                     obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
                     obj['project_name'] = prescription.project[b].good_info.good_name
                     obj['good_info'] = prescription.project[b].good_info
-                  
+
 
                   }
                   tempProject.push(obj)
@@ -1375,8 +1375,7 @@
                       remark: prescription.project[b].remark,
                       medical_code: prescription.project[b].project.medical_code,
                       unit: prescription.project[b].unit,
-                      type: prescription.project[b].type,
-                      
+                      type: prescription.project[b].type
 
                     }
 
@@ -1386,7 +1385,7 @@
                       obj['project_name'] = prescription.project[b].project.project_name
                       obj['price'] = prescription.project[b].project.price
                       obj['project'] = prescription.project[b].project
-                      
+
 
                     } else if (prescription.project[b].type == 3) {
                       obj['statistical_classification'] = ''
@@ -1394,7 +1393,7 @@
                       obj['project_name'] = prescription.project[b].good_info.good_name
                       obj['price'] = prescription.project[b].good_info.packing_price
                       obj['good_info'] = prescription.project[b].good_info
-                     
+
                     }
                     tempProject.push(obj)
                   }
@@ -1652,7 +1651,7 @@
                           medical_code: prescription.project[b].project.medical_code,
                           unit: prescription.project[b].unit,
                           type: prescription.project[b].type,
-                         
+
                         }
 
                         if (prescription.project[b].type == 2) {
@@ -1791,8 +1790,8 @@
                             remark: prescription.project[b].remark,
                             medical_code: prescription.project[b].project.medical_code,
                             unit: prescription.project[b].unit,
-                            type: prescription.project[b].type,
-                           
+                            type: prescription.project[b].type
+
                           }
 
                           if (prescription.project[b].type == 2) {
@@ -2144,8 +2143,8 @@
                           medical_code: prescription.project[b].project.medical_code,
                           unit: prescription.project[b].unit,
                           type: prescription.project[b].type,
-                         
-                  
+
+
                         }
 
                         if (prescription.project[b].type == 2) {
@@ -2276,7 +2275,7 @@
                             medical_code: prescription.project[b].project.medical_code,
                             unit: prescription.project[b].unit,
                             type: prescription.project[b].type,
-                           
+
                           }
 
                           if (prescription.project[b].type == 2) {
@@ -2619,7 +2618,7 @@
                         medical_code: prescription.project[b].project.medical_code,
                         unit: prescription.project[b].unit,
                         type: prescription.project[b].type,
-                        
+
                       }
 
                       if (prescription.project[b].type == 2) {
@@ -2749,7 +2748,7 @@
                           medical_code: prescription.project[b].project.medical_code,
                           unit: prescription.project[b].unit,
                           type: prescription.project[b].type,
-                         
+
                         }
 
                         if (prescription.project[b].type == 2) {

src/xt_pages/hospitalStation/invoicePrint.vue

@@ -24,11 +24,11 @@
           :paramsObj="invoiceParams"
         ></printOne>
         <printTwo
-          v-if="org_id == 10215 || org_id == 0"
+          v-if="org_id == 10215 "
           :paramsObj="invoiceParams"
         ></printTwo>
         <printThree
-          v-if="org_id == 10265 || org_id == 4 || org_id == 9675"
+          v-if="org_id == 10265 || org_id == 4 || org_id == 9675 || org_id == 0"
           :paramsObj="invoiceParams"
         ></printThree>
       </div>

src/xt_pages/outpatientCharges/invoicePrint.vue

@@ -12,18 +12,18 @@
       >
     </template>
     <div class="app-container" style="padding-top:40px;">
-      <div class='dialysisPage'>
-        <div v-if="org_id != 10106 && org_id != 10215 && org_id != 4 && org_id != 10188 && org_id != 10217 && org_id != 0 && org_id != 10387" >
-          <printOne v-if="org_id != 10088 " :paramsObj="invoiceParams"></printOne>
-          <printThree v-if="org_id == 10088" :paramsObj="invoiceParams"></printThree>
+        <div class='dialysisPage'>
+          <div v-if="org_id != 10106 && org_id != 10215 && org_id != 4 && org_id != 10188 && org_id != 10217 && org_id != 0 && org_id != 10387" >
+            <printOne v-if="org_id != 10088 " :paramsObj="invoiceParams"></printOne>
+            <printThree v-if="org_id == 10088" :paramsObj="invoiceParams"></printThree>
+          </div>
+          <printTwo v-if="org_id == 10106" :paramsObj="invoiceParams"></printTwo>
+          <printFour v-if="org_id == 10215 || org_id == 4 " :paramsObj="invoiceParams"></printFour>
+          <printFive v-if="org_id == 10188 " :paramsObj="invoiceParams"></printFive>
+          <printSix v-if="org_id == 10217" :paramsObj="invoiceParams"></printSix>
+<!--          <printEight v-if="org_id == 10387 || org_id == 0" :paramsObj="invoiceParams"></printEight>-->
+          <print-eight v-if="org_id == 10387 || org_id == 0" :paramsObj="invoiceParams"></print-eight>
         </div>
-        <printTwo v-if="org_id == 10106" :paramsObj="invoiceParams"></printTwo>
-        <printFour v-if="org_id == 10215 || org_id == 4 " :paramsObj="invoiceParams"></printFour>
-        <printFive v-if="org_id == 10188 " :paramsObj="invoiceParams"></printFive>
-        <printSix v-if="org_id == 10217" :paramsObj="invoiceParams"></printSix>
-        <!--          <printEight v-if="org_id == 10387 || org_id == 0" :paramsObj="invoiceParams"></printEight>-->
-        <print-eight v-if="org_id == 10387 || org_id == 0" :paramsObj="invoiceParams"></print-eight>
-      </div>
     </div>
   </div>
 </template>

src/xt_pages/outpatientCharges/listPrint.vue

@@ -16,9 +16,9 @@
     <div class='dialysisPage' style="padding-top:40px;">
       <printOne v-if="org_id != 10106&&org_id != 10215&&org_id != 10265 && org_id != 0 && org_id!=9675" :list="list" :patient="patient" :order="order" :admin="admin"></printOne>
       <printTwo v-if="org_id == 10106 && this.paramsObj.balance_accounts_type != 2" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></printTwo>
-      <print-three v-if="org_id == 10106 && this.paramsObj.balance_accounts_type == 2" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></print-three>
+      <print-three v-if="  org_id == 0 || org_id == 10106 && this.paramsObj.balance_accounts_type == 2" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></print-three>
       <list-print-two v-if="org_id == 10215 || org_id==9675" :list="list" :patient="patient" :order="order" :admin="admin"></list-print-two>
-      <print-two10265  v-if="org_id == 10265 || org_id == 0 " :list="list" :patient="patient" :order="order" :admin="admin" :hospital_record="hospital_record"></print-two10265>
+      <print-two10265  v-if="org_id == 10265  " :list="list" :patient="patient" :order="order" :admin="admin" :hospital_record="hospital_record"></print-two10265>
     </div>
   </div>
 </template>

src/xt_pages/outpatientCharges/listTemplate/printThree.vue

@@ -63,11 +63,13 @@
             <div style="width:20%;text-align:center;">医保编码</div>
             <div style="width:20%;text-align:center;">项目名称</div>
             <div style="width:10%;text-align:center;">单价</div>
-            <div style="width:10%;text-align:center;">数量</div>
+            <div style="width:8%;text-align:center;">数量</div>
             <div style="width:10%;text-align:center;">金额</div>
             <div style="width:10%;text-align:center;">先行自付金额</div>
-            <div style="width:10%;text-align:center;">自费</div>
-            <div style="width:10%;text-align:center;">自费比例</div>
+            <div style="width:5%;text-align:center;">全自费</div>
+            <div style="width:7%;text-align:center;">自费比例</div>
+            <div style="width:10%;text-align:center;">超限价自费金额</div>
+
         </div>
         <div v-for="(newItem,index) in Object.keys(obj)" :key="index">
             <div v-if="Object.values(obj)[index].length > 0"  style="border-bottom:1px solid #000;padding:10px 0;">
@@ -94,6 +96,8 @@
                     <div style="width:10%;text-align:center;">{{item.preselfpay_amt}}</div>
                     <div style="width:10%;text-align:center;">{{item.fulamt_ownpay_amt}}</div>
                     <div style="width:10%;text-align:center;">{{item.selfpay_prop}}</div>
+                    <div style="width:10%;text-align:center;">{{item.overlmt_amt}}</div>
+
                 </div>
             </div>
         </div>

src/xt_pages/outpatientCharges/statementTemplate/printOne.vue

@@ -1,9 +1,11 @@
 <template>
   <div id="statement-print" class="statement-print">
     <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10188 || this.$store.getters.xt_user.org_id == 10217">江苏省社会医疗保险医疗费用结算单</div>
+    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10387">湖南省社会医疗保险医疗费用结算单</div>
+
     <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10191">福建省社会医疗保险医疗费用结算单</div>
     <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10088">广水源生堂社会医疗保险医疗费用结算单</div>
-    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id != 10191 && this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217 &&this.$store.getters.xt_user.org_id != 10088">广东省社会医疗保险医疗费用结算单</div>
+    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id != 10387 && this.$store.getters.xt_user.org_id != 10191 && this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217 &&this.$store.getters.xt_user.org_id != 10088">广东省社会医疗保险医疗费用结算单</div>
 
     <table class="statementTable" border="1">
       <tr>
@@ -27,8 +29,10 @@
 
       </tr>
       <tr>
-        <td width="90">就医登记号</td>
+        <td width="70">就医登记号</td>
         <td colspan="11">{{info.psn_no}}</td>
+        <td width="80">门诊号</td>
+        <td colspan="3">{{info.number}}</td>
       </tr>
       <tr>
         <td width="80">姓名</td>
@@ -85,7 +89,7 @@
         <td width="80">身份证号</td>
         <td colspan="3">{{info.certno}}</td>
       </tr>
-      <tr>
+      <tr v-if="this.$store.getters.xt_user.org_id != 10387">
         <td>住院号</td>
         <td>{{info.number}}</td>
         <td>科别</td>

src/xt_pages/outpatientCharges/summary.vue

@@ -353,7 +353,7 @@ import invoicePrint from "./invoicePrint";
 import settlementPrint from "./settlementPrint";
 import {jsGetAge, uParseTime} from "@/utils/tools";
 
-import {getHisDataFive, getHisDataSix, getHisDataThree, getHisDataTwo} from "../../api/his/his";
+import {getHisDataFive, getHisDataSix, getHisDataThree, getHisDataTwo,getAllOrders} from "../../api/his/his";
 
 import {handleData10106} from "../../api/his/his_export";
 
@@ -1272,10 +1272,25 @@ export default {
           this.$message.error(response.data.msg);
           return false;
         } else {
-          let list = [];
+          let new_orders = []
           for (let i = 0; i < response.data.data.order.length; i++) {
             let order = response.data.data.order[i];
-            console.log(order)
+            let islvguo = false
+            for (let b = 0; b < order.info.length; b++) {
+              if (order.info[b].project.project.id == 372) {
+                islvguo = true
+              }
+
+            }
+            if(islvguo){
+              new_orders.push(order)
+            }
+          }
+          console.log(new_orders.length)
+
+          let list = [];
+          for (let i = 0; i < new_orders.length; i++) {
+            let order = response.data.data.order[i];
             let obj = {
               md: order.mdtrt_id,
               name: order.patient.name,
@@ -1306,21 +1321,13 @@ export default {
 
             for (let b = 0; b < order.info.length; b++) {
               if (order.info[b].advice_id == 0 && order.info[b].project_id > 0) {
-                console.log("11111")
-
                 if (order.info[b].project.type == 2) {
-                  console.log("22222222")
-
                   if (order.info[b].project.project.id == 254 || order.info[b].project.project.id == 253 || order.info[b].project.project.id == 250 || order.info[b].project.project.id == 249) {
                     obj.good_name = this.GetGoodName(order.info[b].project.project.id)
                   }
                 } else if (order.info[b].project.type == 3) {
-                  console.log("3333333")
-
                   if (order.info[b].project.project.id == 1478 || order.info[b].project.project.id == 1479 || order.info[b].project.project.id == 1482 || order.info[b].project.project.id == 1483 || order.info[b].project.project.id == 2577 || order.info[b].project.project.id == 2578 || order.info[b].project.project.id == 2058 || order.info[b].project.project.id == 2059) {
                     obj.good_name = this.GetGoodName(order.info[b].project.good_info.id)
-                    console.log(obj.good_name)
-
                   }
                 }
               }
@@ -2093,46 +2100,63 @@ export default {
         } else {
           let list = [];
           for (let i = 0; i < response.data.data.order.length; i++) {
-            var hifmi_pay = 0.0;
-            for (let b = 0; b < order.order_info.length; b++) {
+            let order = response.data.data.order[i]
+            for (let b = 0; b < order.info.length; b++) {
               let item_name = "";
               let item_code = "";
               let price = "";
               let unit = "";
               let spec = "";
               let time = "";
-              let name = "";
-              let selfpay_prop = "";
+              let cnt = "";
+
               if (
-                  order.order_info[b].advice.id == 0 &&
-                  order.order_info[b].project.id > 0
+                  order.info[b].advices.id == 0 &&
+                  order.info[b].project.id > 0
               ) {
-                item_name = order.order_info[b].project.project.project_name;
-                item_code = order.order_info[b].project.project.medical_code;
-                price = order.order_info[b].pric;
-                unit = order.order_info[b].project.project.unit;
+
+                if (order.info[b].project.type == 2){
+                  item_name = order.info[b].project.project.project_name;
+                  item_code = order.info[b].project.project.medical_code;
+                  price = order.info[b].pric;
+                  unit = order.info[b].project.project.unit;
+                  cnt=order.info[b].cnt;
+                  time = order.setl_time;
+
+                }else{
+
+                  item_name = order.info[b].project.good_info.good_name;
+                  item_code = order.info[b].project.good_info.medical_insurance_number;
+                  price = order.info[b].pric;
+                  unit = order.info[b].project.good_info.packing_unit;
+                  cnt=order.info[b].cnt;
+                  time = order.setl_time;
+
+
+                }
+
               } else if (
-                  order.order_info[b].advice.id > 0 &&
-                  order.order_info[b].project.id == 0
+                  order.info[b].advices.id > 0 &&
+                  order.info[b].project.id == 0
               ) {
-                item_name = order.order_info[b].advice.advice_name;
+                item_name = order.info[b].advices.advice_name;
                 item_code =
-                    order.order_info[b].advice.drug.medical_insurance_number;
-                price = order.order_info[b].pric;
-                unit = order.order_info[b].advice.prescribing_number_unit;
-              }
-              selfpay_prop = order.order_info[b].selfpay_prop;
+                    order.info[b].advices.drug.medical_insurance_number;
+                price = order.info[b].pric;
+                unit = order.info[b].advices.prescribing_number_unit;
+                spec = order.info[b].advices.drug.dose +  order.info[b].advices.drug.dose_unit+"*" + order.info[b].advices.drug.min_number +  order.info[b].advices.drug.min_unit+"/"+order.info[b].advices.drug.max_unit
+                cnt=order.info[b].cnt;
+                time = order.setl_time;
 
+              }
               let obj = {
+                项目编码: item_code,
                 项目名称: item_name,
-                项目编码: "",
-                医保编码: item_code,
-                零售价: price,
+                规格: spec,
+                厂家:"",
                 单位: unit,
-                规格: "",
-                收费时间: time,
-                报销比例: selfpay_prop,
-                患者名称: name,
+                数量: cnt,
+                时间: time,
               };
 
               list.push(obj);
@@ -2140,26 +2164,22 @@ export default {
           }
           import("@/vendor/Export2Excel").then((excel) => {
             const tHeader = [
-              "项目名称",
               "项目编码",
-              "医保编码",
-              "零售价",
-              "单位",
+              "项目名称",
               "规格",
-              "收费时间",
-              "报销比例",
-              "患者名称",
+              "厂家",
+              "单位",
+              "数量",
+              "时间",
             ];
             const filterVal = [
-              "项目名称",
               "项目编码",
-              "医保编码",
-              "零售价",
-              "单位",
+              "项目名称",
               "规格",
-              "收费时间",
-              "报销比例",
-              "患者名称",
+              "厂家",
+              "单位",
+              "数量",
+              "时间",
             ];
             const data = this.formatJson(filterVal, list);
             excel.export_json_to_excel({

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -2565,6 +2565,7 @@
                     this.$message.success('保存成功!')
                     this.$emit('editKeepLoad', false)
                     this.$parent.getInitData()
+                    this.getlist()
                   } else {
                     this.$message.error(response.data.msg)
                     this.$emit('editKeepLoad', false)

src/xt_pages/workforce/components/ScheduleItem.vue

@@ -5,10 +5,14 @@
                 {{scheduleDetail.patient}}
                 <br/>
                 <span v-if="scheduleDetail.mode_name.length>0">({{scheduleDetail.mode_name}})</span>
+              <span >{{scheduleDetail.dialysis_machine_name}}</span>
+
             </div>
             <div>
                 <span :class='modeColor(scheduleDetail.mode_name)'>{{scheduleDetail.patient}}</span><br/>
                 <span v-if="scheduleDetail.mode_name.length>0" :class='modeColor(scheduleDetail.mode_name)'>({{scheduleDetail.mode_name}})</span>
+              <span >{{scheduleDetail.dialysis_machine_name}}</span>
+
             </div>
         </el-tooltip>
     </div>
@@ -26,6 +30,7 @@ export default {
                 mode_name:'',
                 patient_id:0,
                 patient:"",
+                dialysis_machine_name:"",
               }
           },
       },

src/xt_pages/workforce/components/scheduleTemplateUploadExcel/index.vue

@@ -23,7 +23,7 @@
   </span>
     </el-dialog>
     <input id="excel-upload-input" ref="excel-upload-input" type="file" accept=".xlsx, .xls, .xltx" @change="handleClick">
-    <el-button :loading="loading" style="margin-left:16px;" size="mini" type="primary" @click="msgTipVisible = true">点击导入
+    <el-button :loading="loading" style="margin-left:16px;" size="mini" type="primary" @click="msgTipVisible = true">导入数据
     </el-button>
   </div>
 </template>
@@ -96,7 +96,7 @@
       },
       upload(rawFile) {
         this.$refs['excel-upload-input'].value = null // fix can't select the same excel
-       
+
         if (!this.beforeUpload) {
           this.readerData(rawFile)
           return
@@ -107,7 +107,7 @@
         }
       },
       readerData(rawFile) {
-      
+
 
         this.loading = true
         return new Promise((resolve, reject) => {
@@ -148,7 +148,7 @@
         return o
       },
       get_header_row(sheet) {
-      
+
         if(sheet['!ref'] == undefined){
           this.loading = false
           return

src/xt_pages/workforce/components/scheduleUploadExcel/index.vue

@@ -11,7 +11,7 @@
   </span>
     </el-dialog>
      <input id="excel-upload-input" ref="excel-upload-input" type="file"  accept=".xlsx,.xls,.xltx," @change="handleClick" >
-    <el-button :loading="loading" style="margin-left:16px;" size="mini" type="primary" @click="msgTipVisible = true">点击导入
+    <el-button :loading="loading" style="margin-left:16px;" size="mini" type="primary" @click="msgTipVisible = true">导入排班
     </el-button>
   </div>
 </template>
@@ -70,21 +70,21 @@
       },
       handleUpload() {
         this.msgTipVisible = false
-       
+
         document.getElementById('excel-upload-input').click()
       },
       handleClick(e) {
-       
+
         const files = e.target.files
         const rawFile = files[0] // only use files[0]
         console.log("rawfiel",rawFile)
-        if (!rawFile) 
+        if (!rawFile)
         return
         this.upload(rawFile)
 
       },
       upload(rawFile) {
-        
+
         this.$refs['excel-upload-input'].value = null // fix can't select the same excel
         console.log("3333",this.beforeUpload)
         if (!this.beforeUpload) {
@@ -103,16 +103,16 @@
         return new Promise((resolve, reject) => {
           const reader = new FileReader()
           reader.onload = e => {
-           
+
             const data = e.target.result
             console.log("data22222",data)
             const fixedData = this.fixdata(data)
             const workbook = XLSX.read(btoa(fixedData), { type: 'base64' })
             const firstSheetName = workbook.SheetNames[0]
             const worksheet = workbook.Sheets[firstSheetName]
-           
+
             const header = this.get_header_row(worksheet)
-            
+
             const results = XLSX.utils.sheet_to_json(worksheet)
             this.generateDate({ header, results })
             this.loading = false
@@ -148,12 +148,12 @@
         }
         return headers
 
-    
+
 
       },
       isExcel(file) {
-        
-        return /\.(xlsx|xls|csv)$/.test(file.name)       
+
+        return /\.(xlsx|xls|csv)$/.test(file.name)
       }
     }
   }

src/xt_pages/workforce/components/setup_template_dialog.vue

@@ -1,32 +1,71 @@
 <template>
- <!-- top="5vh" -->
-    <el-dialog title="设置模板" width="400px" :visible.sync="visible" :before-close="_close">
-        <el-form :model="form" label-width="100px">
-            <el-form-item label="选择排班模板">
-                <el-select v-model="form.mode" placeholder="">
-                    <el-option label="不启用模板" :value="0"></el-option>
-                    <el-option label="启用单周模板" :value="1"></el-option>
-                    <el-option label="启用双周模板" :value="2"></el-option>
-                </el-select>
-            </el-form-item>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-            <el-button @click="hide">取 消</el-button>
-            <el-button :disabled="$store.getters.xt_user.subscibe.state == 3 ? true : false" type="primary" @click="saveAction">保 存</el-button>
-        </div>
-    </el-dialog>
+  <!-- top="5vh" -->
+  <el-dialog title="设置模板" width="500px" :visible.sync="visible" :before-close="_close">
+    <el-form :model="form" label-width="150px">
+      <el-form-item label="选择排班模板">
+        <el-select v-model="form.mode" placeholder="">
+          <el-option label="不启用模板" :value="0"></el-option>
+          <el-option label="启用单周模板" :value="1"></el-option>
+          <el-option label="启用双周模板" :value="2"></el-option>
+          <el-option label="启用三周模板" :value="3"></el-option>
+          <el-option label="启用四周模板" :value="4"></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="模版自动生成起始周" v-if="form.mode > 0">
+        <el-date-picker
+            v-model="week_time"
+            type="week"
+            format="yyyy 第 WW 周"
+            placeholder="选择周"
+            :picker-options="pickerOptions0"
+            @change="changeWeek"
+        >
+        </el-date-picker>
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="hide">取 消</el-button>
+      <el-button :disabled="$store.getters.xt_user.subscibe.state == 3 ? true : false" type="primary"
+                 @click="saveAction">保 存
+      </el-button>
+    </div>
+  </el-dialog>
 </template>
 
 <script>
-import { setTemplateMode } from '@/api/schedule_template/patient'
+import {setTemplateMode} from '@/api/schedule_template/sch_template'
 
 export default {
   name: 'SetUpTemplateDialog',
   data() {
     return {
+      pickerOptions0: {
+        'firstDayOfWeek': 1,
+        disabledDate(time) {
+          var nowDate = new Date();
+          var nowYear = nowDate.getFullYear();
+          var nowMonth = nowDate.getMonth() + 1;
+          var nowDay = nowDate.getDate()+7;
+          let time_temp =
+              nowYear +
+              "-" +
+              (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+              "-" +
+              (nowDay < 10 ? "0" + nowDay : nowDay);
+
+          time_temp = time_temp.replace(/-/g,'/'); // 将-替换成/，因为下面这个构造函数只支持/分隔的日期字符串
+
+          var date = new Date(time_temp)
+
+          return time.getTime() < date.getTime() - 8.64e7;//如果没有后面的-8.64e7就是不可以选择今天的
+        }
+      },
       visible: false,
+      week_time:"",
       form: {
-        mode: 0
+        mode: 0,
+        week_time:"",
       }
     }
   },
@@ -39,16 +78,37 @@ export default {
     }
   },
   watch: {
-    'template_mode.mode': function() {
+    'template_mode.mode': function () {
       this.form.mode = this.template_mode.mode
     }
   },
   methods: {
-    _close: function(done) {
+    getYearWeek(endDate) {
+      //本年的第一天
+      var beginDate = new Date(endDate.getFullYear(), 0, 1);
+      //星期从0-6,0代表星期天，6代表星期六
+      var endWeek = endDate.getDay();
+      if (endWeek == 0) endWeek = 7;
+      var beginWeek = beginDate.getDay();
+      if (beginWeek == 0) beginWeek = 7;
+      //计算两个日期的天数差
+      var millisDiff = endDate.getTime() - beginDate.getTime();
+      var dayDiff = Math.floor((millisDiff + (beginWeek - endWeek) * (24 * 60 * 60 * 1000)) / 86400000);
+      return Math.ceil(dayDiff / 7) + 1;
+    },
+
+    changeWeek(val) {
+      this.form.week_time = this.getYearWeek(val) -1
+
+
+
+
+    },
+    _close: function (done) {
       this.clear()
       done()
     },
-    clear: function() {
+    clear: function () {
 
     },
     show() {
@@ -59,28 +119,46 @@ export default {
       this.clear()
       this.visible = false
     },
-    saveAction: function() {
+    saveAction: function () {
+      console.log(this.form.week_time)
+      if(this.form.mode > 0 && this.form.week_time.length == 0){
+        this.$message.error("请选择模版自动生成起始周")
+        return
+      }
+
+
+
       var msg = ''
       if (this.origin_mode == 0) { // 0 -> 1 或 0 -> 2 直接清除下两周的排班
-        msg = '开启模板将清除下两周已设置的排班！是否继续开启？'
+        msg = '开启模板将清除四周已设置的排班！是否继续开启？'
       } else if (this.form.mode == 0) { // 1 -> 0 或 2 -> 0 则不处理排班，但清除所有模板item
 
       } else if (this.origin_mode == 1 && this.form.mode == 2) { // 1 -> 2 清除第二周排班
         msg = '开启双周模板将清除下第二周已设置的排班！是否继续开启？'
       } else if (this.origin_mode == 2 && this.form.mode == 1) { // 2 -> 1 清除第二周模板item，清除第二周排班，将第一周的排班重复到第二周
-        msg = '双周模板调整为单周模板时，下第二周排班将被清除，并用单周模板生成下第二周的排班！是否继续调整？'
+        msg = '双周模板调整为单周模板时，下第二周排班将被清除，是否继续调整？'
+      } else if (this.origin_mode == 3 && this.form.mode == 1) { // 2 -> 1 清除第二周模板item，清除第二周排班，将第一周的排班重复到第二周
+        msg = '三周模板调整为单周模板时，下第二，三周排班将被清除，是否继续调整？'
+      } else if (this.origin_mode == 3 && this.form.mode == 2) { // 2 -> 1 清除第二周模板item，清除第二周排班，将第一周的排班重复到第二周
+        msg = '三周模板调整为双周模板时，下第三周排班将被清除，是否继续调整？'
+      } else if (this.origin_mode == 4 && this.form.mode == 1) { // 2 -> 1 清除第二周模板item，清除第二周排班，将第一周的排班重复到第二周
+        msg = '四周模板调整为单周模板时，下第二，三，四周排班将被清除，是否继续调整？'
+      }else if (this.origin_mode == 4 && this.form.mode == 2) { // 2 -> 1 清除第二周模板item，清除第二周排班，将第一周的排班重复到第二周
+        msg = '四周模板调整为双周模板时，下第三，四周排班将被清除，是否继续调整？'
+      }else if (this.origin_mode == 4 && this.form.mode == 3) { // 2 -> 1 清除第二周模板item，清除第二周排班，将第一周的排班重复到第二周
+        msg = '四周模板调整为三周模板时，下第四周排班将被清除，是否继续调整？'
       }
       if (msg.length == 0) {
         this.submit()
       } else {
-        this.$confirm(msg, '提示', { confirmButtonText: '确 定', cancelButtonText: '取 消', type: 'warning' })
-          .then(() => {
-            this.submit()
-          })
+        this.$confirm(msg, '提示', {confirmButtonText: '确 定', cancelButtonText: '取 消', type: 'warning'})
+            .then(() => {
+              this.submit()
+            })
       }
     },
-    submit: function() {
-      setTemplateMode(this.form.mode).then(rs => {
+    submit: function () {
+      setTemplateMode(this.form.mode,this.form.week_time).then(rs => {
         var resp = rs.data
         if (resp.state == 1) {
           this.template_mode.mode = this.form.mode

src/xt_pages/workforce/components/template_schedule_selector_dialog.vue

@@ -1,27 +1,27 @@
 <template>
   <el-dialog
-    title="选择患者"
+    title="修改透析模式"
     width="40%"
     :visible.sync="visible"
     :before-close="_close"
   >
     <el-form :model="form" label-width="80px" :rules="rules">
-      <el-form-item label="患者" required prop="patient_id">
-        <el-select
-          v-model="form.patient_id"
-          placeholder="选择患者"
-          filterable
-          clearable
-        >
-          <el-option
-            v-for="patient in patients"
-            :key="patient.id"
-            :value="patient.id"
-            :label="patient.name"
-          >
-          </el-option>
-        </el-select>
-      </el-form-item>
+<!--      <el-form-item label="患者" required prop="patient_id">-->
+<!--        <el-select-->
+<!--          v-model="form.patient_id"-->
+<!--          placeholder="选择患者"-->
+<!--          filterable-->
+<!--          clearable-->
+<!--        >-->
+<!--          <el-option-->
+<!--            v-for="patient in patients"-->
+<!--            :key="patient.id"-->
+<!--            :value="patient.id"-->
+<!--            :label="patient.name"-->
+<!--          >-->
+<!--          </el-option>-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
       <el-form-item label="透析模式" required prop="treat_mode">
         <el-select
           v-model="form.treat_mode"
@@ -39,7 +39,7 @@
       </el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer">
-      <el-button @click="cancelScheduleAction">取消排班</el-button>
+<!--      <el-button @click="cancelScheduleAction">取消排班</el-button>-->
       <el-button type="primary" @click="saveAction">保 存</el-button>
     </div>
   </el-dialog>

src/xt_pages/workforce/scheduleTablePrintOne.vue

@@ -46,35 +46,35 @@
                         <div v-if="item.Mon_M.mode_name != 'HD'">
                             {{ item.Mon_M.mode_name }}
                        </div>
-                        <div v-if="item.zone_id>0">{{getDialyzer(item.Mon_M.patient_id,item.Mon_M.mode_name)}}</div>
+                        <div v-if="item.zone_id>0">{{item.Mon_M.dialysis_machine_name}}</div>
                     </span>
                 </td>
                 <td style="min-width:50px;">
                     <span v-if="item.Mon_A.patient_id">
                         <div>{{ item.Mon_A.patient }} </div>
                         <div v-if="item.Mon_A.mode_name != 'HD'">{{ item.Mon_A.mode_name }}</div>
-                       <div v-if="item.zone_id>0">{{getDialyzer(item.Mon_A.patient_id,item.Mon_A.mode_name)}}</div>
+                       <div v-if="item.zone_id>0">{{item.Mon_A.dialysis_machine_name}}</div>
                     </span>
                 </td>
                 <td style="min-width:50px;">
                     <span v-if="item.Mon_N.patient_id">
                         <div>{{ item.Mon_N.patient }}</div>
                         <div v-if="item.Mon_N.mode_name != 'HD'">{{ item.Mon_N.mode_name }}</div>
-                        <div v-if="item.zone_id>0">{{getDialyzer(item.Mon_N.patient_id,item.Mon_N.mode_name)}}</div>
+                        <div v-if="item.zone_id>0">{{item.Mon_N.dialysis_machine_name}}</div>
                     </span>
                 </td>
                 <td style="min-width:50px;">
                     <span v-if="item.Tue_M.patient_id">
                         <div>{{ item.Tue_M.patient }}</div>
                         <div v-if="item.Tue_M.mode_name != 'HD'">{{ item.Tue_M.mode_name }}</div>
-                         <div v-if="item.zone_id>0">{{getDialyzer(item.Tue_M.patient_id,item.Tue_M.mode_name)}}</div>
+                         <div v-if="item.zone_id>0">{{item.Tue_M.dialysis_machine_name}}</div>
                     </span>
                 </td>
                 <td style="min-width:50px;">
                     <span v-if="item.Tue_A.patient_id">
                         <div>{{ item.Tue_A.patient }}</div>
                         <div v-if="item.Tue_A.mode_name != 'HD'">{{ item.Tue_A.mode_name }}</div>
-                        <div v-if="item.zone_id>0">{{getDialyzer(item.Tue_A.patient_id,item.Tue_A.mode_name)}}</div>
+                        <div v-if="item.zone_id>0">{{item.Tue_A.dialysis_machine_name}}</div>
 
                     </span>
                 </td>
@@ -82,105 +82,105 @@
                     <span v-if="item.Tue_N.patient_id">
                         <div>{{ item.Tue_N.patient }}</div>
                         <div v-if="item.Tue_N.mode_name != 'HD'">{{ item.Tue_N.mode_name }}</div>
-                        <div v-if="item.zone_id>0">{{getDialyzer(item.Tue_N.patient_id,item.Tue_N.mode_name)}}</div>
+                        <div v-if="item.zone_id>0">{{item.Tue_N.dialysis_machine_name}}</div>
                     </span>
                 </td>
                 <td style="min-width:50px;">
                     <span v-if="item.Wed_M.patient_id">
                         <div>{{ item.Wed_M.patient }}</div>
                         <div v-if="item.Wed_M.mode_name != 'HD'">{{ item.Wed_M.mode_name }}</div>
-                        <div v-if="item.zone_id>0">{{getDialyzer(item.Wed_M.patient_id,item.Wed_M.mode_name)}}</div>
+                        <div v-if="item.zone_id>0">{{item.Wed_M.dialysis_machine_name}}</div>
                     </span>
                 </td>
                 <td style="min-width:50px;">
                     <span v-if="item.Wed_A.patient_id">
                         <div>{{ item.Wed_A.patient }}</div>
                         <div v-if="item.Wed_A.mode_name != 'HD'">{{ item.Wed_A.mode_name }}</div>
-                       <div v-if="item.zone_id>0">{{getDialyzer(item.Wed_A.patient_id,item.Wed_A.mode_name)}}</div>
+                       <div v-if="item.zone_id>0">{{item.Wed_A.dialysis_machine_name}}</div>
                     </span>
                 </td>
                 <td style="min-width:50px;">
                     <span v-if="item.Wed_N.patient_id">
                         <div>{{ item.Wed_N.patient }}</div>
                         <div v-if="item.Wed_N.mode_name != 'HD'">{{ item.Wed_N.mode_name }}</div>
-                        <div v-if="item.zone_id>0">{{getDialyzer(item.Wed_N.patient_id,item.Wed_N.mode_name)}}</div>
+                        <div v-if="item.zone_id>0">{{item.Wed_N.dialysis_machine_name}}</div>
                     </span>
                 </td>
                 <td style="min-width:50px;">
                     <span v-if="item.Thurs_M.patient_id">
                         <div>{{ item.Thurs_M.patient }}</div>
                         <div v-if="item.Thurs_M.mode_name != 'HD'">{{ item.Thurs_M.mode_name }}</div>
-                        <div v-if="item.zone_id>0">{{getDialyzer(item.Thurs_M.patient_id,item.Thurs_M.mode_name)}}</div>
+                        <div v-if="item.zone_id>0">{{item.Thurs_M.dialysis_machine_name}}</div>
                     </span>
                 </td>
                 <td style="min-width:50px;">
                     <span v-if="item.Thurs_A.patient_id">
                         <div>{{ item.Thurs_A.patient }}</div>
                         <div v-if="item.Thurs_A.mode_name != 'HD'">{{ item.Thurs_A.mode_name }}</div>
-                       <div v-if="item.zone_id>0">{{getDialyzer(item.Thurs_A.patient_id,item.Thurs_A.mode_name)}}</div>
+                       <div v-if="item.zone_id>0">{{item.Thurs_A.dialysis_machine_name}}</div>
                     </span>
                 </td>
                 <td style="min-width:50px;">
                     <span v-if="item.Thurs_N.patient_id">
                         <div>{{ item.Thurs_N.patient }}</div>
                         <div v-if="item.Thurs_N.mode_name != 'HD'">{{ item.Thurs_N.mode_name }}</div>
-                        <div v-if="item.zone_id>0">{{getDialyzer(item.Thurs_N.patient_id,item.Thurs_N.mode_name)}}</div>
+                        <div v-if="item.zone_id>0">{{item.Thurs_N.dialysis_machine_name}}</div>
                     </span>
                 </td>
                 <td style="min-width:50px;">
                     <span v-if="item.Fri_M.patient_id">
                         <div>{{ item.Fri_M.patient }}</div>
                         <div v-if="item.Fri_M.mode_name != 'HD'">{{ item.Fri_M.mode_name }}</div>
-                        <div v-if="item.zone_id>0">{{getDialyzer(item.Fri_M.patient_id,item.Fri_M.mode_name)}}</div>
+                        <div v-if="item.zone_id>0">{{item.Fri_M.dialysis_machine_name}}</div>
                     </span>
                 </td>
                 <td style="min-width:50px;">
                     <span v-if="item.Fri_A.patient_id">
                         <div>{{ item.Fri_A.patient }}</div>
                         <div v-if="item.Fri_A.mode_name != 'HD'">{{ item.Fri_A.mode_name }}</div>
-                        <div v-if="item.zone_id>0">{{getDialyzer(item.Fri_A.patient_id,item.Fri_A.mode_name)}}</div>
+                        <div v-if="item.zone_id>0">{{item.Fri_A.dialysis_machine_name}}</div>
                     </span>
                 </td>
                 <td style="min-width:50px;">
                     <span v-if="item.Fri_N.patient_id">
                         <div>{{ item.Fri_N.patient }}</div>
                         <div v-if="item.Fri_N.mode_name != 'HD'">{{ item.Fri_N.mode_name }}</div>
-                       <div v-if="item.zone_id>0">{{getDialyzer(item.Fri_N.patient_id,item.Fri_N.mode_name)}}</div>
+                       <div v-if="item.zone_id>0">{{item.Fri_N.dialysis_machine_name}}</div>
                     </span>
                 </td>
                 <td style="min-width:50px;">
                     <span v-if="item.Sat_M.patient_id">
                         <div>{{ item.Sat_M.patient }}</div>
                         <div v-if="item.Sat_M.mode_name != 'HD'">{{ item.Sat_M.mode_name }}</div>
-                       <div v-if="item.zone_id>0">{{getDialyzer(item.Sat_M.patient_id,item.Sat_M.mode_name)}}</div>
+                       <div v-if="item.zone_id>0">{{item.Sat_M.dialysis_machine_name}}</div>
                     </span>
                 </td>
                 <td style="min-width:50px;">
                     <span v-if="item.Sat_A.patient_id">
                         <div>{{ item.Sat_A.patient }}</div>
                         <div v-if="item.Sat_A.mode_name != 'HD'">{{ item.Sat_A.mode_name }}</div>
-                        <div v-if="item.zone_id>0">{{getDialyzer(item.Sat_A.patient_id,item.Sat_A.mode_name)}}</div>
+                        <div v-if="item.zone_id>0">{{item.Sat_A.dialysis_machine_name}}</div>
                     </span>
                 </td>
                 <td style="min-width:50px;">
                     <span v-if="item.Sat_N.patient_id">
                         <div>{{ item.Sat_N.patient }}</div>
                         <div v-if="item.Sat_N.mode_name != 'HD'">{{ item.Sat_N.mode_name }}</div>
-                        <div v-if="item.zone_id>0">{{getDialyzer(item.Sat_N.patient_id,item.Sat_N.mode_name)}}</div>
+                        <div v-if="item.zone_id>0">{{item.Sat_N.dialysis_machine_name}}</div>
                     </span>
                 </td>
                 <td style="min-width:50px;">
                     <span v-if="item.Sun_M.patient_id">
                         <div>{{ item.Sun_M.patient }}</div>
                         <div v-if="item.Sun_M.mode_name != 'HD'">{{ item.Sun_M.mode_name }} </div>
-                        <div v-if="item.zone_id>0">{{getDialyzer(item.Sun_M.patient_id,item.Sun_M.mode_name)}}</div>
+                        <div v-if="item.zone_id>0">{{item.Sun_M.dialysis_machine_name}}</div>
                     </span>
                 </td>
                 <td style="min-width:50px;">
                     <span v-if="item.Sun_A.patient_id">
                         <div>{{ item.Sun_A.patient }}</div>
                         <div v-if="item.Sun_A.mode_name != 'HD'">{{ item.Sun_A.mode_name }} </div>
-                        <div v-if="item.zone_id>0">{{getDialyzer(item.Sun_A.patient_id, item.Sun_A.mode_name)}}</div>
+                        <div v-if="item.zone_id>0">{{item.Sun_A.dialysis_machine_name}}</div>
 
                     </span>
                 </td>
@@ -188,7 +188,7 @@
                     <span v-if="item.Sun_N.patient_id">
                         <div>{{ item.Sun_N.patient }}</div>
                         <div v-if="item.Sun_N.mode_name != 'HD'">{{ item.Sun_N.mode_name }} </div>
-                        <div v-if="item.zone_id>0">{{getDialyzer(item.Sun_N.patient_id,item.Sun_N.mode_name)}}</div>
+                        <div v-if="item.zone_id>0">{{item.Sun_N.dialysis_machine_name}}</div>
                     </span>
                 </td>
                 <td>{{item.total}}</td>
@@ -298,7 +298,8 @@ export default {
                                 mode_name: '',
                                 patient_id: 0,
                                 patient: '',
-                                type:1
+                                type:1,
+                              dialysis_machine_name:"",
                             },
                             Mon_A: {
                                 schedule_id: 0,
@@ -306,7 +307,9 @@ export default {
                                 mode_name: '',
                                 patient_id: 0,
                                 patient: '',
-                                type:1
+                                type:1,
+                              dialysis_machine_name:"",
+
                             },
                             Mon_N: {
                                 schedule_id: 0,
@@ -314,7 +317,9 @@ export default {
                                 mode_name: '',
                                 patient_id: 0,
                                 patient: '',
-                                type:1
+                                type:1,
+                              dialysis_machine_name:"",
+
                             },
                             Tue_M: {
                                 schedule_id: 0,
@@ -322,7 +327,9 @@ export default {
                                 mode_name: '',
                                 patient_id: 0,
                                 patient: '',
-                                type:1
+                                type:1,
+                              dialysis_machine_name:"",
+
                             },
                             Tue_A: {
                                 schedule_id: 0,
@@ -330,7 +337,10 @@ export default {
                                 mode_name: '',
                                 patient_id: 0,
                                 patient: '',
-                                type:1
+                                type:1,
+                              dialysis_machine_name:"",
+
+
                             },
                             Tue_N: {
                                 schedule_id: 0,
@@ -338,7 +348,9 @@ export default {
                                 mode_name: '',
                                 patient_id: 0,
                                 patient: '',
-                                type:1
+                                type:1,
+                              dialysis_machine_name:"",
+
                             },
                             Wed_M: {
                                 schedule_id: 0,
@@ -346,7 +358,9 @@ export default {
                                 mode_name: '',
                                 patient_id: 0,
                                 patient: '',
-                                type:1
+                                type:1,
+                              dialysis_machine_name:"",
+
                             },
                             Wed_A: {
                                 schedule_id: 0,
@@ -354,7 +368,9 @@ export default {
                                 mode_name: '',
                                 patient_id: 0,
                                 patient: '',
-                                type:1
+                                type:1,
+                              dialysis_machine_name:"",
+
                             },
                             Wed_N: {
                                 schedule_id: 0,
@@ -362,7 +378,9 @@ export default {
                                 mode_name: '',
                                 patient_id: 0,
                                 patient: '',
-                                type:1
+                                type:1,
+                              dialysis_machine_name:"",
+
                             },
                             Thurs_M: {
                                 schedule_id: 0,
@@ -370,7 +388,9 @@ export default {
                                 mode_name: '',
                                 patient_id: 0,
                                 patient: '',
-                                type:1
+                                type:1,
+                              dialysis_machine_name:"",
+
                             },
                             Thurs_A: {
                                 schedule_id: 0,
@@ -378,7 +398,9 @@ export default {
                                 mode_name: '',
                                 patient_id: 0,
                                 patient: '',
-                                type:1
+                                type:1,
+                              dialysis_machine_name:"",
+
                             },
                             Thurs_N: {
                                 schedule_id: 0,
@@ -386,7 +408,9 @@ export default {
                                 mode_name: '',
                                 patient_id: 0,
                                 patient: '',
-                                type:1
+                                type:1,
+                              dialysis_machine_name:"",
+
                             },
                             Fri_M: {
                                 schedule_id: 0,
@@ -394,7 +418,9 @@ export default {
                                 mode_name: '',
                                 patient_id: 0,
                                 patient: '',
-                                type:1
+                                type:1,
+                              dialysis_machine_name:"",
+
                             },
                             Fri_A: {
                                 schedule_id: 0,
@@ -402,7 +428,9 @@ export default {
                                 mode_name: '',
                                 patient_id: 0,
                                 patient: '',
-                                type:1
+                                type:1,
+                              dialysis_machine_name:"",
+
                             },
                             Fri_N: {
                                 schedule_id: 0,
@@ -410,7 +438,9 @@ export default {
                                 mode_name: '',
                                 patient_id: 0,
                                 patient: '',
-                                type:1
+                                type:1,
+                              dialysis_machine_name:"",
+
                             },
                             Sat_M: {
                                 schedule_id: 0,
@@ -418,7 +448,9 @@ export default {
                                 mode_name: '',
                                 patient_id: 0,
                                 patient: '',
-                                type:1
+                                type:1,
+                              dialysis_machine_name:"",
+
                             },
                             Sat_A: {
                                 schedule_id: 0,
@@ -426,7 +458,9 @@ export default {
                                 mode_name: '',
                                 patient_id: 0,
                                 patient: '',
-                                type:1
+                                type:1,
+                              dialysis_machine_name:"",
+
                             },
                             Sat_N: {
                                 schedule_id: 0,
@@ -434,7 +468,9 @@ export default {
                                 mode_name: '',
                                 patient_id: 0,
                                 patient: '',
-                                type:1
+                                type:1,
+                              dialysis_machine_name:"",
+
                             },
                             Sun_A: {
                                 schedule_id: 0,
@@ -442,7 +478,9 @@ export default {
                                 mode_name: '',
                                 patient_id: 0,
                                 patient: '',
-                                type:1
+                                type:1,
+                              dialysis_machine_name:"",
+
                             },
                             Sun_N: {
                                 schedule_id: 0,
@@ -450,7 +488,9 @@ export default {
                                 mode_name: '',
                                 patient_id: 0,
                                 patient: '',
-                                type:1
+                                type:1,
+                              dialysis_machine_name:"",
+
                             },
                             Sun_M: {
                                 schedule_id: 0,
@@ -458,7 +498,9 @@ export default {
                                 mode_name: '',
                                 patient_id: 0,
                                 patient: '',
-                                type:1
+                                type:1,
+                              dialysis_machine_name:"",
+
                             },
                             total: 0
                             }
@@ -512,147 +554,190 @@ export default {
                             mode_name: "",
                             patient_id: 0,
                             patient: "",
-                            type:1
+                            type:1,
+                          dialysis_machine_name:"",
+
                         };
                         that.scheduleZone[index].Mon_A = {
                             mode_id: 0,
                             mode_name: "",
                             patient_id: 0,
                             patient: "",
-                            type:1
+                            type:1,
+                          dialysis_machine_name:"",
+
                         };
                         that.scheduleZone[index].Mon_N = {
                             mode_id: 0,
                             mode_name: "",
                             patient_id: 0,
                             patient: "",
-                            type:1
+                            type:1,
+                          dialysis_machine_name:"",
+
                         };
                         that.scheduleZone[index].Tue_M = {
                             mode_id: 0,
                             mode_name: "",
                             patient_id: 0,
                             patient: "",
-                            type:1
+                            type:1,
+                          dialysis_machine_name:"",
+
                         };
                         that.scheduleZone[index].Tue_A = {
                             mode_id: 0,
                             mode_name: "",
                             patient_id: 0,
                             patient: "",
-                            type:1
+                            type:1,
+                          dialysis_machine_name:"",
+
                         };
                         that.scheduleZone[index].Tue_N = {
                             mode_id: 0,
                             mode_name: "",
                             patient_id: 0,
                             patient: "",
-                            type:1
+                            type:1,
+                          dialysis_machine_name:"",
+
                         };
                         that.scheduleZone[index].Wed_M = {
                             mode_id: 0,
                             mode_name: "",
                             patient_id: 0,
                             patient: "",
-                            type:1
+                            type:1,
+                          dialysis_machine_name:"",
+
                         };
                         that.scheduleZone[index].Wed_A = {
                             mode_id: 0,
                             mode_name: "",
                             patient_id: 0,
                             patient: "",
-                            type:1
+                            type:1,
+                          dialysis_machine_name:"",
+
                         };
                         that.scheduleZone[index].Wed_N = {
                             mode_id: 0,
                             mode_name: "",
                             patient_id: 0,
                             patient: "",
-                            type:1
+                            type:1,
+                          dialysis_machine_name:"",
+
                         };
                         that.scheduleZone[index].Thurs_M = {
                             mode_id: 0,
                             mode_name: "",
                             patient_id: 0,
                             patient: "",
-                            type:1
+                            type:1,
+                          dialysis_machine_name:"",
+
                         };
                         that.scheduleZone[index].Thurs_A = {
                             mode_id: 0,
                             mode_name: "",
                             patient_id: 0,
                             patient: "",
-                            type:1
+                            type:1,
+                          dialysis_machine_name:"",
+
                         };
                         that.scheduleZone[index].Thurs_N = {
                             mode_id: 0,
                             mode_name: "",
                             patient_id: 0,
                             patient: "",
-                            type:1
+                            type:1,
+                          dialysis_machine_name:"",
+
                         };
                         that.scheduleZone[index].Fri_M = {
                             mode_id: 0,
                             mode_name: "",
                             patient_id: 0,
                             patient: "",
-                            type:1
+                            type:1,
+                          dialysis_machine_name:"",
+
                         };
                         that.scheduleZone[index].Fri_A = {
                             mode_id: 0,
                             mode_name: "",
                             patient_id: 0,
                             patient: "",
-                            type:1
+                            type:1,
+                          dialysis_machine_name:"",
+
                         };
                         that.scheduleZone[index].Fri_N = {
                             mode_id: 0,
                             mode_name: "",
                             patient_id: 0,
                             patient: "",
-                            type:1
+                            type:1,
+                          dialysis_machine_name:"",
+
                         };
                         that.scheduleZone[index].Sat_M = {
                             mode_id: 0,
                             mode_name: "",
                             patient_id: 0,
                             patient: "",
-                            type:1
+                            type:1,
+                          dialysis_machine_name:"",
+
                         };
                         that.scheduleZone[index].Sat_A = {
                             mode_id: 0,
                             mode_name: "",
                             patient_id: 0,
                             patient: "",
-                            type:1
+                            type:1,
+                          dialysis_machine_name:"",
+
                         };
                         that.scheduleZone[index].Sat_N = {
                             mode_id: 0,
                             mode_name: "",
                             patient_id: 0,
                             patient: "",
-                            type:1
+                            type:1,
+                          dialysis_machine_name:"",
+
                         };
                         that.scheduleZone[index].Sun_A = {
                             mode_id: 0,
                             mode_name: "",
                             patient_id: 0,
                             patient: "",
-                            type:1
+                            type:1,
+                          dialysis_machine_name:"",
+
                         };
                         that.scheduleZone[index].Sun_N = {
                             mode_id: 0,
                             mode_name: "",
                             patient_id: 0,
                             patient: "",
-                            type:1
+                            type:1,
+                          dialysis_machine_name:"",
+
                         };
                         that.scheduleZone[index].Sun_M = {
                             mode_id: 0,
                             mode_name: "",
                             patient_id: 0,
                             patient: "",
-                            type:1
+                            type:1,
+                          dialysis_machine_name:"",
+
+
                         };
                         that.scheduleZone[index].total = 0;
 
@@ -676,7 +761,8 @@ export default {
                                         patient_id: schedule.patient_id,
                                         patient: schedule.patient,
                                         patient_contagions: schedule.patient_contagions,
-                                        mode_name:typeof that.modeOptions[schedule.mode_id] ==="undefined"? "": that.modeOptions[schedule.mode_id].name
+                                          dialysis_machine_name: schedule.dialysis_machine_name,
+                                          mode_name:typeof that.modeOptions[schedule.mode_id] ==="undefined"? "": that.modeOptions[schedule.mode_id].name
                                         };
                                         that.scheduleZone[index].total += 1;
 
@@ -1020,7 +1106,7 @@ export default {
           for(let i=0;i<this.solutionList.length;i++){
             if(patient_id == 0){
               return ""
-            }  
+            }
             if(patient_id == this.solutionList[i].patient_id && mode == this.solutionList[i].mode_name){
                if(this.solutionList[i].dialyzer_perfusion_apparatus!=""){
                  diazers = this.solutionList[i].dialyzer_perfusion_apparatus
@@ -1028,7 +1114,7 @@ export default {
                }else{
                  diazers = this.solutionList[i].dialysis_dialyszers
                  irrigation = this.solutionList[i].dialysis_irrigation
-               
+
                }
 
             }
@@ -1036,7 +1122,7 @@ export default {
           if(irrigation!=""){
              return diazers + "/" + irrigation
           }else{
-            return diazers 
+            return diazers
           }
         }
     }