合并带嘛

src/api/his/his.js

@@ -436,14 +436,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({
@@ -719,4 +719,13 @@ 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/chargeDetailManagement.vue

@@ -1345,7 +1345,7 @@ export default {
                 price: prescription.project[b].price,
                 remark: prescription.project[b].remark,
                 // medical_code: prescription.project[b].project.medical_code,
-                unit: prescription.project[b].project.unit,
+                unit: prescription.project[b].unit,
                 type: prescription.project[b].type,
                 det_item_fee_sumamt: prescription.project[b].order_info.det_item_fee_sumamt,
                 fulamt_ownpay_amt: prescription.project[b].order_info.fulamt_ownpay_amt,

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -3277,7 +3277,7 @@ export default {
           return
         }
        }
-      this.teamList.push(row)
+      this.teamList = selection
     },
     getlist() {
       this.tabProject = []

src/xt_pages/hospitalStation/doctorDesk.vue

@@ -72,9 +72,9 @@
                         <el-tab-pane label="电子处方" name="电子处方"></el-tab-pane>
                         <el-tab-pane label="透析记录" name="透析记录"></el-tab-pane>
                         <el-tab-pane label="电子病历" name="电子病历"></el-tab-pane>
-                       
+
                     </el-tabs>
-                   
+
                     <div class="mainCell fixedCell" style="float:right" v-if="titleType == '电子处方'">
                         <el-button size="small" ref="button_one" @click="open(1)" type="primary"
                                    v-loading="saveLoading">保存
@@ -1231,7 +1231,7 @@
                     price: prescription.project[b].price,
                     remark: prescription.project[b].remark,
                     medical_code: prescription.project[b].project.medical_code,
-                    unit: prescription.project[b].project.unit,
+                    unit: prescription.project[b].unit,
                     type: prescription.project[b].type
 
                   }
@@ -1371,7 +1371,7 @@
                       total: prescription.project[b].count.toString(),
                       remark: prescription.project[b].remark,
                       medical_code: prescription.project[b].project.medical_code,
-                      unit: prescription.project[b].project.unit,
+                      unit: prescription.project[b].unit,
                       type: prescription.project[b].type
 
                     }
@@ -1644,7 +1644,7 @@
                           price: prescription.project[b].price,
                           remark: prescription.project[b].remark,
                           medical_code: prescription.project[b].project.medical_code,
-                          unit: prescription.project[b].project.unit,
+                          unit: prescription.project[b].unit,
                           type: prescription.project[b].type
                         }
 
@@ -1783,7 +1783,7 @@
                             total: prescription.project[b].count.toString(),
                             remark: prescription.project[b].remark,
                             medical_code: prescription.project[b].project.medical_code,
-                            unit: prescription.project[b].project.unit,
+                            unit: prescription.project[b].unit,
                             type: prescription.project[b].type
 
                           }
@@ -2135,7 +2135,7 @@
                           price: prescription.project[b].price,
                           remark: prescription.project[b].remark,
                           medical_code: prescription.project[b].project.medical_code,
-                          unit: prescription.project[b].project.unit,
+                          unit: prescription.project[b].unit,
                           type: prescription.project[b].type
                         }
 
@@ -2265,7 +2265,7 @@
                             total: prescription.project[b].count.toString(),
                             remark: prescription.project[b].remark,
                             medical_code: prescription.project[b].project.medical_code,
-                            unit: prescription.project[b].project.unit,
+                            unit: prescription.project[b].unit,
                             type: prescription.project[b].type
                           }
 
@@ -2607,7 +2607,7 @@
                         price: prescription.project[b].price,
                         remark: prescription.project[b].remark,
                         medical_code: prescription.project[b].project.medical_code,
-                        unit: prescription.project[b].project.unit,
+                        unit: prescription.project[b].unit,
                         type: prescription.project[b].type
                       }
 
@@ -2736,7 +2736,7 @@
                           total: prescription.project[b].count.toString(),
                           remark: prescription.project[b].remark,
                           medical_code: prescription.project[b].project.medical_code,
-                          unit: prescription.project[b].project.unit,
+                          unit: prescription.project[b].unit,
                           type: prescription.project[b].type
                         }
 
@@ -3138,7 +3138,7 @@
                           price: prescription.project[b].price,
                           remark: prescription.project[b].remark,
                           medical_code: prescription.project[b].project.medical_code,
-                          unit: prescription.project[b].project.unit,
+                          unit: prescription.project[b].unit,
                           type: prescription.project[b].type
                         }
 
@@ -3274,7 +3274,7 @@
                             total: prescription.project[b].count.toString(),
                             remark: prescription.project[b].remark,
                             medical_code: prescription.project[b].project.medical_code,
-                            unit: prescription.project[b].project.unit,
+                            unit: prescription.project[b].unit,
                             type: prescription.project[b].type
                           }
 
@@ -3593,7 +3593,7 @@
                           price: prescription.project[b].price,
                           remark: prescription.project[b].remark,
                           medical_code: prescription.project[b].project.medical_code,
-                          unit: prescription.project[b].project.unit,
+                          unit: prescription.project[b].unit,
                           type: prescription.project[b].type
                         }
 
@@ -3730,7 +3730,7 @@
                             total: prescription.project[b].count.toString(),
                             remark: prescription.project[b].remark,
                             medical_code: prescription.project[b].project.medical_code,
-                            unit: prescription.project[b].project.unit,
+                            unit: prescription.project[b].unit,
                             type: prescription.project[b].type
                           }
 

src/xt_pages/hospitalStation/index.vue

@@ -84,7 +84,7 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item class="specialFormItem" label="医保卡号：" v-if="this.$store.getters.xt_user.org_id == 10265">
+          <el-form-item class="specialFormItem" label="医保卡号：">
             <div style="display:flex;">
               <el-input v-model="form.medicalInsuranceCard"></el-input>
               <el-button style="margin-left:10px;" type="primary" @click="reading">读卡</el-button>

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/hospitalStation/invoiceTemplate/printThree.vue

@@ -167,10 +167,15 @@
             <!-- 统筹支付 -->
           统筹支付:{{list.order.hifp_pay?list.order.hifp_pay:'0.00'}}
         </div>
-        <div style="position: absolute;top:310px;left:480px">
+
+        <div style="position: absolute;top:310px;left:400px">
           现金支付:{{list.order.psn_cash_pay?list.order.psn_cash_pay:'0.00'}}
           <!-- 现金支付 -->
         </div>
+        <div style="position: absolute;top:310px;left:560px">
+          职工大额补助：{{list.order.hifob_pay?list.order.hifob_pay:'0.00'}}
+        </div>
+
         <div style="position: absolute;top:340px;left:40px">
           公务员补助:{{list.order.cvlserv_pay?list.order.cvlserv_pay:'0.00'}}
           <!-- 公务员补助 -->

src/xt_pages/outpatientCharges/allListPrint.vue

@@ -82,7 +82,7 @@
             this.admin = response.data.data.admin_info
             this.his_hospital = response.data.data.his_hospital
             var order_info = response.data.data.order_info
-            
+
             if(this.$store.getters.xt_user.org_id == 10215 || this.$store.getters.xt_user.org_id == 0){
               //获取所有项目类型进行去重
               let med_chrgitm_types = []
@@ -209,7 +209,7 @@
                 obj['name'] = details[a].advice.advice_name
                 // obj['spec'] = details[a].advice.drug.drug_spec
                 obj['spec'] =   details[a].advice.drug.dose +   details[a].advice.drug.dose_unit+"*" +  details[a].advice.drug.min_number +   details[a].advice.drug.min_unit+"/"+ details[a].advice.drug.max_unit
-                obj['unit'] = details[a].advice.drug.min_unit
+                obj['unit'] = details[a].advice.prescribing_number_unit
                 obj['medicine_insurance_kind'] = this.getMedicineInsuranceType(details[a].chrgitm_lv)
                 obj['med_chrgitm_type'] = this.getType(details[a].med_chrgitm_type)
                 obj['price'] = parseFloat(details[a].pric)
@@ -362,7 +362,7 @@
           '@media print {.allListTitle{font-size: 24px;text-align: center;font-weight: bold;margin-bottom: 10px;}.allListInfo{display: flex;font-size: 16px;justify-content: space-between;margin: 10px 0;} .allListTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 20px;font-size: 14px;border-color: #000;text-align:left;}.allListTable tr td {padding: 0 5px;}.tableBottom{font-size: 16px;display: flex;margin-top: 20px;}.tableBottomOne{margin-right: 40px;}}'
          const style1 =
           '@media print {.allListTitle{font-size: 24px;text-align: center;font-weight: bold;margin-bottom: 10px;}.allListInfo{display: flex;font-size: 16px;justify-content: space-between;margin: 10px 0;} .allListTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 20px;font-size: 14px;border-color: #000;text-align:left;} .allListTable tr td {padding: 0 5px;} .allListTable .allListTable_1{border: none;width: 100%;text-align: center;border-collapse: collapse;line-height: 20px;font-size: 14px;border-color: #000;text-align:left;} .allListTable_1 tr{page-break-inside:avoid;} .allListTable_1 tr td {padding: 0 5px;border: 1px solid #000;} .tableBottom{font-size: 16px;display: flex;margin-top: 20px;}.tableBottomOne{margin-right: 40px;}}'
-        
+
         if(this.org_id == 10215 || this.org_id == 0 ||this.org_id == 9675){
           printJS({
           printable: 'allList-print',
@@ -379,8 +379,8 @@
         })
         }
 
-        
-        
+
+
 
         // if (this.org_template_info.template_id == 1) {
         //   printJS({

src/xt_pages/outpatientCharges/costComparison.vue

@@ -208,7 +208,7 @@ c<template>
                     </el-select>
                   </el-form-item>
 
-                  <el-form-item label="清算类别" :label-width="formLabelWidth" v-if="this.$store.getters.xt_user.org.id == 9919">
+                  <el-form-item label="清算类别" :label-width="formLabelWidth" >
                     <el-select v-model="clr_type" placeholder="请选择" style="width: 200px;">
                       <el-option
                           v-for="item in clrOptions"

src/xt_pages/outpatientCharges/invoicePrint.vue

@@ -13,14 +13,16 @@
     </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" >
+          <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 || org_id == 0" :paramsObj="invoiceParams"></printFour>
+          <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>
@@ -34,9 +36,12 @@ import printFour from './invoiceTemplate/printFour'
 import printFive from './invoiceTemplate/printFive'
 import printSix from './invoiceTemplate/printSix'
 import printSeven from './invoiceTemplate/printSeven'
+import printEight from './invoiceTemplate/printEight'
+import PrintEight from "./invoiceTemplate/printEight";
 export default {
    name: "invoicePrint",
   components: {
+    PrintEight,
     printOne,
     printTwo,
     printThree,

src/xt_pages/outpatientCharges/invoiceTemplate/printEight.vue

@@ -0,0 +1,238 @@
+<template>
+    <div id='invoice-print'>
+        <div style="display:flex;">
+            <!-- <div style="position: absolute;top:70px;left:70px;">{{ list.order_number }}</div> -->
+            <!-- <div>{{ list.id_card_no }}</div> -->
+        </div>
+        <!-- <div style="display:flex;justify-content: space-between;">
+            <div>{{ list.department_name }}</div>
+            <div  style="position: absolute;top:70px;left:300px">{{ list.number }}</div>
+            <div></div>
+            <div  style="position: absolute;left:560px;top:70px;">
+                <span>{{ printDate.slice(0,4) }}</span>
+                <span>{{ printDate.slice(5,7) }}</span>
+                <span>{{ printDate.slice(8,11) }}</span>
+            </div>
+        </div> -->
+        <div style="display:flex;justify-content: space-between;">
+            <div style="position: absolute;top:90px;left:40px;"> {{ paramsObj.name }}</div>
+            <div  style="position: absolute;top:90px;left:340px">{{ list.number }}</div>
+            <!-- <div style="position: absolute;top:90px;left:240px;">√</div> -->
+            <!-- <div>{{ list.pay_way }}</div> -->
+            <!-- <div style="position: absolute;top:70px;left:460px;">{{ paramsObj.setl_time.split(' ')[0] }}</div>
+            <div style="position: absolute;top:70px;left:560px;">{{ paramsObj.setl_time.split(' ')[0] }}</div> -->
+        </div>
+        <!-- <div style="display:flex;justify-content: space-between;">
+
+            <div style="position: absolute;top:110px;left:260px;">{{ totalPrice - list.psn_cash_money }}</div>
+            <div style="position: absolute;top:110px;left:440px;">{{ list.psn_cash_money }}</div>
+            <div style="position: absolute;top:110px;left:580px;">门慢结算</div>
+        </div> -->
+        <div style="display:flex;justify-content: space-between;">
+            <div style="position: absolute;top:160px;left:40px">西药</div>
+            <div style="position: absolute;top:160px;left:110px">{{ list.westernMedicineCostTotal }}</div>
+            <div style="position: absolute;top:160px;left:180px">检查费</div>
+            <div style="position: absolute;top:160px;left:260px">{{ list.checkCostTotal }}</div>
+            <div style="position: absolute;top:160px;left:340px">治疗费</div>
+            <div style="position: absolute;top:160px;left:420px">{{ list.treatCostTotal }}</div>
+            <div style="position: absolute;top:160px;left:500px">床位费</div>
+            <div style="position: absolute;top:160px;left:580px">{{ list.bedCostTotal }}</div>
+        </div>
+        <div style="display:flex;justify-content: space-between;">
+            <div style="position: absolute;top:190px;left:40px">中成药</div>
+            <div style="position: absolute;top:190px;left:110px">{{ list.chineseTraditionalMedicineCostTotal }}</div>
+            <div style="position: absolute;top:190px;left:180px">化验费</div>
+            <div style="position: absolute;top:190px;left:260px">{{ list.laboratoryCostTotal }}</div>
+            <div style="position: absolute;top:190px;left:340px">手术费</div>
+            <div style="position: absolute;top:190px;left:420px">{{ list.operationCostTotal }}</div>
+            <div style="position: absolute;top:190px;left:500px">其他费</div>
+            <div style="position: absolute;top:190px;left:580px">{{ list.otherCostTotal }}</div>
+        </div>
+        <div style="display:flex;justify-content: space-between;">
+            <div style="position: absolute;top:210px;left:40px"></div>
+            <div style="position: absolute;top:210px;left:110px"></div>
+            <div style="position: absolute;top:210px;left:180px"></div>
+            <div style="position: absolute;top:210px;left:260px"></div>
+            <div style="position: absolute;top:210px;left:340px">材料费</div>
+            <div style="position: absolute;top:210px;left:420px">{{ list.materialCostTotal }}</div>
+            <div style="position: absolute;top:210px;left:500px"></div>
+            <div style="position: absolute;top:210px;left:580px"></div>
+        </div>
+        <div>
+            <span style="position: absolute;top:240px;left:180px">{{ totalPrice.toFixed(2) }}</span>
+            <span>
+            <span  style="position: absolute;top:260px;left:180px">
+                <span v-if="zhongwen.indexOf('万') > -1 && zhongwen.indexOf('拾') > -1 && zhongwen.indexOf('拾') == 1">
+                    {{ zhongwen.substring(0,1) }}
+                </span>
+                <span v-else>零</span>
+            </span>
+            <span  style="position: absolute;top:260px;left:220px">
+                <span v-if="zhongwen.indexOf('万') > -1">
+                    {{ zhongwen.substring(zhongwen.indexOf('万') - 1,zhongwen.indexOf('万')) }}
+                </span>
+                <span v-else>零</span>
+            </span>
+            <span  style="position: absolute;top:260px;left:260px">
+                <span v-if="zhongwen.indexOf('仟') > -1">
+                    {{ zhongwen.substring(zhongwen.indexOf('仟') - 1,zhongwen.indexOf('仟')) }}
+                </span>
+                <span v-else>零</span>
+            </span>
+            <span  style="position: absolute;top:260px;left:300px">
+                <span v-if="zhongwen.indexOf('佰') > -1">
+                    {{ zhongwen.substring(zhongwen.indexOf('佰') - 1,zhongwen.indexOf('佰')) }}
+                </span>
+                <span v-else>零</span>
+            </span>
+            <span style="position: absolute;top:260px;left:340px">
+                <span v-if="zhongwen.indexOf('拾') > -1">
+                    {{zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾')) == '佰' ||  !zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾'))? '壹' : zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾')) }}
+                </span>
+                <span v-else>零</span>
+            </span>
+            <span  style="position: absolute;top:260px;left:380px">
+                <span v-if="zhongwen.indexOf('元') > -1 && zhongwen.substring(this.zhongwen.indexOf('元') - 1).substring(0,1)!= '拾'">
+                    {{ zhongwen.substring(zhongwen.indexOf('元') - 1,zhongwen.indexOf('元')) }}
+                </span>
+                <span v-else>零</span>
+            </span>
+            <span  style="position: absolute;top:260px;left:420px">
+                <span v-if="zhongwen.indexOf('角') > -1">
+                    {{ zhongwen.substring(zhongwen.indexOf('角') - 1,zhongwen.indexOf('角')) }}
+                </span>
+                <span v-else>零</span>
+            </span>
+            <span  style="position: absolute;top:260px;left:460px">
+                <span v-if="zhongwen.indexOf('分') > -1">
+                    {{ zhongwen.substring(zhongwen.indexOf('分') - 1,zhongwen.indexOf('分')) }}
+                </span>
+                <span v-else>零</span>
+            </span>
+            </span>
+        </div>
+        <!-- <div style="position: absolute;top:300px;left:460px">现金：{{ list.psn_cash_money }}</div> -->
+        <!-- <div>
+            <div style="position: absolute;top:340px;left:120px">{{ org_name }}</div>
+            <div v-if="org_id == 9990" style="position: absolute;top:340px;left:300px">钱玉玲</div>
+            <div v-if="org_id == 9990" style="position: absolute;top:340px;left:420px">陈国杰</div>
+        </div> -->
+
+           <div style="position: absolute;left:60px;top:300px;">
+                <span style="padding-right:20px;">{{ printDate.slice(0,4) }}</span>
+                <span style="padding-right:20px;">{{ printDate.slice(5,7) }}</span>
+                <span>{{ printDate.slice(8,11) }}</span>
+            </div>
+            <div style="position: absolute;top:300px;left:300px">{{'罗佳菊'}}</div>
+    </div>
+</template>
+
+
+<script>
+import { getInvoice } from '@/api/project/project'
+export default {
+    props:{
+        paramsObj:Object
+    },
+    data(){
+        return{
+            list:{},
+            printDate:'',
+            zhongwen:'',
+            totalPrice:0.0,
+            org_id:'',
+            org_name:''
+        }
+    },
+    created(){
+        console.log('paramsObj',this.paramsObj)
+        let params = {
+            order_id: this.paramsObj.order_id,
+            patient_id: this.paramsObj.patient_id,
+            number: this.paramsObj.number,
+        }
+        this.getInvoice(params)
+        // var data = new Date();
+        // var month =data.getMonth() < 9 ? "0" + (data.getMonth() + 1) : data.getMonth() + 1;
+        // var date = data.getDate() <= 9 ? "0" + data.getDate() : data.getDate();
+        // this.printDate = data.getFullYear() + "-" + month + "-" + date;
+        // this.smalltoBIG(982732.21)
+        this.org_id = this.$store.getters.xt_user.org_id
+        this.org_name = this.$store.getters.xt_user.org.org_name
+    },
+    methods:{
+        getInvoice(params){
+            getInvoice(params).then((res) => {
+                console.log('res',res)
+                this.list = res.data.data
+                this.totalPrice = this.list.westernMedicineCostTotal + this.list.checkCostTotal + this.list.treatCostTotal + this.list.bedCostTotal + this.list.chineseTraditionalMedicineCostTotal +
+                                    this.list.laboratoryCostTotal + this.list.operationCostTotal + this.list.otherCostTotal + this.list.materialCostTotal
+                this.smalltoBIG(this.totalPrice)
+                var data = new Date(res.data.data.date * 1000);
+                var month =data.getMonth() < 9 ? "0" + (data.getMonth() + 1) : data.getMonth() + 1;
+                var date = data.getDate() <= 9 ? "0" + data.getDate() : data.getDate();
+                this.printDate = data.getFullYear() + "-" + month + "-" + date;
+            })
+        },
+        smalltoBIG(n) {
+            // let fraction = ['角', '分'];
+            // let digit = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖'];
+            // let unit = [['元.', '万,', '亿,'], ["元",'拾', '佰', '仟']];
+            // let head = price < 0 ? '欠' : '';
+            // price = Math.abs(price);
+            // let upper = '';
+            // for (let i = 0; i < fraction.length; i++) {
+            // upper += (digit[Math.floor(price * 10 * Math.pow(10, i)) % 10] + fraction[i]).replace(/零./, '');
+            // }
+            // upper = upper || '整';
+            // price = Math.floor(price);
+            // for (let i = 0; i < unit[0].length && price > 0; i++) {
+            // let p = '';
+            // for (let j = 0; j < unit[1].length && price > 0; j++) {
+            //     p = digit[price % 10] + unit[1][j] + p;
+            //     price = Math.floor(price / 10);
+            // }
+            // upper = p.replace(/(零.)*零$/, '').replace(/^$/, '零') + unit[0][i] + upper;
+            // }
+            // this.zhongwen = head + upper.replace(/(零.)*零圆/, '圆').replace(/(零.)+/g, '零').replace(/^整$/, '零圆整')
+            // console.log('6666',head + upper.replace(/(零.)*零圆/, '圆').replace(/(零.)+/g, '零').replace(/^整$/, '零圆整'))
+            if (!/^(0|[1-9]\d*)(\.\d+)?$/.test(n)){
+                return "数据非法";  //判断数据是否大于0
+            }
+
+            var unit = "仟佰拾亿仟佰拾万仟佰拾元角分", str = "";
+            n += "00";
+
+            var indexpoint = n.indexOf('.');  // 如果是小数，截取小数点前面的位数
+
+            if (indexpoint >= 0){
+
+                n = n.substring(0, indexpoint) + n.substr(indexpoint+1, 2);   // 若为小数，截取需要使用的unit单位
+            }
+
+            unit = unit.substr(unit.length - n.length);  // 若为整数，截取需要使用的unit单位
+            for (var i=0; i < n.length; i++){
+                str += "零壹贰叁肆伍陆柒捌玖".charAt(n.charAt(i)) + unit.charAt(i);  //遍历转化为大写的数字
+            }
+
+            this.zhongwen =  str.replace(/零(仟|佰|拾|角)/g, "零").replace(/(零)+/g, "零").replace(/零(万|亿|元)/g, "$1").replace(/(亿)万|壹(拾)/g, "$1$2").replace(/^元零?|零分/g, "").replace(/元$/g, "元整");
+            console.log(this.zhongwen)
+        },
+
+    },
+    watch:{
+        paramsObj:{//深度监听，可监听到对象、数组的变化
+            handler(val, oldVal){
+                let params = {
+                    order_id: val.order_id,
+                    patient_id: val.patient_id,
+                    number: val.number,
+                }
+                this.getInvoice(params)
+
+            },
+            deep:true
+        }
+    }
+}
+</script>

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/listTemplate/printTwo.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;">
@@ -89,11 +91,13 @@
                 <div style="width:20%;text-align:center;" v-if="item.project_id > 0">{{item.project.type == 2?item.project.project.project_name:item.project.good_info.good_name}}</div>
 
                 <div style="width:10%;text-align:center;">{{item.pric}}</div>
-                <div style="width:10%;text-align:center;">{{item.cnt}}</div>
+                <div style="width:8%;text-align:center;">{{item.cnt}}</div>
                 <div style="width:10%;text-align:center;">{{item.det_item_fee_sumamt}}</div>
                 <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:5%;text-align:center;">{{item.fulamt_ownpay_amt}}</div>
+                <div style="width:7%;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/outpatientChargesManagement.vue

@@ -84,25 +84,14 @@
         <div class="mainCell fixedCell" style="margin-bottom:10px;">
 
           <div v-if="org_id == 10340 || org_id == 0">
-<!--                        <el-button size="small"-->
-<!--                                   @click="openZb(1)"-->
-<!--                                   type="primary">登记-->
-<!--                        </el-button>-->
-
                         <el-button  size="small"
                                    @click="openZb(4)"
-                                   type="primary">记账
+                                   v-if=" this.order.id == 0"
+                          type="primary">记账
                         </el-button>
-
-<!--                        <el-button   size="small"-->
-<!--                                   @click="openZb(3)"-->
-<!--                                   type="primary">撤销记账-->
-<!--                        </el-button>-->
-
           </div>
 
-
-          <div  v-if="org_id != 10340 || org_id != 0">
+          <div  v-if="org_id != 10340 && org_id != 0">
 <!--            <el-button size="small"-->
 <!--                       @click="openZb(1)"-->
 <!--                       type="primary">登记-->
@@ -2894,7 +2883,7 @@ export default {
             obj['settle_accounts_type'] = 2
           }
           var that = this
-          axios.get(process.env.BASE_API  + '/coordinate/settleAccount', {
+          axios.get("http://127.0.0.1:9532"  + '/coordinate/settleAccount', {
             params: obj
           })
               .then(function(response) {

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -47,7 +47,21 @@
           :paramsObj="paramsObj"
           :balanceAccounts="balanceAccounts"
       ></printFive>
-      <printOne :info="info" v-else></printOne>
+
+     <printSeven
+         v-if="org_id == 10387"
+         :info="info"
+         :paramsObj="paramsObj"
+         :balanceAccounts="balanceAccounts"
+     >
+     </printSeven>
+
+      <printOne :info="info" v-if="org_id != 9990 &&
+          org_id != 10138 &&
+          org_id != 9504 &&
+          org_id != 10028 &&
+          org_id != 4 &&
+          org_id != 10278 && org_id != 10191 && org_id != 10387"></printOne>
       <!-- 测试医保环境下表格样式放开以下这条 -->
       <!-- <testVue :info="info" v-else></testVue> -->
     </div>
@@ -57,6 +71,7 @@
 <script>
 import {uParseTime} from "@/utils/tools";
 import axios from "axios";
+import print from "print-js";
 
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import printOne from "./statementTemplate/printOne";
@@ -69,10 +84,12 @@ import printFive from "./statementTemplate/printFive";
 import testVue from "./statementTemplate/test";
 import {getAllDoctorList, getAllHisPatientList,} from "@/api/project/project";
 import {getPrivateExpenses, getPrivateExpensesOrder} from "@/api/his/his";
+import printSeven from "./statementTemplate/printSeven";
 // import PrintOther from '../hospitalStation/statementTemplate/printOther'
 export default {
   name: "dialysisPrintOrder",
   components: {
+    printSeven,
     BreadCrumb,
     printOne,
     privateChargePrint,
@@ -656,7 +673,7 @@ export default {
 
             }
           });
-        } else if (this.org_id == 10191 || this.org_id == 0) {
+        } else if (this.org_id == 0) {
 
           getPrivateExpensesOrder(params).then((response) => {
             if (response.data.state == 0) {
@@ -782,16 +799,22 @@ export default {
                 }
 
               }
+              console.log(list)
               let len = list.length / 2
               let L_list = []
               let R_list = []
-
+              len = Math.trunc(len)
               for(let i = 0; i < len; i++){
                 L_list.push(list[i])
               }
+              console.log(len)
               for(let i = len; i < list.length; i++){
+                console.log(list[i])
                 R_list.push(list[i])
               }
+              console.log(L_list)
+              console.log(R_list)
+
               that.info["L_list"] = L_list
               that.info["R_list"] = R_list
 
@@ -805,216 +828,369 @@ export default {
         }
 
       } else {
-        var that = this;
-        axios
-            .get("http://127.0.0.1:9532/api/settle/query", {
-              params: {
-                order_id: order_id,
-                admin_user_id: this.$store.getters.xt_user.user.id,
-              },
-            })
-            .then(function (response) {
-              if (response.data.state == 0) {
-                this.$message.error(response.data.msg);
-                return false;
-              } else {
-                console.log(response.data.data.info);
-                that.info = response.data.data.info;
-                that.p_admin = response.data.data.printor_admin;
-                that.charge_admin = response.data.data.charge_admin;
-
-                that.info["p_admin"] = that.p_admin;
-                that.info["charge_admin"] = that.charge_admin;
-
-                that.info["order_number"] = response.data.data.order_number;
-                that.info["patient"] = response.data.data.patient;
-                that.info["date"] = response.data.data.date;
-                that.info["number"] = response.data.data.number;
-                that.info["order_infos"] = response.data.data.order_infos;
-                that.info["diagnosis"] = response.data.data.diagnosis;
-                that.info["org_code"] = response.data.data.org_code;
-                that.info["org_name"] = response.data.data.org_name;
-                that.info["doctor_code"] = response.data.data.doctor_code;
-                that.info["department"] = response.data.data.department;
-                that.info["health_card_no"] = response.data.data.health_card_no;
-
-                that.info["bed_cost_total"] = response.data.data.bedCostTotal;
-                that.info["bed_cost_self_total"] =
-                    response.data.data.bedCostSelfTotal;
-                that.info["bed_cost_part_self_total"] =
-                    response.data.data.bedCostPartSelfTotal;
-
-                that.info["operation_cost_total"] =
-                    response.data.data.operationCostTotal;
-                that.info["operation_cost_self_total"] =
-                    response.data.data.operationCostSelfTotal;
-                that.info["operation_cost_part_self_total"] =
-                    response.data.data.operationCostPartSelfTotal;
-
-                that.info["other_cost_total"] = response.data.data.otherCostTotal;
-                that.info["other_cost_self_total"] =
-                    response.data.data.otherCostSelfTotal;
-                that.info["other_cost_part_self_total"] =
-                    response.data.data.otherCostPartSelfTotal;
-
-                that.info["material_cost_total"] =
-                    response.data.data.materialCostTotal;
-                that.info["material_cost_self_total"] =
-                    response.data.data.materialCostSelfTotal;
-                that.info["material_cost_part_self_total"] =
-                    response.data.data.materialCostPartSelfTotal;
-
-                that.info["western_medicine_cost_total"] =
-                    response.data.data.westernMedicineCostTotal;
-                that.info["western_medicine_cost_self_total"] =
-                    response.data.data.westernMedicineCostSelfTotal;
-                that.info["western_medicine_cost_part_self_total"] =
-                    response.data.data.westernMedicineCostPartSelfTotal;
-
-                that.info["chinese_traditional_medicine_cost_total"] =
-                    response.data.data.chineseTraditionalMedicineCostTotal;
-                that.info["chinese_traditional_medicine_cost_self_total"] =
-                    response.data.data.chineseTraditionalMedicineCostSelfTotal;
-                that.info["chinese_traditional_medicine_cost_part_self_total"] =
-                    response.data.data.chineseTraditionalMedicineCostPartSelfTotal;
-
-                that.info["check_cost_total"] = response.data.data.checkCostTotal;
-                that.info["check_cost_self_total"] =
-                    response.data.data.checkCostSelfTotal;
-                that.info["check_cost_part_self_total"] =
-                    response.data.data.checkCostPartSelfTotal;
-
-                that.info["laboratory_cost_total"] =
-                    response.data.data.laboratoryCostTotal;
-                that.info["laboratory_cost_self_total"] =
-                    response.data.data.laboratoryCostSelfTotal;
-                that.info["laboratory_cost_part_self_total"] =
-                    response.data.data.laboratoryCostPartSelfTotal;
-
-                that.info["treat_cost_total"] = response.data.data.treatCostTotal;
-                that.info["treat_cost_self_total"] =
-                    response.data.data.treatCostSelfTotal;
-                that.info["treat_cost_part_self_total"] =
-                    response.data.data.treatCostPartSelfTotal;
-                that.info["date"] = response.data.data.date;
-                that.info["number"] = response.data.data.number;
-                that.info["order_infos"] = response.data.data.order_infos;
-                that.info["diagnosis"] = response.data.data.diagnosis;
+        if (this.org_id == 10191) {
+          let params = {
+            his_patient_id: obj.his_patient_id,
+            id: obj.order_id,
+            order_id: obj.order_id,
+            admin_user_id: this.$store.getters.xt_user.user.id,
+          };
+          getPrivateExpensesOrder(params).then((response) => {
+            if (response.data.state == 0) {
+              // this.$message.error(response.data.msg)
 
-                let obj = {
-                  type: 1,
-                  details: [],
-                  total: 0,
-                };
-                let obj2 = {
-                  type: 2,
-                  details: [],
-                  total: 0,
-                };
-                let obj3 = {
-                  type: 3,
-                  details: [],
-                  total: 0,
-                };
-
-                let obj4 = {
-                  type: 4,
-                  details: [],
-                  total: 0,
-                };
-                let num = 0;
-                that.info.order_infos.map((item) => {
-                  if (item.advice_id > 0) {
-                    obj.details.push(item);
-                    obj.total += item.pric * item.advice.prescribing_number;
-                    num++;
-                  } else {
-                    if (item.project.type == 2) {
-                      obj2.details.push(item);
-                      obj2.total += item.pric * item.project.count;
-                      num++;
-                    } else {
-                      obj3.details.push(item);
-                      obj3.total += item.pric * item.project.count;
-                      num++;
-                    }
-                  }
-                });
+              return false;
+            } else {
+              var that = this;
+              that.info = response.data.data.info;
+              that.p_admin = response.data.data.printor_admin;
+              that.charge_admin = response.data.data.charge_admin;
+
+              that.info["p_admin"] = that.p_admin;
+              that.info["charge_admin"] = that.charge_admin;
+              that.info["order_number"] = response.data.data.order_number;
+              that.info["patient"] = response.data.data.patient;
+              that.info["date"] = response.data.data.date;
+              that.info["number"] = response.data.data.number;
+              that.info["order_infos"] = response.data.data.order_infos;
+              that.info["diagnosis"] = response.data.data.diagnosis;
+              that.info["fixmedins_name"] = response.data.data.org_name;
+              that.info["fixmedins_code"] = response.data.data.org_code;
+              // that.info["doctor_code"] = response.data.data.doctor_code;
+              // that.info["department"] = response.data.data.department;
+              // that.info["health_card_no"] = response.data.data.health_card_no;
+
+              that.info["bed_cost_total"] = response.data.data.bedCostTotal;
+              that.info["bed_cost_self_total"] =
+                  response.data.data.bedCostSelfTotal;
+              that.info["bed_cost_part_self_total"] =
+                  response.data.data.bedCostPartSelfTotal;
+
+              that.info["operation_cost_total"] =
+                  response.data.data.operationCostTotal;
+              that.info["operation_cost_self_total"] =
+                  response.data.data.operationCostSelfTotal;
+              that.info["operation_cost_part_self_total"] =
+                  response.data.data.operationCostPartSelfTotal;
+
+              that.info["other_cost_total"] = response.data.data.otherCostTotal;
+              that.info["other_cost_self_total"] =
+                  response.data.data.otherCostSelfTotal;
+              that.info["other_cost_part_self_total"] =
+                  response.data.data.otherCostPartSelfTotal;
+
+              that.info["material_cost_total"] =
+                  response.data.data.materialCostTotal;
+              that.info["material_cost_self_total"] =
+                  response.data.data.materialCostSelfTotal;
+              that.info["material_cost_part_self_total"] =
+                  response.data.data.materialCostPartSelfTotal;
+
+              that.info["western_medicine_cost_total"] =
+                  response.data.data.westernMedicineCostTotal;
+              that.info["western_medicine_cost_self_total"] =
+                  response.data.data.westernMedicineCostSelfTotal;
+              that.info["western_medicine_cost_part_self_total"] =
+                  response.data.data.westernMedicineCostPartSelfTotal;
+
+              that.info["chinese_traditional_medicine_cost_total"] =
+                  response.data.data.chineseTraditionalMedicineCostTotal;
+              that.info["chinese_traditional_medicine_cost_self_total"] =
+                  response.data.data.chineseTraditionalMedicineCostSelfTotal;
+              that.info["chinese_traditional_medicine_cost_part_self_total"] =
+                  response.data.data.chineseTraditionalMedicineCostPartSelfTotal;
+
+              that.info["check_cost_total"] = response.data.data.checkCostTotal;
+              that.info["check_cost_self_total"] =
+                  response.data.data.checkCostSelfTotal;
+              that.info["check_cost_part_self_total"] =
+                  response.data.data.checkCostPartSelfTotal;
+
+              that.info["laboratory_cost_total"] =
+                  response.data.data.laboratoryCostTotal;
+              that.info["laboratory_cost_self_total"] =
+                  response.data.data.laboratoryCostSelfTotal;
+              that.info["laboratory_cost_part_self_total"] =
+                  response.data.data.laboratoryCostPartSelfTotal;
+
+              that.info["treat_cost_total"] = response.data.data.treatCostTotal;
+              that.info["treat_cost_self_total"] =
+                  response.data.data.treatCostSelfTotal;
+              that.info["treat_cost_part_self_total"] =
+                  response.data.data.treatCostPartSelfTotal;
+              that.info["date"] = response.data.data.date;
+              // that.info["number"] = response.data.data.number;
+              that.info["order_infos"] = response.data.data.order_infos;
+              that.info["diagnosis"] = response.data.data.diagnosis;
 
-                // this.info.order_infos.map(item => {
-                //   obj4.total = item.Total
-                //   obj4.details.push(item)
-                //   num++
-                //
-                // })
+              let list = []
+              for (let i = 0; i < response.data.data.order_infos.length; i++) {
+                let order = response.data.data.order_infos[i]
+                let obj = {
+                  name: "",
+                  spec: "",
+                  cnt: "",
+                  det_item_fee_sumamt: "",
+                }
 
-                that.info.new_detail_list = [];
-                that.info.new_detail_list.push(obj);
-                that.info.new_detail_list.push(obj2);
-                that.info.new_detail_list.push(obj3);
-                // that.info.new_detail_list.push(obj4)
+                if (order.advice_id > 0 && order.project_id == 0) {
+                  obj.name = order.advice.advice_name
+                  let spec = order.advice.drug.dose + order.advice.drug.dose_unit + '*' + order.advice.drug.min_number + order.advice.drug.min_unit + '/' + order.advice.drug.max_unit
+                  obj.spec = spec
+                  obj.cnt = order.cnt
+                  obj.det_item_fee_sumamt = order.det_item_fee_sumamt
+                  list.push(obj)
 
-                that.num = num;
+                } else if (order.advice_id == 0 && order.project_id > 0) {
+                  if (order.project.type == 2) {
+                    obj.name = order.project.project.project_name
+                    obj.spec = ""
+                    obj.cnt = order.cnt
+                    obj.det_item_fee_sumamt = order.det_item_fee_sumamt
 
-                if (that.paramsObj.settle_type != 1) {
-                  that.info.begndate = that.getTimes(that.paramsObj.start_time);
-                  that.info.enddate = that.getTimes(that.paramsObj.end_time);
+                  } else {
+                    obj.name = order.project.good_info.good_name
+                    obj.spec = order.project.good_info.specification_name
+                    obj.cnt = order.cnt
+                    obj.det_item_fee_sumamt = order.det_item_fee_sumamt
+                  }
+                  list.push(obj)
                 }
 
+              }
+              console.log(list)
+              let len = list.length / 2
+              let L_list = []
+              let R_list = []
+              len = Math.trunc(len)
+              for (let i = 0; i < len; i++) {
+                L_list.push(list[i])
+              }
+              console.log(len)
+              for (let i = len; i < list.length; i++) {
+                console.log(list[i])
+                R_list.push(list[i])
+              }
+              console.log(L_list)
+              console.log(R_list)
+
+              that.info["L_list"] = L_list
+              that.info["R_list"] = R_list
 
+            }
+          });
+        } else {
+          var that = this;
+          axios
+              .get("http://127.0.0.1:9532/api/settle/query", {
+                params: {
+                  order_id: order_id,
+                  admin_user_id: this.$store.getters.xt_user.user.id,
+                },
+              })
+              .then(function (response) {
+                if (response.data.state == 0) {
+                  this.$message.error(response.data.msg);
+                  return false;
+                } else {
+                  console.log(response.data.data.info);
+                  that.info = response.data.data.info;
+                  that.p_admin = response.data.data.printor_admin;
+                  that.charge_admin = response.data.data.charge_admin;
+
+                  that.info["p_admin"] = that.p_admin;
+                  that.info["charge_admin"] = that.charge_admin;
+
+                  that.info["order_number"] = response.data.data.order_number;
+                  that.info["patient"] = response.data.data.patient;
+                  that.info["date"] = response.data.data.date;
+                  that.info["number"] = response.data.data.number;
+                  that.info["order_infos"] = response.data.data.order_infos;
+                  that.info["diagnosis"] = response.data.data.diagnosis;
+                  that.info["org_code"] = response.data.data.org_code;
+                  that.info["org_name"] = response.data.data.org_name;
+                  that.info["doctor_code"] = response.data.data.doctor_code;
+                  that.info["department"] = response.data.data.department;
+                  that.info["health_card_no"] = response.data.data.health_card_no;
+
+                  that.info["bed_cost_total"] = response.data.data.bedCostTotal;
+                  that.info["bed_cost_self_total"] =
+                      response.data.data.bedCostSelfTotal;
+                  that.info["bed_cost_part_self_total"] =
+                      response.data.data.bedCostPartSelfTotal;
+
+                  that.info["operation_cost_total"] =
+                      response.data.data.operationCostTotal;
+                  that.info["operation_cost_self_total"] =
+                      response.data.data.operationCostSelfTotal;
+                  that.info["operation_cost_part_self_total"] =
+                      response.data.data.operationCostPartSelfTotal;
+
+                  that.info["other_cost_total"] = response.data.data.otherCostTotal;
+                  that.info["other_cost_self_total"] =
+                      response.data.data.otherCostSelfTotal;
+                  that.info["other_cost_part_self_total"] =
+                      response.data.data.otherCostPartSelfTotal;
+
+                  that.info["material_cost_total"] =
+                      response.data.data.materialCostTotal;
+                  that.info["material_cost_self_total"] =
+                      response.data.data.materialCostSelfTotal;
+                  that.info["material_cost_part_self_total"] =
+                      response.data.data.materialCostPartSelfTotal;
+
+                  that.info["western_medicine_cost_total"] =
+                      response.data.data.westernMedicineCostTotal;
+                  that.info["western_medicine_cost_self_total"] =
+                      response.data.data.westernMedicineCostSelfTotal;
+                  that.info["western_medicine_cost_part_self_total"] =
+                      response.data.data.westernMedicineCostPartSelfTotal;
+
+                  that.info["chinese_traditional_medicine_cost_total"] =
+                      response.data.data.chineseTraditionalMedicineCostTotal;
+                  that.info["chinese_traditional_medicine_cost_self_total"] =
+                      response.data.data.chineseTraditionalMedicineCostSelfTotal;
+                  that.info["chinese_traditional_medicine_cost_part_self_total"] =
+                      response.data.data.chineseTraditionalMedicineCostPartSelfTotal;
+
+                  that.info["check_cost_total"] = response.data.data.checkCostTotal;
+                  that.info["check_cost_self_total"] =
+                      response.data.data.checkCostSelfTotal;
+                  that.info["check_cost_part_self_total"] =
+                      response.data.data.checkCostPartSelfTotal;
+
+                  that.info["laboratory_cost_total"] =
+                      response.data.data.laboratoryCostTotal;
+                  that.info["laboratory_cost_self_total"] =
+                      response.data.data.laboratoryCostSelfTotal;
+                  that.info["laboratory_cost_part_self_total"] =
+                      response.data.data.laboratoryCostPartSelfTotal;
+
+                  that.info["treat_cost_total"] = response.data.data.treatCostTotal;
+                  that.info["treat_cost_self_total"] =
+                      response.data.data.treatCostSelfTotal;
+                  that.info["treat_cost_part_self_total"] =
+                      response.data.data.treatCostPartSelfTotal;
+                  that.info["date"] = response.data.data.date;
+                  that.info["number"] = response.data.data.number;
+                  that.info["order_infos"] = response.data.data.order_infos;
+                  that.info["diagnosis"] = response.data.data.diagnosis;
 
-                let list = []
-                for (let i = 0; i < response.data.data.order_infos.length; i++) {
-                  let order = response.data.data.order_infos[i]
                   let obj = {
-                    name: "",
-                    spec: "",
-                    cnt: "",
-                    det_item_fee_sumamt: "",
-                  }
+                    type: 1,
+                    details: [],
+                    total: 0,
+                  };
+                  let obj2 = {
+                    type: 2,
+                    details: [],
+                    total: 0,
+                  };
+                  let obj3 = {
+                    type: 3,
+                    details: [],
+                    total: 0,
+                  };
 
-                  if (order.advice_id > 0 && order.project_id == 0) {
-                    obj.name = order.advice.advice_name
-                    let spec = order.advice.drug.dose + order.advice.drug.dose_unit + '*' + order.advice.drug.min_number + order.advice.drug.min_unit + '/' + order.advice.drug.max_unit
-                    obj.spec = spec
-                    obj.cnt = order.cnt
-                    obj.det_item_fee_sumamt =order.det_item_fee_sumamt
-                    list.push(obj)
+                  let obj4 = {
+                    type: 4,
+                    details: [],
+                    total: 0,
+                  };
+                  let num = 0;
+                  that.info.order_infos.map((item) => {
+                    if (item.advice_id > 0) {
+                      obj.details.push(item);
+                      obj.total += item.pric * item.advice.prescribing_number;
+                      num++;
+                    } else {
+                      if (item.project.type == 2) {
+                        obj2.details.push(item);
+                        obj2.total += item.pric * item.project.count;
+                        num++;
+                      } else {
+                        obj3.details.push(item);
+                        obj3.total += item.pric * item.project.count;
+                        num++;
+                      }
+                    }
+                  });
+
+                  // this.info.order_infos.map(item => {
+                  //   obj4.total = item.Total
+                  //   obj4.details.push(item)
+                  //   num++
+                  //
+                  // })
+
+                  that.info.new_detail_list = [];
+                  that.info.new_detail_list.push(obj);
+                  that.info.new_detail_list.push(obj2);
+                  that.info.new_detail_list.push(obj3);
+                  // that.info.new_detail_list.push(obj4)
+
+                  that.num = num;
+
+                  if (that.paramsObj.settle_type != 1) {
+                    that.info.begndate = that.getTimes(that.paramsObj.start_time);
+                    that.info.enddate = that.getTimes(that.paramsObj.end_time);
+                  }
 
-                  }else if (order.advice_id == 0 && order.project_id > 0) {
-                    if(order.project.type == 2){
-                      obj.name = order.project.project.project_name
-                      obj.spec = ""
-                      obj.cnt = order.cnt
-                      obj.det_item_fee_sumamt =order.det_item_fee_sumamt
+                  let list = []
+                  for (let i = 0; i < response.data.data.order_infos.length; i++) {
+                    let order = response.data.data.order_infos[i]
+                    let obj = {
+                      name: "",
+                      spec: "",
+                      cnt: "",
+                      det_item_fee_sumamt: "",
+                    }
 
-                    }else{
-                      obj.name = order.project.good_info.good_name
-                      obj.spec = order.project.good_info.specification_name
+                    if (order.advice_id > 0 && order.project_id == 0) {
+                      obj.name = order.advice.advice_name
+                      let spec = order.advice.drug.dose + order.advice.drug.dose_unit + '*' + order.advice.drug.min_number + order.advice.drug.min_unit + '/' + order.advice.drug.max_unit
+                      obj.spec = spec
                       obj.cnt = order.cnt
-                      obj.det_item_fee_sumamt =order.det_item_fee_sumamt
+                      obj.det_item_fee_sumamt = order.det_item_fee_sumamt
+                      list.push(obj)
+
+                    } else if (order.advice_id == 0 && order.project_id > 0) {
+                      if (order.project.type == 2) {
+                        obj.name = order.project.project.project_name
+                        obj.spec = ""
+                        obj.cnt = order.cnt
+                        obj.det_item_fee_sumamt = order.det_item_fee_sumamt
+                        list.push(obj)
+
+                      } else {
+                        obj.name = order.project.good_info.good_name
+                        obj.spec = order.project.good_info.specification_name
+                        obj.cnt = order.cnt
+                        obj.det_item_fee_sumamt = order.det_item_fee_sumamt
+                        list.push(obj)
+                      }
                     }
-                    list.push(obj)
                   }
 
-                }
-                let len = list.length / 2
-                let L_list = []
-                let R_list = []
+                  let len = list.length / 2
+                  let L_list = []
+                  let R_list = []
+                  len = Math.trunc(len)
 
-                for(let i = 0; i < len; i++){
-                  L_list.push(list[i])
-                }
-                for(let i = len; i < list.length; i++){
-                  R_list.push(list[i])
-                }
-                that.info["L_list"] = L_list
-                that.info["R_list"] = R_list
+                  for (let i = 0; i < len; i++) {
+                    L_list.push(list[i])
+                  }
+                  for (let i = len; i < list.length; i++) {
+                    R_list.push(list[i])
+                  }
+                  that.info["L_list"] = L_list
+                  that.info["R_list"] = R_list
 
-              }
-            })
-            .catch(function (error) {
-            });
+                }
+              })
+              .catch(function (error) {
+              });
+        }
       }
     },
   },

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/statementTemplate/printThree.vue

@@ -82,9 +82,9 @@
 
                             </td>
                             <td>
-                                <span v-if="item.type == 1">{{ subItem.pric }}</span>
-                                <span v-if="item.type == 2">{{ subItem.pric }}</span>
-                                <span v-if="item.type == 3">{{ subItem.pric }}</span>
+                                <span v-if="item.type == 1">{{ subItem.pric.toFixed(2) }}</span>
+                                <span v-if="item.type == 2">{{ subItem.pric.toFixed(2) }}</span>
+                                <span v-if="item.type == 3">{{ subItem.pric.toFixed(2) }}</span>
                                 <span v-if="item.type == 4">{{subItem.Total}}</span>
 
 
@@ -236,7 +236,7 @@
                             <td>
                                 <span v-if="item.type == 1">{{ (subItem.advice.prescribing_number * subItem.pric).toFixed(2) }}</span>
                                 <span v-if="item.type == 2">{{ (subItem.project.count * subItem.pric).toFixed(2) }}</span>
-                                <span v-if="item.type == 3">{{ subItem.Total }}</span>
+                                <span v-if="item.type == 3">{{ (subItem.project.count * subItem.pric).toFixed(2) }}</span>
 <!--                                <span v-if="item.type == 4">{{subItem.Total}}</span>-->
 
                             </td>

src/xt_pages/outpatientCharges/summary.vue

@@ -108,7 +108,7 @@
           >报表下载
           </el-button
           >
-          <el-button v-if="$store.getters.xt_user.org_id == 10106" size="small" type="primary" @click="export_detail_ten">报表下载2</el-button>
+          <el-button v-if="$store.getters.xt_user.org_id == 10106 || $store.getters.xt_user.org_id == 0" size="small" type="primary" @click="export_detail_ten">报表下载2</el-button>
 
           <!--          <el-button size="small" type="primary" @click="export_detail_two"-->
           <!--          >报表下载2-->
@@ -119,7 +119,7 @@
           <!--          <el-button size="small" type="primary" @click="export_detail_four">报表下载3</el-button>-->
           <!--          <el-button size="small" type="primary" @click="export_detail_five">报表下载3</el-button>-->
           <!--          <el-button size="small" type="primary" @click="export_detail_six">报表下载9</el-button>-->
-          <!--          <el-button size="small" type="primary" @click="export_detail_seven">报表下载4</el-button>-->
+                    <el-button size="small" type="primary" @click="export_detail_seven">报表下载4</el-button>
 
 
         </div>
@@ -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)
-
                   }
                 }
               }
@@ -1499,16 +1506,20 @@ export default {
             for (let i = 0; i < med_chrgitm_types.length; i++) {
               let price = 0
               let obj = {
+
+                number:"440722196501072316",
                 name: order.patient.name,
-                idNo: order.patient.id_card_no,
+                idNo: "",
                 med_chrgitm_name:this.getType(med_chrgitm_types[i]),
                 price:"",
                 remark:"",
               }
               if(i == 0){
                 obj.remark = "就诊日期:" + this.getTimes(order.settle_accounts_date) + " 医保报销: "+order.fund_pay_sumamt + " 现金:"+order.psn_cash_pay
+                obj.idNo = order.patient.id_card_no
               }else{
                 obj.remark = ""
+                obj.idNo = ""
               }
               for (let b = 0; b < order.info.length; b++) {
                 if(med_chrgitm_types[i] ==  order.info[b].med_chrgitm_type){
@@ -1519,17 +1530,48 @@ export default {
               obj.price = price
               list.push(obj)
             }
+          }
+          let list_two = []
+          const obj = {}
+          for(let i = 0; i < list.length; i++){
+            console.log(list[i])
+            list_two.push(list[i].name)
+          }
 
+          list_two = list_two.reduce((cur, next) => {
+            obj[next] ? '' : obj[next] = true && cur.push(next)
+            return cur
+          }, []) // 设置cur默认类型为数组，并且初始值为空的数组
+
+          for(let i = 0; i < list_two.length; i++){
+            for(let b = 0; b < list.length; b++){
+              if(list_two[i] == list[b].name){
+                list[b]['index'] = i+1
+              }
+            }
           }
 
           var tarList = []
           for (let i = 0; i < list.length; i++) {
             let obj = {
-              "姓名": list[i].name,
-              "身份证":  list[i].idNo,
-              "收费项目": list[i].med_chrgitm_name,
-              "金额": list[i].price,
+              "订单序号(必填)":list[i].index,
+              "订单号码":"",
+              "购方名称(必填)": list[i].name,
+              "购方纳税人识别号":list[i].idNo,
+              "开户行及账号":"",
+              "地址电话":"",
+              "税收编码(必填)":"3070202000000000000",
+              "商品名称(必填)": list[i].med_chrgitm_name,
+              "规格型号":"",
+              "计量单位":"",
+              "数量":"",
+              "单价":"",
+              "金额(必填)": list[i].price,
+              "税率(必填)":"0%",
+              "优惠政策":"普通零税率",
+              "税额":"0",
               "备注": list[i].remark,
+              "电子邮箱":"",
 
             }
             tarList.push(obj)
@@ -1537,18 +1579,44 @@ export default {
 
           import("@/vendor/Export2Excel").then((excel) => {
             const tHeader = [
-              "姓名",
-              "身份证",
-              "收费项目",
-              "金额",
-              "备注",
+              "订单序号(必填)",
+                "订单号码",
+                "购方名称(必填)",
+                "购方纳税人识别号",
+                "开户行及账号",
+                "地址电话",
+                "税收编码(必填)",
+                "商品名称(必填)",
+                "规格型号",
+                "计量单位",
+                "数量",
+                "单价",
+                "金额(必填)",
+                "税率(必填)",
+                "优惠政策",
+                "税额",
+                "备注",
+                "电子邮箱",
             ];
             const filterVal = [
-              "姓名",
-              "身份证",
-              "收费项目",
-              "金额",
+              "订单序号(必填)",
+              "订单号码",
+              "购方名称(必填)",
+              "购方纳税人识别号",
+              "开户行及账号",
+              "地址电话",
+              "税收编码(必填)",
+              "商品名称(必填)",
+              "规格型号",
+              "计量单位",
+              "数量",
+              "单价",
+              "金额(必填)",
+              "税率(必填)",
+              "优惠政策",
+              "税额",
               "备注",
+              "电子邮箱",
             ];
             const data = this.formatJson(filterVal, tarList);
             excel.export_json_to_excel({
@@ -2032,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);
@@ -2079,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

@@ -3227,7 +3227,7 @@
         this.teamList = row
       },
       selectChange(selection, row) {
-        console.log('row', row)
+        console.log('row', selection)
         // if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10188 || this.org_id ==10245 || this.org_id == 9919  || this.org_id == 10106 || this.org_id == 9504 || this.org_id ==10215 ||  this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10188 || this.org_id == 10191 || this.org_id == 10278 || this.org_id == 10217 || this.org_id ==10210 || this.org_id ==10318 || this.org_id ==10340){
         //    if (row.stock_count <= 0) {
         //     if (row.type == 3) {
@@ -3278,8 +3278,7 @@
               return
           }
          }
-
-        this.teamList.push(row)
+        this.teamList = selection
       },
       getlist() {
         this.tabProject = []

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -1701,7 +1701,7 @@ export default {
                   price: prescription.project[b].price,
                   remark: prescription.project[b].remark,
                   medical_code: prescription.project[b].project.medical_code,
-                  unit: prescription.project[b].project.unit,
+                  unit: prescription.project[b].unit,
                   type: prescription.project[b].type,
                   execution_state: prescription.project[b].execution_state,
 
@@ -1861,7 +1861,7 @@ export default {
                     total: prescription.project[b].count.toString(),
                     remark: prescription.project[b].remark,
                     medical_code: prescription.project[b].project.medical_code,
-                    unit: prescription.project[b].project.unit,
+                    unit: prescription.project[b].unit,
                     type: prescription.project[b].type,
                     execution_state: 2,
 
@@ -2158,7 +2158,7 @@ export default {
                         price: prescription.project[b].price,
                         remark: prescription.project[b].remark,
                         medical_code: prescription.project[b].project.medical_code,
-                        unit: prescription.project[b].project.unit,
+                        unit: prescription.project[b].unit,
                         type: prescription.project[b].type,
                         execution_state: prescription.project[b].execution_state,
                       }
@@ -2316,7 +2316,7 @@ export default {
                           total: prescription.project[b].count.toString(),
                           remark: prescription.project[b].remark,
                           medical_code: prescription.project[b].project.medical_code,
-                          unit: prescription.project[b].project.unit,
+                          unit: prescription.project[b].unit,
                           type: prescription.project[b].type,
                           execution_state: 2,
 
@@ -2700,7 +2700,7 @@ export default {
                         price: prescription.project[b].price,
                         remark: prescription.project[b].remark,
                         medical_code: prescription.project[b].project.medical_code,
-                        unit: prescription.project[b].project.unit,
+                        unit: prescription.project[b].unit,
                         type: prescription.project[b].type,
                         execution_state: prescription.project[b].execution_state,
 
@@ -2850,7 +2850,7 @@ export default {
                           total: prescription.project[b].count.toString(),
                           remark: prescription.project[b].remark,
                           medical_code: prescription.project[b].project.medical_code,
-                          unit: prescription.project[b].project.unit,
+                          unit: prescription.project[b].unit,
                           type: prescription.project[b].type,
                           execution_state: 2,
 
@@ -3214,7 +3214,7 @@ export default {
                       price: prescription.project[b].price,
                       remark: prescription.project[b].remark,
                       medical_code: prescription.project[b].project.medical_code,
-                      unit: prescription.project[b].project.unit,
+                      unit: prescription.project[b].unit,
                       type: prescription.project[b].type,
                       execution_state: prescription.project[b].execution_state
 
@@ -3364,7 +3364,7 @@ export default {
                         total: prescription.project[b].count.toString(),
                         remark: prescription.project[b].remark,
                         medical_code: prescription.project[b].project.medical_code,
-                        unit: prescription.project[b].project.unit,
+                        unit: prescription.project[b].unit,
                         type: prescription.project[b].type,
                         execution_state: 2
 
@@ -3807,7 +3807,7 @@ export default {
                         price: prescription.project[b].price,
                         remark: prescription.project[b].remark,
                         medical_code: prescription.project[b].project.medical_code,
-                        unit: prescription.project[b].project.unit,
+                        unit: prescription.project[b].unit,
                         type: prescription.project[b].type,
                         execution_state: prescription.project[b].execution_state
 
@@ -3966,7 +3966,7 @@ export default {
                           total: prescription.project[b].count.toString(),
                           remark: prescription.project[b].remark,
                           medical_code: prescription.project[b].project.medical_code,
-                          unit: prescription.project[b].project.unit,
+                          unit: prescription.project[b].unit,
                           type: prescription.project[b].type,
                           execution_state: 2,
                         }
@@ -4434,7 +4434,7 @@ export default {
                         price: prescription.project[b].price,
                         remark: prescription.project[b].remark,
                         medical_code: prescription.project[b].project.medical_code,
-                        unit: prescription.project[b].project.unit,
+                        unit: prescription.project[b].unit,
                         type: prescription.project[b].type,
                         execution_state: prescription.project[b].execution_state
 
@@ -4594,7 +4594,7 @@ export default {
                           total: prescription.project[b].count.toString(),
                           remark: prescription.project[b].remark,
                           medical_code: prescription.project[b].project.medical_code,
-                          unit: prescription.project[b].project.unit,
+                          unit: prescription.project[b].unit,
                           type: prescription.project[b].type,
                           execution_state: 2
 

src/xt_pages/outpatientDoctorStation/template/printThree.vue

@@ -49,8 +49,16 @@
             <div style="width: 20%;"></div>
             <div style="width: 33%; display: flex">
               医保类型：
-              <span class="under_line">
-               
+              <span class="under_line" v-if="item.patient.reimbursement_way_id == 20">
+               {{'医保一档'}}
+              </span>
+              <span class="under_line" v-if="item.patient.reimbursement_way_id == 21">
+               {{'医保二档'}}
+              </span>
+              <span class="under_line" v-if="item.patient.reimbursement_way_id == 22">
+               {{'医保三档'}}
+              </span>
+              <span class="under_line" v-if="item.patient.reimbursement_way_id != 20 && item.patient.reimbursement_way_id != 21 && item.patient.reimbursement_way_id != 22">
               </span>
             </div>
           </div>

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
           }
         }
     }