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

src/api/advice.js

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

src/api/config.js

@@ -148,7 +148,7 @@ export function postMonitorIsOpen(params){
 
 
 export function getMonitorConfig(params){
-  
+
   return request({
     url:"/api/monitor/getmonitorconfig",
     method:"Get",
@@ -158,7 +158,7 @@ export function getMonitorConfig(params){
 
 
 export function addOrderConfig(params){
-  
+
   return request({
     url:"/api/order/addorderconfig",
     method:"Get",
@@ -168,7 +168,7 @@ export function addOrderConfig(params){
 }
 
 export function getOrderConfig(params){
-  
+
   return request({
     url:"/api/order/getorderconfig",
     method:"get",
@@ -176,3 +176,31 @@ export function getOrderConfig(params){
   })
 }
 
+export function changeFuncPrint(params){
+
+  return request({
+    url:"/api/order/changefuncprint",
+    method:"get",
+    params:params
+  })
+}
+
+export function getDataPrintList(params){
+
+  return request({
+    url:"/api/order/getdataprint",
+    method:"get",
+    params:params
+  })
+}
+
+
+
+export function postXtHisProjectIsOpen(params){
+
+  return request({
+    url:"/api/xtconfigproject/isopen",
+    method:"post",
+    params:params
+  })
+}

src/api/dialysis.js

@@ -157,6 +157,7 @@ export function postPrescription(params) {
 }
 
 export function postSoulution(params) {
+  console.log("params",params)
   return request({
     url: '/api/dialysis/soulution',
     method: 'Post',

src/api/his/his_config.js

@@ -0,0 +1,82 @@
+import request from "@/utils/request";
+
+
+
+export function getPatientList(params) {
+  return request({
+    url: "/api/his/patient/list",
+    method: "get",
+    params:params
+  });
+}
+
+
+export function getPrescriptionTemplateList(params) {
+  return request({
+    url: "/api/his/prescriptiontemplate/list",
+    method: "get",
+    params:params
+  });
+}
+
+
+export function getPrescriptionTemplateInfo(params) {
+  return request({
+    url: "/api/his/prescriptiontemplate/info",
+    method: "get",
+    params:params
+  });
+}
+
+
+
+export function createdTemplate(params,data) {
+  return request({
+    url: "/api/his/prescriptiontemplate/create",
+    method: "post",
+    data:data,
+    params:params,
+  });
+}
+
+
+
+
+export function delHisPrescriptionTemplate(params) {
+  return request({
+    url: "/api/his/prescriptiontemplate/delete",
+    method: "post",
+    params:params,
+  });
+}
+
+
+
+export function delHisPrescriptionInfoTemplate(params) {
+  return request({
+    url: "/api/his/prescriptioninfotemplate/delete",
+    method: "post",
+    params:params,
+  });
+}
+
+
+
+
+export function delHisPrescriptionAdviceTemplate(params) {
+  return request({
+    url: "/api/his/advicetemplate/delete",
+    method: "post",
+    params:params,
+  });
+}
+
+
+
+export function delHisPrescriptionProjectTemplate(params) {
+  return request({
+    url: "/api/his/projecttemplate/delete",
+    method: "post",
+    params:params,
+  });
+}

src/api/schedule.js

@@ -220,4 +220,22 @@ export function getPatientSheduleCount(params){
     method:"get",
     params:params
   })
+}
+
+export function postScheduleTemplate(params){
+   
+  return request({
+    url:"/api/schedule/postscheduletemplate",
+    method:"get",
+    params:params
+  })
+}
+
+export function getScheduleTemplate(params){
+  
+  return request({
+    url:"/api/schedule/getscheduletemplate",
+    method:"get",
+    params:params,
+  })
 }

src/lang/zh.js

@@ -247,6 +247,8 @@ export default {
     hospitalStation:"住院工作站",
     pastInquiries:"既往查询",
 
+    prescriptionTemplate:"处方模版",
+
   },
   navbar: {
     logOut: '退出登录',

src/router/modules/dialysis.js

@@ -399,6 +399,18 @@ export default {
         noCache: true
       }
     },
+    {
+      path: '/dialysis/print/batch/thirtyNine',
+      component: () =>
+        import('@/xt_pages/dialysis/batch_print/batch_print_order_thirtyNine'),
+      hidden: true,
+      is_menu: false,
+      name: 'batch_print_order_thirtyNine',
+      meta: {
+        title: '批量打印',
+        noCache: true
+      }
+    },
     {
       path: '/dialysis/print/batch/thirtyThree_one',
       component: () =>

src/router/modules/outpatientDoctorStation.js

@@ -24,6 +24,24 @@ export default {
         name: 'outpatientDoctorStationPastInquiries',
         meta: { title: 'outpatientDoctorStationPastInquiries', noCache: true }
     },
+    {
+      path: '/outpatientDoctorStation/prescriptionTemplate',
+      component: () => import('@/xt_pages/outpatientDoctorStation/prescriptionTemplate'),
+      name: 'prescriptionTemplate',
+      meta: { title: 'prescriptionTemplate', noCache: true }
+    },
+
+    {
+      path: '/outpatientDoctorStation/prescriptionTemplatedetail',
+      component: () => import('@/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail'),
+      name: 'prescriptionTemplatedetail',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'prescriptionTemplatedetail', noCache: true }
+    },
+
+
+
     {
         path: '/outpatientDoctorStation/templateManagement',
         component: () => import('@/xt_pages/outpatientDoctorStation/templateManagement'),

src/store/modules/globalConfig.js

@@ -524,6 +524,21 @@ const global_config = {
         sodium: 1,
         calcium: 1,
         bicarbonate: 1
+      },
+      22: {
+        id: 22,
+        name: '血浆胆红素吸附+HDF',
+        dialysis_duration: 1,
+        replacement_way: 1,
+        hemodialysis_machine: 2,
+        blood_filter: 1,
+        perfusion_apparatus: 2,
+        blood_flow_volume: 1,
+        dialysate_flow: 1,
+        kalium: 1,
+        sodium: 1,
+        calcium: 1,
+        bicarbonate: 1
       }
     },
     anticoagulants_confit: { // 抗凝剂

src/xt_pages/data/basicConfig.vue

@@ -15,7 +15,7 @@
             <p style="font-size:18px;font-weight:bold">门诊打印</p>
             <p style="font-size:14px;margin-top:5px;color:#333;">开启直接打印后，门诊病历、处方、治疗单、处置单、收费清单等打印时跳过打印预览，直接连接打印机打印。</p>
             <p style="margin-top:20px;">直接打印：
-                <el-switch v-model="value"></el-switch>
+                <el-switch v-model="is_open_print" @change="changeFuncPrint"></el-switch>
             </p>
         </div>
         <div class="configBox">
@@ -26,6 +26,15 @@
           </p>
         </div>
 
+        <div class="configBox">
+            <p style="font-size:18px;font-weight:bold">处方项目同步到临时医嘱</p>
+            <p style="font-size:14px;margin-top:5px;color:#333;">开启门诊处方的项目同步后，护士则在血透的临时医嘱中可以看到相关的耗材/检验检查数据</p>
+            <p style="margin-top:20px;">门诊处方项目同步到透析医嘱：
+                <el-switch v-model="is_open_xt_his_project" @change="changeFuncProject"></el-switch>
+            </p>
+        </div>
+
+
         <!-- <div class="configBox">
           <p style="font-size:18px;font-weight:bold">血压数据自动获取</p>
           <p style="font-size:14px;margin-top:5px;color:#333;">在联机的状态下,开启透析监测-血压数据自动获取功能后,则不需要手动输入,数据会自动上传到监测中</p>
@@ -71,14 +80,14 @@
                 <!--<el-switch v-model="value"></el-switch>-->
             <!--</p>-->
         <!--</div>-->
-        
+
     </div>
   </div>
 </template>
 
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
-import { getAllIsOpenInit,postXtHisIsOpen,postMonitorIsOpen} from '@/api/config'
+import { getAllIsOpenInit,postXtHisIsOpen,postMonitorIsOpen,changeFuncPrint,getDataPrintList,postXtHisProjectIsOpen} from '@/api/config'
 
 export default {
   name: "printTemplate",
@@ -94,6 +103,8 @@ export default {
       is_open_xt_his:false,
       is_open_monitor:false,
       is_open_order:false,
+      is_open_print:false,
+      is_open_xt_his_project: false,
     };
   },
   methods: {
@@ -103,10 +114,18 @@ export default {
           if (response.data.state === 1) {
             if(response.data.data.is_open_xt_his == 1) {
               this.is_open_xt_his = true
+
             }else{
               this.is_open_xt_his = false
             }
 
+            if(response.data.data.is_open_xt_his_project == 1) {
+              this.is_open_xt_his_project = true
+
+            }else{
+              this.is_open_xt_his_project = false
+            }
+
           } else {
             this.$message.error(response.data.msg)
           }
@@ -145,6 +164,38 @@ export default {
         )
       }
     },
+    changeFuncProject(val){
+      if(this.is_open_xt_his_project){
+        let params={
+          is_open:this.is_open_xt_his_project
+        }
+        postXtHisProjectIsOpen(params).then(
+          response => {
+            if (response.data.state === 1) {
+              this.is_open_xt_his_project = response.data.data.is_open
+
+            } else {
+              this.$message.error(response.data.msg)
+            }
+          }
+        )
+      }else{
+        let params={
+          is_open:this.is_open_xt_his_project
+        }
+        postXtHisProjectIsOpen(params).then(
+          response => {
+            if (response.data.state === 1) {
+              this.is_open_xt_his_project = response.data.data.is_open
+
+            } else {
+              this.$message.error(response.data.msg)
+            }
+          }
+        )
+      }
+    },
+
 
     changeFuncTwo(){
       console.log("3333333",this.is_open_monitor)
@@ -192,7 +243,7 @@ export default {
        }
       let params = {
          is_open:is_open,
-       } 
+       }
       addOrderConfig(params).then(response=>{
          if(response.data.state == 1){
            var config = response.data.data.config
@@ -213,14 +264,51 @@ export default {
            }
         }
       })
+    },
+
+    changeFuncPrint(val){
+      console.log("val22222",val)
+      var is_open  = 0
+      if(val == true){
+         is_open = 1
+      }
+      if(val == false){
+        is_open = 0
+      }
+      var params = {
+        is_open:is_open,
+      }
+
+      changeFuncPrint(params).then(response=>{
+         if(response.data.state == 1){
+           var dataPrint =  response.data.data.dataPrint
+           this.$message.success("保存成功")
+           this.getDataPrintList()
+         }
+      })
+    },
+
+    getDataPrintList(){
+      getDataPrintList().then(response=>{
+         if(response.data.state ==1){
+           var dataPrint = response.data.data.dataPrint
+           console.log("列表数据",dataPrint)
+           if(dataPrint.is_open == 1){
+              this.is_open_print = true
+           }
+           if(dataPrint.is_open == 0){
+              this.is_open_print = false
+           }
+         }
+      })
     }
 
   },
   created() {
     this.getInitIsOpenConfig()
-    this.getMonitorConfig()
-    this.getOrderConfig()
-
+    // this.getMonitorConfig()
+    // this.getOrderConfig()
+    this.getDataPrintList()
   }
 };
 </script>

src/xt_pages/data/components/addInspection.vue

@@ -46,16 +46,17 @@
                 </el-form-item>
 
                 <el-form-item label="组套明细" style="width:50%;">
-                    <el-select v-model="form.project_detail" placeholder="请选择">
-                        <el-option
-                                v-for="item in projectList"
-                                :key="item.id"
-                                :label="item.project_name"
-                                :value="item.id">
-                        </el-option>
-                    </el-select>
+                    <el-autocomplete
+                            class="inline-input"
+                            v-model="form.project_detail"
+                            :fetch-suggestions="querySearch"
+                            placeholder="请输入内容"
+                            @select="handleSelect"
+                    ></el-autocomplete>
 
                 </el-form-item>
+
+
                 <el-form-item label="数量" style="width:50%;">
                     <div style="display:flex;">
                         <el-input v-model="form.number" style="margin-right:10px;"></el-input>
@@ -131,6 +132,7 @@
   export default {
     data() {
       return {
+        project_name:"",
         visible: false,
         formTitle: '',
         activeName: 'first',
@@ -165,6 +167,21 @@
       }
     },
     methods: {
+      querySearch(queryString, cb) {
+        var restaurants = this.projectList;
+        var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
+        // 调用 callback 返回建议列表的数据
+        cb(results);
+
+      }, createFilter(queryString) {
+        return (restaurant) => {
+          return (restaurant.project_name.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
+        };
+      },
+      handleSelect(val){
+        this.project_name = val.project_name
+        this.form.project_detail = val.id
+      },
       getDataConfig(module, filed_name) {
         return getDataConfig(module, filed_name)
       },
@@ -223,7 +240,11 @@
         })
       },
       getlist() {
-        getAllProjectList().then(response => {
+        let params = {
+          keyword: ""
+
+        }
+        getAllProjectList(params).then(response => {
           if (response.data.state == 1) {
             var projectList = response.data.data.projectList
             var goodInfos = response.data.data.good_info

src/xt_pages/data/druguseTemplate.vue

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

src/xt_pages/data/prescription.vue

@@ -229,7 +229,7 @@
                     </el-form-item>
                   </el-col>
 
-                  <el-col :span="8">
+                  <el-col :span="8" v-if="this.$store.getters.xt_user.template_info.org_id != 9987 && this.$store.getters.xt_user.template_info.org_id != 3877 && this.$store.getters.xt_user.template_info.org_id != 10090">
                     <el-form-item label="透析器/灌流器：">
                       <el-input
                         v-model="addPlan.dialyzer_perfusion_apparatus" @focus="showInnerDialog('5')"></el-input>
@@ -237,14 +237,14 @@
                   </el-col>
 
 
-                  <el-col :span="8" v-if="this.$store.getters.xt_user.template_info.org_id == 9987 || this.$store.getters.xt_user.template_info.org_id == 3877">
+                  <el-col :span="8" v-if="this.$store.getters.xt_user.template_info.org_id == 9987 || this.$store.getters.xt_user.template_info.org_id == 3877 || this.$store.getters.xt_user.template_info.org_id == 10090">
                     <el-form-item label="透析器：">
                       <el-input
                         v-model="dialysis_dialyszers" @focus="showInnerDialog('6')"></el-input>
                     </el-form-item>
                   </el-col>
 
-                  <el-col :span="8" v-if="this.$store.getters.xt_user.template_info.org_id == 9987 || this.$store.getters.xt_user.template_info.org_id == 3877">
+                  <el-col :span="8" v-if="this.$store.getters.xt_user.template_info.org_id == 9987 || this.$store.getters.xt_user.template_info.org_id == 3877 || this.$store.getters.xt_user.template_info.org_id == 10090">
                     <el-form-item label="灌流器：">
                       <el-input
                         v-model="dialysis_irrigation" @focus="showInnerDialog('7')"></el-input>

src/xt_pages/data/printTemplate.vue

@@ -20,7 +20,9 @@
         <el-tab-pane label="透析记录单模板" name="4">
           <dialysis-print></dialysis-print>
         </el-tab-pane>
-       
+        <el-tab-pane label="排班打印模板" name="6">
+          <schedule-print></schedule-print>
+        </el-tab-pane>
       </el-tabs>
     </div>
   </div>
@@ -33,10 +35,10 @@ import prescriptionPrint from './printTemplate/prescriptionPrint'
 import treatPrint from './printTemplate/treatPrint'
 import dialysisPrint from './printTemplate/dialysisPrint'
 import chargePrint from './printTemplate/chargePrint'
-
+import schedulePrint from './printTemplate/schedulePrint'
 export default {
   name: "printTemplate",
-  components: { BreadCrumb,recordPrint,prescriptionPrint,treatPrint,dialysisPrint,chargePrint },
+  components: { BreadCrumb,recordPrint,prescriptionPrint,treatPrint,dialysisPrint,chargePrint,schedulePrint },
   data() {
     return {
       showViewer:false,

src/xt_pages/data/printTemplate/schedulePrint.vue

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

src/xt_pages/dialysis/PatientBox.vue

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

src/xt_pages/dialysis/batch_print/batch_print_order.vue

@@ -2049,10 +2049,18 @@ export default {
 
 
           for (const index in this.records) {
+            for(const index2 in this.records[index].his_project){
+              if(this.records[index].his_project[index2].type == 2){
+                this.records[index].his_project[index2]['advice_name'] = this.records[index].his_project[index2].project.project_name
+              }else if(this.records[index].his_project[index2].type == 3){
+                this.records[index].his_project[index2]['advice_name'] =this.records[index].his_project[index2].good_info.good_name
+              }
+              this.records[index].his_project[index2]['advice_doctor'] = this.records[index].his_project[index2].doctor
+            }
             this.records[index].advices = this.records[index].advices.concat(this.records[index].his_advices)
+            this.records[index].advices = this.records[index].advices.concat(this.records[index].his_project)
           }
 
-
           for (const recordIndex in this.records) {
             var dlegh = 0;
             if (

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -81,9 +81,9 @@
               <div
                 class="under_line"
                 style="width: 70px;text-align: left"
-                v-if="record.patient.admission_number"
+                v-if="record.receive_assessment.admission_number"
               >
-                {{ record.patient.admission_number }}
+                {{ record.receive_assessment.admission_number }}
               </div>
               <div
                 class="under_line"
@@ -556,6 +556,13 @@
                           >
                             IUF+HD
                           </div>
+                           <div
+                            class="under_line"
+                            style="width: 100px;text-align: center;font-weight:600;"
+                            v-if="record.prescription.mode_id == 22"
+                          >
+                            血浆胆红素吸附+HDF
+                          </div>
                         </div>
                       </div>
 
@@ -656,21 +663,27 @@
                           {{record.prescription && record.prescription.dialysis_irrigation?record.prescription.dialysis_irrigation:"/"}}
                         </div>
                       </div>
-                      <div class="inline_block" style="flex:1;">
-                        干体重：
+                      <div class="inline_block" style="flex:1;" v-if="org_id == 9538">
+                        血浆分离器：
                         <div
                           class="under_line"
-                          style="width: 150px;text-align: center"
+                          style="width: 70px;text-align: center"
                         >
-                          {{
-                            record.assessment_before_dislysis &&
-                            record.assessment_before_dislysis.dry_weight
-                              ? record.assessment_before_dislysis.dry_weight
-                              : "/"
-                          }}
+                          <span v-if="record.prescription.plasma_separator ? record.prescription.plasma_separator != 0 && record.prescription.plasma_separator != '0' : false">{{ record.prescription.plasma_separator }}</span>
+                          <span v-else>/</span>
+                        </div>
+                      </div>
+                      <div class="inline_block" style="flex:1;" v-if="org_id == 9538">
+                        胆红素吸附柱：
+                        <div
+                          class="under_line"
+                          style="width: 70px;text-align: center"
+                        >
+                          <span v-if="record.prescription.bilirubin_adsorption_column ? record.prescription.bilirubin_adsorption_column != 0 && record.prescription.bilirubin_adsorption_column != '0' : false">{{ record.prescription.bilirubin_adsorption_column }}</span>
+                          <span v-else>/</span>
                         </div>
-                        kg
                       </div>
+                      
                     </div>
 
                     <div
@@ -722,7 +735,7 @@
                         计划超滤量：
                         <div
                           class="under_line"
-                          style="width: 150px;text-align: center"
+                          style="width: 100px;text-align: center"
                         >
                           {{
                             record.prescription &&
@@ -733,6 +746,21 @@
                         </div>
                         ml
                       </div>
+                      <div class="inline_block" style="flex:1;">
+                        干体重：
+                        <div
+                          class="under_line"
+                          style="width: 100px;text-align: center"
+                        >
+                          {{
+                            record.assessment_before_dislysis &&
+                            record.assessment_before_dislysis.dry_weight
+                              ? record.assessment_before_dislysis.dry_weight
+                              : "/"
+                          }}
+                        </div>
+                        kg
+                      </div>
                     </div>
 
                     <div class="row" style="padding: 2px 0;line-height:23px;">
@@ -1027,7 +1055,7 @@
                           </td>
                           <td>
                             {{
-                              monitor_record.ultrafiltration_volume? monitor_record.ultrafiltration_volume: ""}}
+                              monitor_record.ultrafiltration_volume? monitor_record.ultrafiltration_volume: "0"}}
                           </td>
                           <td v-if=" record.prescription.mode_id == 2 || record.prescription.mode_id == 5 ||(record.prescription.mode_id == 12 &&monitor_record.operate_time >record.dialysis_order.end_time) " style="width:50px">
                             {{

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -249,6 +249,16 @@
           >批量打印</el-button
         >
       </template>
+      <template v-if="this.template_id == 39">
+        <el-button
+          size="small"
+          icon="el-icon-printer"
+          :disabled="selecting_schs.length == 0"
+          @click="batchPrintAction"
+          type="primary"
+          >批量打印</el-button
+        >
+      </template>
     </div>
     <div class="app-container">
       <!-- <div class="filter-container">
@@ -827,6 +837,8 @@ export default {
         this.$router.push({ path: "/dialysis/print/batch/thirtyTwo" });
       } else if (this.template_id == 33) {
         this.$router.push({ path: "/dialysis/print/batch/thirtyThree" });
+      } else if (this.template_id == 39) {
+        this.$router.push({ path: "/dialysis/print/batch/thirtyNine" });
       }
     },
     batchPrintActionOne: function() {

src/xt_pages/dialysis/details/DialysisPrescription.vue

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

src/xt_pages/dialysis/details/assessmentBefore.vue

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

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

@@ -2430,7 +2430,7 @@
                 obj.type = 2
                 obj.custom_id = this.rand(10000000, 99999999)
                 obj.drug_specs = medicalList[i].drug_specs
-                console.log("222",this.all_drug)
+                // console.log("222",this.all_drug)
                 this.all_drug.push(obj)
               }
             }
@@ -2467,7 +2467,7 @@
                 obj.custom_id = this.rand(10000000, 99999999)
                 obj.drug_specs = base_drug_list[i].drug_specs
                 this.all_drug.push(obj)
-                console.log("2222",this.all_drug)
+                // console.log("2222",this.all_drug)
               }
             }
         })

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

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

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

@@ -396,6 +396,20 @@
              </el-form-item>
           </el-col>
 
+          <el-col :span="8" v-if="isShows('血浆分离器')">
+             <el-form-item label="血浆分离器:">
+                  <el-input v-model="dialysisPrescription.plasma_separator" @focus="showInnerDialog('9')"></el-input>
+             </el-form-item>
+          </el-col>
+
+         
+         <el-col :span="8" v-if="isShows('胆红素吸附柱')">
+             <el-form-item label="胆红素吸附柱:">
+                  <el-input v-model="dialysisPrescription.bilirubin_adsorption_column" @focus="showInnerDialog('10')"></el-input>
+             </el-form-item>
+         </el-col>
+
+
           <el-col :span="8" v-if="isShows('体液过多症状')">
             <el-form-item label="体液过多症状：">
               <el-select
@@ -562,15 +576,15 @@
              </el-form-item>
           </el-col>
 
-         
-
-
+        
           <el-col :span="8" v-if="isShows('置换流量')">
              <el-form-item label="置换流量(L/h)：">
                 <el-input v-model="dialysisPrescription.replacement_flow"></el-input>
              </el-form-item>
           </el-col>
+         
 
+       
         </el-row>
 
         <el-row :gutter="20">
@@ -1069,6 +1083,8 @@
           single_time:"",
           single_water:"",
           replacement_flow:"",
+          plasma_separator:"",
+          bilirubin_adsorption_column:"",
         },
 
         anticoagulant: {
@@ -1092,7 +1108,9 @@
         bloods:[],
         irrigations:[],
         dialyzers:[],
-        illnessList:[]
+        illnessList:[],
+        plasmaSeparatorList:[],
+        bilirubinAdsorptionColumn:[],
       }
     },
     methods: {
@@ -1177,6 +1195,25 @@
             this.InnerDialogProps.selected = this.dialysisPrescription.dialysis_irrigation
             this.InnerDialogProps.isShowTextArea = false
             break
+           case '9': // 血浆灌流器
+
+           
+            this.InnerDialogProps.values = this.plasmaSeparatorList
+            this.InnerDialogProps.titles = '血浆灌流器'
+            this.InnerDialogProps.type = 'plasma_separator'
+            this.InnerDialogProps.selected = this.dialysisPrescription.plasma_separator
+            this.InnerDialogProps.isShowTextArea = false
+            break
+
+           case '10': // 胆红素吸附柱
+
+           
+            this.InnerDialogProps.values = this.bilirubinAdsorptionColumn
+            this.InnerDialogProps.titles = '胆红素吸附柱'
+            this.InnerDialogProps.type = 'bilirubin_adsorption_column'
+            this.InnerDialogProps.selected = this.dialysisPrescription.bilirubin_adsorption_column
+            this.InnerDialogProps.isShowTextArea = false
+            break
         }
       },
       innerDialogComfirm: function(val) {
@@ -1194,6 +1231,12 @@
           case 'irrigations':
            this.dialysisPrescription.dialysis_irrigation = val.value.join(',')
           break
+          case 'plasma_separator':
+          this.dialysisPrescription.plasma_separator = val.value.join(',')
+          break
+          case 'bilirubin_adsorption_column':
+          this.dialysisPrescription.bilirubin_adsorption_column = val.value.join(',')
+          break
         }
       },
       innerDialogCancle: function() {
@@ -1645,7 +1688,8 @@
         return uParseTime(val, '{y}-{m}-{d} {h}:{i}')
       },
       show(pre,schedual,last,his_is_open) {
-        
+        console.log("pre222222",pre)
+       
         if(his_is_open == 1){
           this.is_open = 0
         }
@@ -3582,8 +3626,13 @@
       }
     },
     created(){
+      
       this.illnessList = getDataConfig('hemodialysis','illness')
-      console.log("列表22222222222",this.illnessList)
+      
+      this.plasmaSeparatorList = getDataConfig('hemodialysis','plasma_separator')
+      
+      this.bilirubinAdsorptionColumn = getDataConfig('hemodialysis','bilirubin_adsorption_column')
+
     }
   }
 </script>

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

@@ -930,9 +930,12 @@
       isVisibility(val) {
         
         if(this.prescription!=null && this.prescription.id!=0){
-
+          
           this.diazes = this.diazes + this.prescription.dialyzer_perfusion_apparatus
+          this.diazes = this.diazes + this.prescription.dialysis_dialyszers+this.prescription.dialysis_irrigation
           this.prescription.dialyzer_perfusion_apparatus = ""
+          this.prescription.dialysis_dialyszers = ""
+          this.prescription.dialysis_irrigation = ""
           this.dialysate_formulation = this.dialysate_formulation + this.GetDialysateFormulationById(this.prescription.dialysate_formulation)
           // this.prescription.dialysate_formulation = ""
           this.kalium = this.kalium + (this.prescription.kalium?this.prescription.kalium:"")

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

@@ -126,8 +126,10 @@
           (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
           '-' +
           (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + (nowHours < 10 ? '0' + nowHours : nowHours) + ':' + (nowMinutes < 10 ? '0' + nowMinutes : nowMinutes)
-
-        this.patient_id = this.$route.query.patient_id
+        if(this.$route.query.patient_id){
+          this.patient_id = this.$route.query.patient_id
+        }
+        
         this.schedule_date = this.$route.query.date
 
         if (this.dialysis_order.id == 0) {

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

@@ -130,6 +130,7 @@ import { postTreatmentsummary } from '@/api/dialysis'
 import { uParseTime } from '@/utils/tools'
 import store from '@/store'
 import request from '@/utils/request'
+import { parseTime } from '@/utils'
 
 export default {
   name: 'treatmentSummaryDialog',

src/xt_pages/dialysis/details/index.vue

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

src/xt_pages/dialysis/dialysisDoctorAdvice.vue

@@ -2,13 +2,14 @@
   <div class="main-contain">
     <div class="position">
       <bread-crumb :crumbs="crumbs"></bread-crumb>
+      <div>
        <el-button
           size="small"
           icon="el-icon-printer"
           :disabled="selecting_schs.length == 0"
           @click="signPrintAction"
           type="primary"
-          style="float:right"
+          style="margin-right:10"
         >标签打印
       </el-button>
       <el-button
@@ -19,7 +20,7 @@
           type="primary"
           >医嘱打印
       </el-button>
-   
+    </div>
     </div>
     <div class="app-container">
       <!-- <div class="filter-container">

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -553,6 +553,16 @@
           >打印</el-button
         >
       </template>
+      <template v-if="org_template_info.template_id == 40">
+        <el-button
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+          >打印</el-button
+        >
+      </template>
     </div>
     <div class="app-container" style="min-height:0;">
       <!--<div class="order-print-btn"-->
@@ -828,6 +838,11 @@
             v-if="org_template_info.template_id == 39"
           >
           </DialysisPrintOrderThirtyNine>
+          <DialysisPrintOrderForty
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 40"
+          >
+          </DialysisPrintOrderForty>
         </div>
       </el-container>
     </div>
@@ -886,9 +901,11 @@ import DialysisPrintOrderThirtySix from "./template/DialysisPrintOrderThirtySix"
 import DialysisPrintOrderThirtySeven from "./template/DialysisPrintOrderThirtySeven";
 import DialysisPrintOrderThirtyEight from "./template/DialysisPrintOrderThirtyEight";
 import DialysisPrintOrderThirtyNine from "./template/DialysisPrintOrderThirtyNine";
+import DialysisPrintOrderForty from "./template/DialysisPrintOrderForty";
 export default {
   name: "dialysisPrintOrder",
   components: {
+    DialysisPrintOrderForty,
     DialysisPrintOrderThirtyNine,
     DialysisPrintOrderThirtyEight,
     DialysisPrintOrderThirtySeven,
@@ -1366,6 +1383,13 @@ export default {
           style: style3,
           scanStyles: false
         });
+      } else if (this.org_template_info.template_id == 40) {
+        printJS({
+          printable: "dialysis-print-box",
+          type: "html",
+          style: style5,
+          scanStyles: false
+        });
       }
     },
     printThisOnePage() {

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -64,8 +64,8 @@
         </div>
         <div class="inline_block" style="margin-left: 5px;">
           住院号/门诊号：
-          <div class="under_line" style="width: 70px;text-align: left" v-if="patientInfo.admission_number">
-            {{ patientInfo.admission_number }}
+          <div class="under_line" style="width: 70px;text-align: left" v-if="receiverTreatmentAccess.admission_number">
+            {{ receiverTreatmentAccess.admission_number }}
           </div>
           <div class="under_line" style="width: 70px;text-align: left" v-else>
             {{ "/" }}
@@ -300,6 +300,9 @@
                     <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 19">
                       IUF+HD
                     </div>
+                    <div class="under_line" style="width: 150px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 22">
+                      血浆胆红素吸附+HDF
+                    </div>
                   </div>
 
                   <div class="inline_block" style="margin-left:10px;flex:1;">
@@ -344,12 +347,19 @@
                      {{prescription.dialysis_irrigation?prescription.dialysis_irrigation:'/'}}
                     </div>
                   </div>
-                  <div class="inline_block" style="flex:1;">
-                    干体重：
-                    <div class="under_line" style="width: 150px;text-align: center">
-                      {{ predialysis.dry_weight ? predialysis.dry_weight : "/" }}
+                  <div class="inline_block" style="flex:1;" v-if="org_id == 9538">
+                    血浆分离器：
+                    <div class="under_line" style="width: 70px;text-align: center">
+                      <span v-if="prescription.plasma_separator ? prescription.plasma_separator != 0 && prescription.plasma_separator != '0' : false">{{ prescription.plasma_separator }}</span>
+                      <span v-else>/</span>
+                    </div>
+                  </div>
+                  <div class="inline_block" style="flex:1;" v-if="org_id == 9538">
+                    胆红素吸附柱：
+                    <div class="under_line" style="width: 70px;text-align: center">
+                      <span v-if="prescription.bilirubin_adsorption_column ? prescription.bilirubin_adsorption_column != 0 && prescription.bilirubin_adsorption_column != '0' : false">{{ prescription.bilirubin_adsorption_column }}</span>
+                      <span v-else>/</span>
                     </div>
-                    kg
                   </div>
                 </div>
 
@@ -357,7 +367,8 @@
                   <div class="inline_block" style="flex:1;">
                     上次透后体重：
                     <div class="under_line" style="width: 100px;text-align: center">
-                      {{ lastafterdialysis.weight_after_last_transparency ? parseFloat(lastafterdialysis.weight_after - lastafterdialysis.additional_weight).toFixed(1) : "未称重" }}
+                      {{predialysis.weight_after_last_transparency?predialysis.weight_after_last_transparency:'未称重'}}
+                      <!-- {{ predialysis.weight_after_last_transparency ? parseFloat(lastafterdialysis.weight_after - lastafterdialysis.additional_weight).toFixed(1) : "未称重" }} -->
                     </div>
                     kg
                   </div>
@@ -370,11 +381,18 @@
                   </div>
                   <div class="inline_block" style="flex:1;">
                     计划超滤量：
-                    <div class="under_line" style="width: 150px;text-align: center">
+                    <div class="under_line" style="width: 100px;text-align: center">
                       {{ prescription.target_ultrafiltration ? prescription.target_ultrafiltration : "/" }}
                     </div>
                     L
                   </div>
+                  <div class="inline_block" style="flex:1;">
+                    干体重：
+                    <div class="under_line" style="width: 100px;text-align: center">
+                      {{ predialysis.dry_weight ? predialysis.dry_weight : "/" }}
+                    </div>
+                    kg
+                  </div>
                 </div>
 
                 <div class="row" style="padding: 2px 0;line-height:23px;">
@@ -553,7 +571,7 @@
                         {{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "" }}
                       </td>
                       <td v-if="(dialysisOrder && monitor.operate_time <= dialysisOrder.end_time) && ( dialysisOrder && monitor.operate_time >= dialysisOrder.start_time)">
-                        {{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "" }}
+                        {{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "0" }}
                       </td>
                       <td v-if="(prescription.mode_id == 2 || prescription.mode_id == 5 || prescription.mode_id == 12) && ((dialysisOrder && monitor.operate_time <= dialysisOrder.end_time) && (dialysisOrder && monitor.operate_time >= dialysisOrder.start_time))" style="width:50px">
                         {{ monitor.displacement_quantity ? monitor.displacement_quantity : 0 }}
@@ -1342,6 +1360,7 @@ export default {
         this.check = response.data.data.check
         this.xtdate = response.data.data.xtdate
         this.predialysis = response.data.data.PredialysisEvaluation
+        console.log("透前评估",this.predialysis)
         this.predialysis.blood_access_part_opera_name = this.bloodAccessParOperaName(
           this.predialysis.blood_access_part_opera_id
         )

src/xt_pages/dialysis/template/DialysisPrintOrderTen.vue

@@ -35,7 +35,7 @@
             <check-box :checked="receiverTreatmentAccess.condition == 2 ? true : false"></check-box>
           </div>
         </div>
-        
+
         <div class="inline_block" v-if="receiverTreatmentAccess.condition == 1">
           住院：
           <div class="under_line" style="width: 30px;text-align: center;">
@@ -1657,7 +1657,7 @@ export default {
           this.doctor_advices = doctor_advices_1;
           this.doctor_advices_2 = doctor_advices_2;
         }
-        console.log(this.advice_groups);
+         // console.log(this.advice_groups);
       } else {
         this.loading = false;
         this.$message.error("请求数据失败");

src/xt_pages/dialysis/template/dialysisPrintOrderTwelve.vue

@@ -1061,10 +1061,18 @@
             核对护士
             <span style="display: inline-block;width:100px;text-align: left;">
               &nbsp;
-              <span v-if="setAdminUserES(check == null ? 0 : check.modifier) == ''">
+              <span v-if="doctor_advices[0].execution_staff != check.modifier">
+                <span v-if="setAdminUserES(check == null ? 0 : check.modifier) == ''">
                 {{ getAdminUser(check == null ? 0 : check.modifier) }}
+                </span>
+                <img style="height:30px;" :src="setAdminUserES(check == null ? 0 : check.modifier)" alt srcset v-else />
+              </span>
+              <span v-else>
+                <span v-if="setAdminUserES(check == null ? 0 : check.creater) == ''">
+                {{ getAdminUser(check == null ? 0 : check.creater) }}
+                </span>
+                <img style="height:30px;" :src="setAdminUserES(check == null ? 0 : check.creater)" alt srcset v-else />
               </span>
-              <img style="height:20px;" :src="setAdminUserES(check == null ? 0 : check.modifier)" alt srcset v-else />
             </span>
             护士签名
             <span style="display: inline-block;width:100px;text-align: left;">

src/xt_pages/dialysis/template/dialysisPrintOrderTwo.vue

@@ -2,7 +2,7 @@
   <div id="dialysis-print-box-1">
     <div id="dialysis-print-box-1-1" :class="(this.monitors.length > 8 && this.print_length == 8) || (this.monitors.length > 9 && this.print_length == 9) ? 'margin-bottom-900 dialysis-print-order print-template-two print_page_main_content' : 'margin-bottom-50 dialysis-print-order print-template-two print_page_main_content'">
       <div class="order-yy-name">{{ orgname }}</div>
-      <div class="order-title">血液净化专科护理记录单</div>
+      <div class="order-title">血液净化透析治疗记录单</div>
       <div class="row">
         <div class="inline_block">
           科室：
@@ -985,6 +985,13 @@
                   </div>
                   kg
                 </div>
+                <div class="inline_block" v-if="orgid == 9566">
+                  碳酸氢根：
+                  <div class="under_line" style="width: 50px;text-align: left">
+                    {{ prescription.bicarbonate ? prescription.bicarbonate : '' }}
+                  </div>
+                  mmol/L
+                </div>
                 <div class="inline_block" v-if="orgid == 9566">
                   医生签名：
                   <div class="under_line" style="width: 70px;text-align: left">

src/xt_pages/hospitalStation/components/callPrescription.vue

@@ -260,7 +260,8 @@
                 single_dose_unit:prescription.doctor_advice[b].single_dose_unit,
                 prescribing_number_unit:prescription.doctor_advice[b].prescribing_number_unit,
                 medical_insurance_number:prescription.doctor_advice[b].med_list_codg,
-                id:prescription.doctor_advice[b].drug_id
+                id:prescription.doctor_advice[b].drug_id,
+                drug:prescription.doctor_advice[b].drug,
               };
               tempAdvice.push(obj)
 

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -264,12 +264,7 @@
                       <template slot-scope="scope">{{ scope.row.drug_spec }}</template>
                     </el-table-column>
                     <el-table-column label="库存" width="60">
-                      <template slot-scope="scope">{{
-                        stockInCount(scope.row) -
-                        salesReturnCount(scope.row) -
-                        stockOutCount(scope.row) +
-                        cancelStockCount(scope.row)
-                        }}
+                      <template slot-scope="scope">{{scope.row.total }}
                       </template>
                     </el-table-column>
                     <el-table-column label="单价" width="40">
@@ -279,6 +274,10 @@
                 </div>
 
               </el-tab-pane>
+              <!--// stockInCount(scope.row) - -->
+              <!--// salesReturnCount(scope.row) - -->
+              <!--// stockOutCount(scope.row) +-->
+              <!--// cancelStockCount(scope.row)-->
               <!--<el-tab-pane label="医嘱模板" name="2">-->
               <!--<div style="margin-bottom:5px;">-->
               <!--&lt;!&ndash;<el-input style="width:50%;" v-model="input" placeholder=""></el-input>&ndash;&gt;-->
@@ -685,7 +684,10 @@
               obj['id'] = drug_month_prescriptions.advices[a].drug_id;
               // obj['retail_price'] = obj['retail_price'] +  drug_month_prescriptions.advices[a].drug.retail_price
               obj['retail_price'] = parseFloat(drug_month_prescriptions.advices[a].price);
-              count = count + drug_month_prescriptions.advices[a].prescribing_number
+              obj['drug'] = drug_month_prescriptions.advices[a].drug;
+
+
+                      count = count + drug_month_prescriptions.advices[a].prescribing_number
 
             }
           }
@@ -1017,7 +1019,10 @@
                       single_dose_unit: prescription.advices[b].single_dose_unit,
                       prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                       medical_insurance_number: prescription.advices[b].med_list_codg,
-                      id: prescription.advices[b].drug_id
+                      id: prescription.advices[b].drug_id,
+                      drug:prescription.advices[b].drug,
+
+
                     };
                     tempAdvice.push(obj)
                   }
@@ -1132,7 +1137,9 @@
                       single_dose_unit: prescription.advices[b].single_dose_unit,
                       prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                       medical_insurance_number: prescription.advices[b].med_list_codg,
-                      id: prescription.advices[b].drug_id
+                      id: prescription.advices[b].drug_id,
+                      drug:prescription.advices[b].drug,
+
                     };
                     tempAdvice.push(obj)
                   }
@@ -2295,8 +2302,6 @@
       },
 
       comfirm() {
-        console.log("222222222222",this.curPrescriptions);
-
 
         if (this.curPrescriptions.order_status == 2) {
           this.$message.error('该处方已经结算，无法继续添加药品或者项目');
@@ -2415,7 +2420,8 @@
                   prescribing_number: temp[b].prescribing_number,
                   single_dose_unit: temp[b].min_unit,
                   prescribing_number_unit: temp[b].max_unit,
-                  medical_insurance_number: temp[b].medical_insurance_number
+                  medical_insurance_number: temp[b].medical_insurance_number,
+                  drug: temp[b],
 
                 };
 
@@ -2480,7 +2486,8 @@
         this.preDrugs = [];
         this.teamList = []
 
-      }, changeAllGoodInfoTableDataTwo(row) {
+      },
+      changeAllGoodInfoTableDataTwo(row) {
         this.teamList = row
       },
       selectChange(row) {

src/xt_pages/hospitalStation/components/nextOrLastPrescription.vue

@@ -317,7 +317,8 @@
                 single_dose_unit:prescription.doctor_advice[b].single_dose_unit,
                 prescribing_number_unit:prescription.doctor_advice[b].prescribing_number_unit,
                 medical_insurance_number:prescription.doctor_advice[b].med_list_codg,
-                id:prescription.doctor_advice[b].drug_id
+                id:prescription.doctor_advice[b].drug_id,
+                drug:prescription.doctor_advice[b].drug,
               };
               tempAdvice.push(obj)
 

src/xt_pages/hospitalStation/doctorDesk.vue

@@ -463,6 +463,8 @@
               obj['id'] = drug_month_prescriptions.advices[a].drug_id;
               // obj['retail_price'] = obj['retail_price'] +  drug_month_prescriptions.advices[a].drug.retail_price
               obj['retail_price'] = parseFloat(drug_month_prescriptions.advices[a].price);
+              obj['drug'] = drug_month_prescriptions.advices[a].drug
+
               count = count + drug_month_prescriptions.advices[a].prescribing_number
 
             }
@@ -873,7 +875,8 @@
                     single_dose_unit: prescription.advices[b].single_dose_unit,
                     prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                     medical_insurance_number: prescription.advices[b].med_list_codg,
-                    id: prescription.advices[b].drug_id
+                    id: prescription.advices[b].drug_id,
+                    drug:prescription.advices[b].drug,
                   };
                   tempAdvice.push(obj)
                 }
@@ -1078,7 +1081,8 @@
                           single_dose_unit: prescription.advices[b].single_dose_unit,
                           prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                           medical_insurance_number: prescription.advices[b].med_list_codg,
-                          id: prescription.advices[b].drug_id
+                          id: prescription.advices[b].drug_id,
+                          drug:prescription.advices[b].drug,
                         };
                         tempAdvice.push(obj)
                       }
@@ -1258,7 +1262,9 @@
                           single_dose_unit: prescription.advices[b].single_dose_unit,
                           prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                           medical_insurance_number: prescription.advices[b].med_list_codg,
-                          id: prescription.advices[b].drug_id
+                          id: prescription.advices[b].drug_id,
+                          drug:prescription.advices[b].drug,
+
                         };
                         tempAdvice.push(obj)
                       }
@@ -1442,7 +1448,9 @@
                           single_dose_unit: prescription.advices[b].single_dose_unit,
                           prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                           medical_insurance_number: prescription.advices[b].med_list_codg,
-                          id: prescription.advices[b].drug_id
+                          id: prescription.advices[b].drug_id,
+                          drug:prescription.advices[b].drug,
+
                         };
                         tempAdvice.push(obj)
                       }
@@ -1677,7 +1685,9 @@
                         single_dose_unit: prescription.advices[b].single_dose_unit,
                         prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                         medical_insurance_number: prescription.advices[b].med_list_codg,
-                        id: prescription.advices[b].drug_id
+                        id: prescription.advices[b].drug_id,
+                        drug:prescription.advices[b].drug,
+
                       };
                       tempAdvice.push(obj)
                     }
@@ -1865,7 +1875,9 @@
                       single_dose_unit: prescription.advices[b].single_dose_unit,
                       prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                       medical_insurance_number: prescription.advices[b].med_list_codg,
-                      id: prescription.advices[b].drug_id
+                      id: prescription.advices[b].drug_id,
+                      drug:prescription.advices[b].drug,
+
                     };
                     tempAdvice.push(obj)
                   }

src/xt_pages/outpatientCharges/components/prescriptionTable.vue

@@ -93,9 +93,7 @@
         <template slot-scope="scope">
           <div style="display:flex;">
             <!--<el-input v-model="scope.row.total" placeholder="" readonly></el-input>-->
-            {{scope.row.total}}
-
-            <div>{{scope.row.unit}}</div>
+            {{scope.row.total}} {{scope.row.unit}}
 
           </div>
         </template>

src/xt_pages/outpatientCharges/newStatementPrint.vue

@@ -13,8 +13,7 @@
     </template>
 
     <div class='dialysisPage' style="padding-top:40px;">
-      <printOne v-if="org_id != 9990" :info="info" :p_admin="p_admin" :charge_admin="charge_admin"></printOne>
-      <printTwo v-if="org_id == 9990" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></printTwo>
+      <printOne :info="info" :p_admin="p_admin" :charge_admin="charge_admin"></printOne>
     </div>
   </div>
 </template>
@@ -31,14 +30,12 @@
   import BreadCrumb from "@/xt_pages/components/bread-crumb";
   import print from "print-js";
   import printOne from "./statementTemplate/printOne"
-  import printTwo from "./statementTemplate/printTwo"
   import { getAllDoctorList,getAllHisPatientList,getPrescriptionPrint } from "@/api/project/project"
   export default {
     name: "newStatementPrint",
     components: {
       BreadCrumb,
-      printOne,
-      printTwo
+      printOne
     },
     props:{
       paramsObj:Object
@@ -62,8 +59,6 @@
         info:null,
         p_admin:{},
         charge_admin:{},
-        org_id:'',
-        order_infos:null
       };
     },
     methods:{
@@ -71,26 +66,14 @@
         var ptime = Math.round(new Date().getTime() / 1000);
         this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
 
-        if(this.org_id != 9990){
-          const style =
+        const style =
           '@media print {.statementTitle{font-size: 28px;text-align: center;font-weight: bold;margin-bottom: 10px;}.statementTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 40px;font-size: 16px;border-color: #000;}}';
-          printJS({
-            printable: "statement-print",
-            type: "html",
-            style: style,
-            scanStyles: false
-          });
-        }else {
-          const style =
-          '@media print {#statement-print{font-size:12px;width:600px;margin:0 auto;}.statementTitle{font-size: 22px;text-align: center;margin-bottom: 10px;}.statementTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 40px;font-size: 16px;border-color: #000;}}';
-          printJS({
-            printable: "statement-print",
-            type: "html",
-            style: style,
-            scanStyles: false
-          });
-        }
-
+        printJS({
+          printable: "statement-print",
+          type: "html",
+          style: style,
+          scanStyles: false
+        });
 
         // if (this.org_template_info.template_id == 1) {
         //   printJS({
@@ -164,6 +147,8 @@
         //       console.log("doctorporject",doctorPorject)
         //     }
         // })
+      },  getTimes(time) {
+        return uParseTime(time, '{y}-{m}-{d}')
       },
       searchAction(){
 
@@ -190,8 +175,6 @@
                 that.info = response.data.data.info;
                 that.p_admin = response.data.data.printor_admin;
                 that.charge_admin = response.data.data.charge_admin;
-                that.order_infos = response.data.data;
-
 
 
                 that.info['p_admin'] =  that.p_admin;
@@ -203,8 +186,6 @@
                 that.info['diagnosis'] =  response.data.data.diagnosis;
 
 
-                console.log(that.info);
-
                 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;
@@ -242,7 +223,11 @@
                 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;
-                console.log(this.info)
+
+                if(that.paramsObj.settle_type != 1){
+                  that.info.begndate = that.getTimes(that.paramsObj.start_time)
+                  that.info.enddate = that.getTimes(that.paramsObj.end_time)
+                }
               }
             })
             .catch(function (error) {
@@ -254,9 +239,7 @@
     },
 
     created() {
-      this.org_id = this.$store.getters.xt_user.org_id;
       this.getInfo(this.paramsObj.order_id)
-
     },
     watch:{
       paramsObj:{//深度监听，可监听到对象、数组的变化

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -278,168 +278,168 @@ export default {
   letter-spacing: 5px;
 }
 
-.dialysis-print-order .order-title {
-  margin: auto;
-  font-weight: 600;
-  text-align: center;
-  font-size: 22px;
-  padding: 10px;
-}
+  .dialysis-print-order .order-title {
+    margin: auto;
+    font-weight: 600;
+    text-align: center;
+    font-size: 22px;
+    padding: 10px;
+  }
 
-.dialysis-print-order .table-box {
-  width: 100%;
-  line-height: 23px;
-  font-size: 14px;
-}
+  .dialysis-print-order .table-box {
+    width: 100%;
+    line-height: 23px;
+    font-size: 14px;
+  }
 
-.dialysis-print-order .print-table {
-  width: 100%;
-  text-align: center;
-  border-collapse: collapse;
-  line-height: 40px;
-  font-size: 14px;
-  border-color: #000;
-}
+  .dialysis-print-order .print-table {
+    width: 100%;
+    text-align: center;
+    border-collapse: collapse;
+    line-height: 40px;
+    font-size: 14px;
+    border-color: #000;
+  }
 
-.dialysis-print-order .print-table-no {
-  width: 100%;
-  text-align: center;
-  border-collapse: collapse;
-  font-size: 14px;
-}
+  .dialysis-print-order .print-table-no {
+    width: 100%;
+    text-align: center;
+    border-collapse: collapse;
+    font-size: 14px;
+  }
 
-.dialysis-print-order .under-line {
-  border-bottom: 1px solid #999;
-  width: 95%;
-  text-align: center;
-  margin-left: 2px;
-}
+  .dialysis-print-order .under-line {
+    border-bottom: 1px solid #999;
+    width: 95%;
+    text-align: center;
+    margin-left: 2px;
+  }
 
-.dialysis-print-order .title-box {
-  text-align: center;
-  font-size: 16px;
-}
+  .dialysis-print-order .title-box {
+    text-align: center;
+    font-size: 16px;
+  }
 
-.dialysis-print-order .radio-lebel-box {
-  font-weight: 400;
-  cursor: pointer;
-}
+  .dialysis-print-order .radio-lebel-box {
+    font-weight: 400;
+    cursor: pointer;
+  }
 
-.dialysis-print-order .radio-no {
-  opacity: 0;
-  outline: none;
-  position: absolute;
-  margin: 0;
-  width: 0;
-  height: 0;
-  z-index: -1;
-}
+  .dialysis-print-order .radio-no {
+    opacity: 0;
+    outline: none;
+    position: absolute;
+    margin: 0;
+    width: 0;
+    height: 0;
+    z-index: -1;
+  }
 
-.dialysis-print-order .radio-inner {
-  white-space: nowrap;
-  cursor: pointer;
-  outline: none;
-  display: inline-block;
-  line-height: 1;
-  position: relative;
-  vertical-align: middle;
-}
+  .dialysis-print-order .radio-inner {
+    white-space: nowrap;
+    cursor: pointer;
+    outline: none;
+    display: inline-block;
+    line-height: 1;
+    position: relative;
+    vertical-align: middle;
+  }
 
-.dialysis-print-order .radio-fang {
-  display: inline-block;
-  position: relative;
-  border: 1px solid #000;
-  box-sizing: border-box;
-  width: 14px;
-  height: 14px;
-  background-color: #fff;
-  z-index: 1;
-  transition: border-color 0.25s cubic-bezier(0.71, -0.46, 0.29, 1.46),
+  .dialysis-print-order .radio-fang {
+    display: inline-block;
+    position: relative;
+    border: 1px solid #000;
+    box-sizing: border-box;
+    width: 14px;
+    height: 14px;
+    background-color: #fff;
+    z-index: 1;
+    transition: border-color 0.25s cubic-bezier(0.71, -0.46, 0.29, 1.46),
     background-color 0.25s cubic-bezier(0.71, -0.46, 0.29, 1.46);
-}
+  }
 
-.dialysis-print-order .is-checked-radio::after {
-  content: "√";
-  font-size: 15px;
-}
+  .dialysis-print-order .is-checked-radio::after {
+    content: "√";
+    font-size: 15px;
+  }
 
-.dialysis-print-order .print-table-no tr td {
-  padding: 8px 5px;
-  line-height: 25px;
-}
+  .dialysis-print-order .print-table-no tr td {
+    padding: 8px 5px;
+    line-height: 25px;
+  }
 
-.dialysis-print-order .print-table tr td {
-  padding: 1px 1px;
-  /*line-height: 25px;*/
-}
+  .dialysis-print-order .print-table tr td {
+    padding: 1px 1px;
+    /*line-height: 25px;*/
+  }
 
-.es-img {
-  height: 30px;
-}
+  .es-img {
+    height: 30px;
+  }
 
-.advice-name {
-  text-align: left;
-}
+  .advice-name {
+    text-align: left;
+  }
 
-.advice-children {
-  display: flex;
-}
+  .advice-children {
+    display: flex;
+  }
 
-.title-box-pro {
-  border: 0 #fff;
-  line-height: 25px;
-  height: 25px;
-  text-align: left;
-  padding-left: 10px !important;
-}
-.title-box-pro-tr {
-  border: 0 #fff;
-}
-.text-align-left {
-  text-align: left !important;
-  padding-left: 10px !important;
-  font-size: 14px !important;
-  line-height: 25px;
-}
-.print-table-tr-new td {
-  line-height: 20px !important;
-}
-.border-top-solid {
-  border: solid 1px #000;
-}
-.print-template-two tr {
-  line-height: 30px;
-}
+  .title-box-pro {
+    border: 0 #fff;
+    line-height: 25px;
+    height: 25px;
+    text-align: left;
+    padding-left: 10px !important;
+  }
+  .title-box-pro-tr {
+    border: 0 #fff;
+  }
+  .text-align-left {
+    text-align: left !important;
+    padding-left: 10px !important;
+    font-size: 14px !important;
+    line-height: 25px;
+  }
+  .print-table-tr-new td {
+    line-height: 20px !important;
+  }
+  .border-top-solid {
+    border: solid 1px #000;
+  }
+  .print-template-two tr {
+    line-height: 30px;
+  }
 
-.table-box1 {
-  border: 1px solid #000;
-  width: 100%;
-  line-height: 30px;
-  font-size: 14px;
-  border-collapse: collapse;
-}
-.table-box1 tr {
-  border-bottom: 1px solid #000;
-}
+  .table-box1 {
+    border: 1px solid #000;
+    width: 100%;
+    line-height: 30px;
+    font-size: 14px;
+    border-collapse: collapse;
+  }
+  .table-box1 tr {
+    border-bottom: 1px solid #000;
+  }
 </style>
 
 <style lang="scss">
 
-.newContainer{
+  .newContainer{
   .dialysisPage::-webkit-scrollbar {
     height: 15px;
   }
 
   .el-date-editor{
-    .el-input__inner{
-      padding-right:0px;
-    }
+  .el-input__inner{
+    padding-right:0px;
+  }
   }
   .el-table td, .el-table th{
     text-align: center;
   }
-}
-.newContainer::-webkit-scrollbar{
-  height: 15px !important;
-}
+  }
+  .newContainer::-webkit-scrollbar{
+    height: 15px !important;
+  }
 </style>

src/xt_pages/outpatientCharges/summary.vue

@@ -65,34 +65,34 @@
           type="index"
         >
         </el-table-column>
-        <el-table-column align="center" prop="name" label="就诊号">
+        <el-table-column align="center" width="100" prop="name" label="就诊号">
           <template slot-scope="scope">{{ scope.row.his_patient.number }}</template>
         </el-table-column>
-        <el-table-column align="center" prop="name" label="患者名字">
+        <el-table-column align="center" width="90" prop="name" label="患者名字">
           <template slot-scope="scope">{{ scope.row.patient.name }}</template>
         </el-table-column>
         <!--<el-table-column align="center" prop="name" label="患者类型">-->
         <!--<template slot-scope="scope"></template>-->
         <!--</el-table-column>-->
 
-        <el-table-column align="center" prop="name" label="应收金额">
+        <el-table-column align="center" width="90" prop="name" label="应收金额">
           <template slot-scope="scope">{{scope.row.medfee_sumamt}}</template>
         </el-table-column>
-        <el-table-column align="center" prop="name" label="实收金额">
+        <el-table-column align="center" width="90" prop="name" label="实收金额">
           <template slot-scope="scope">{{scope.row.reality_price}}</template>
         </el-table-column>
-        <el-table-column align="center" prop="name" label="科室">
+        <el-table-column align="center" width="90" prop="name" label="科室">
           <template slot-scope="scope">{{scope.row.department_name}}</template>
         </el-table-column>
-        <el-table-column align="center" prop="name" label="收费日期">
+        <el-table-column align="center" width="100" prop="name" label="收费日期">
           <template slot-scope="scope">
             {{scope.row.setl_time?scope.row.setl_time:getTimes(scope.row.settle_accounts_date)}}
           </template>
         </el-table-column>
-        <el-table-column align="center" prop="name" label="收费员">
+        <el-table-column align="center" width="90" prop="name" label="收费员">
           <template slot-scope="scope">{{ getName(scope.row.creator) }}</template>
         </el-table-column>
-        <el-table-column align="center" prop="name" label="状态">
+        <el-table-column align="center" width="80" prop="name" label="状态">
           <template slot-scope="scope">
             <div v-if="scope.row.order_status == 1">待结算</div>
             <div v-if="scope.row.order_status == 2">已结算</div>
@@ -371,7 +371,10 @@
         } else {
           this.statementVisible = true;
           let obj = {
-            order_id: row.id
+            order_id: row.id,
+            settle_type:row.settle_type,
+            start_time:row.settle_start_time,
+            end_time:row.settle_end_time,
           };
           this.orderObj = obj
         }

src/xt_pages/outpatientDoctorStation/components/callPrescription.vue

@@ -260,7 +260,9 @@
                 single_dose_unit:prescription.doctor_advice[b].single_dose_unit,
                 prescribing_number_unit:prescription.doctor_advice[b].prescribing_number_unit,
                 medical_insurance_number:prescription.doctor_advice[b].med_list_codg,
-                id:prescription.doctor_advice[b].drug_id
+                id:prescription.doctor_advice[b].drug_id,
+                drug:prescription.doctor_advice[b].drug,
+
               };
               tempAdvice.push(obj)
 

src/xt_pages/outpatientDoctorStation/components/dialysisIndex.vue

@@ -7,143 +7,146 @@
       element-loading-text="拼命加载中"
       element-loading-spinner="el-icon-loading"
       element-loading-background="rgba(0, 0, 0, 0.8)"
+      v-if="dialysisShow"
     >
-    <div style="padding-top: 56px;width:100%;">
-
-      <nav-igation
-        ref="nav"
-        title="弹窗导航"
-        @advice="adviceFunc"
-        :patient="patient"
-        :schedual="schedual"
-        :prescription="prescription"
-        :solution="solution"
-        :receiver_treatment_access="receiver_treatment_access"
-        :predialysis_evaluation="predialysis_evaluation"
-        :doctor_advices="doctor_advices"
-        :double_check="double_check"
-        :assessment_after_dislysis="assessment_after_dislysis"
-        :treatment_summary="treatment_summary"
-        :monitor_records="monitor_records"
-        :dialysis_order="dialysis_order"
-        :admin_users="admin_users"
-        :devices="devices"
-        :device_numbers="device_numbers"
-        :admin_user_map="admin_user_map"
-        :device_map="device_map"
-        :device_number_map="device_number_map"
-        :niprocart_info="niprocart_info"
-        :jms_info="jms_info"
-        :fistula_needle_set_info="fistula_needle_set_info"
-        :fistula_needle_set_16_info="fistula_needle_set_16_info"
-        :hemoperfusion_info="hemoperfusion_info"
-        :dialyser_sterilised_info="dialyser_sterilised_info"
-        :filtryzer_info="filtryzer_info"
-        :dialyzers_info="dialyzers_info"
-        :injector_info="injector_info"
-        :bloodlines_info="bloodlines_info"
-        :tubingHemodialysis_info="tubingHemodialysis_info"
-        :safe_package_info="safe_package_info"
-        :aliquid_info="aliquid_info"
-        :config="config"
-        :longAdvices="longAdvices"
-        :waitUploadAdvices="waitUploadAdvices"
-        :is_open="is_open"
-        :last_predialysis_evaluation="lastPredialysisEvaluation"
-        :last_monitor_record="lastMonitorRecord"
-        :last_assessment_after_dislysis="lastAssessmentAfterDislysis"
-        :last_dialysis_prescribe="lastDialysisPrescribe"
-        :last_dryWeight_dislysis="lastDryWeightDislysis"
-        :special_premission="headNurses"
-        @assessmentAfterDislysis="assessmentAfterDislysisFunc"
-        :system_prescribe="system_prescribe"
-        :his_is_open="his_is_open"
-        :lastAssessment="lastAssessment"
-        :stockType="stockType"
-      >
-      </nav-igation>
-
-
-
-      <basic-infor
-        :patient="patient"
-        :device_number="schedual.id == 0 ? '' : schedual.device_number.number"
-        :steps="steps"
-        title="基本信息"
-      ></basic-infor>
-
-      <dialysis-prescription
-        :prescription="prescription"
-        :solution="solution"
-        :device_map="device_map"
-        :preparestock="preparestock"
-        title="透析处方"
-      ></dialysis-prescription>
-
-
-
-    <!-- <past-data class="往期数据"></past-data> -->
-      <div style="height: 20px;background-color: #f6f8f9"></div>
-      <accepts-assessment
-        :record="receiver_treatment_access"
-        title="接诊评估"
-      ></accepts-assessment>
-
-      <assessment-before
-        :record="predialysis_evaluation"
-        ref="assessment_before"
-        title="透前评估"
-      ></assessment-before>
-
-      <stat-order
-        ref="stat_order"
-        :advices="doctor_advices"
-        :doctor_map="admin_user_map"
-        title="临时医嘱"
-      ></stat-order>
-
-      <double-check
-        ref="double_check"
-        :record="double_check"
-        :admin_map="admin_user_map"
-        title="双人核对 "
-      ></double-check>
-
-      <dialysis-computer
-        ref="dialysis_computer"
-        :record="dialysis_order"
-        :admin_map="admin_user_map"
-        :device_number_map="device_number_map"
-        title="透析上机 "
-      ></dialysis-computer>
-
-      <dialysis-monitoring
-        ref="monitoring"
-        :monitores="monitor_records"
-        title="透析监测"
-      ></dialysis-monitoring>
-
-
-      <dialysis-off
-        ref="dialysis_off"
-        :record="dialysis_order"
-        :admin_map="admin_user_map"
-        title="透析下机 "
-      ></dialysis-off>
-
-      <assessment-after
-        ref="assessment_after"
-        :record="assessment_after_dislysis"
-        title="透后评估"
-      ></assessment-after>
-
-      <treatment-of
-        ref="treatment_of"
-        :record="treatment_summary"
-        title="治疗小结"
-      ></treatment-of>
+      <div style="padding-top: 56px;width:100%;" >
+
+        <nav-igation
+          ref="nav"
+          title="弹窗导航"
+          @advice="adviceFunc"
+          :patient="patient"
+          :schedual="schedual"
+          :prescription="prescription"
+          :solution="solution"
+          :receiver_treatment_access="receiver_treatment_access"
+          :predialysis_evaluation="predialysis_evaluation"
+          :doctor_advices="doctor_advices"
+          :double_check="double_check"
+          :assessment_after_dislysis="assessment_after_dislysis"
+          :treatment_summary="treatment_summary"
+          :monitor_records="monitor_records"
+          :dialysis_order="dialysis_order"
+          :admin_users="admin_users"
+          :devices="devices"
+          :device_numbers="device_numbers"
+          :admin_user_map="admin_user_map"
+          :device_map="device_map"
+          :device_number_map="device_number_map"
+          :niprocart_info="niprocart_info"
+          :jms_info="jms_info"
+          :fistula_needle_set_info="fistula_needle_set_info"
+          :fistula_needle_set_16_info="fistula_needle_set_16_info"
+          :hemoperfusion_info="hemoperfusion_info"
+          :dialyser_sterilised_info="dialyser_sterilised_info"
+          :filtryzer_info="filtryzer_info"
+          :dialyzers_info="dialyzers_info"
+          :injector_info="injector_info"
+          :bloodlines_info="bloodlines_info"
+          :tubingHemodialysis_info="tubingHemodialysis_info"
+          :safe_package_info="safe_package_info"
+          :aliquid_info="aliquid_info"
+          :config="config"
+          :longAdvices="longAdvices"
+          :waitUploadAdvices="waitUploadAdvices"
+          :is_open="is_open"
+          :last_predialysis_evaluation="lastPredialysisEvaluation"
+          :last_monitor_record="lastMonitorRecord"
+          :last_assessment_after_dislysis="lastAssessmentAfterDislysis"
+          :last_dialysis_prescribe="lastDialysisPrescribe"
+          :last_dryWeight_dislysis="lastDryWeightDislysis"
+          :special_premission="headNurses"
+          @assessmentAfterDislysis="assessmentAfterDislysisFunc"
+          :system_prescribe="system_prescribe"
+          :his_is_open="his_is_open"
+          :lastAssessment="lastAssessment"
+          :stockType="stockType"
+        >
+        </nav-igation>
+
+
+
+        <basic-infor
+          :patient="patient"
+          :device_number="schedual.id == 0 ? '' : schedual.device_number.number"
+          :steps="steps"
+          title="基本信息"
+        ></basic-infor>
+
+        <dialysis-prescription
+          :prescription="prescription"
+          :solution="solution"
+          :device_map="device_map"
+          :preparestock="preparestock"
+          title="透析处方"
+        ></dialysis-prescription>
+
+
+
+      <!-- <past-data class="往期数据"></past-data> -->
+        <div style="height: 20px;background-color: #f6f8f9"></div>
+        <accepts-assessment
+          :record="receiver_treatment_access"
+          title="接诊评估"
+        ></accepts-assessment>
+
+        <assessment-before
+          :record="predialysis_evaluation"
+          ref="assessment_before"
+          title="透前评估"
+        ></assessment-before>
+
+        <stat-order
+          ref="stat_order"
+          :advices="doctor_advices"
+          :doctor_map="admin_user_map"
+          title="临时医嘱"
+        ></stat-order>
+
+        <double-check
+          ref="double_check"
+          :record="double_check"
+          :admin_map="admin_user_map"
+          title="双人核对 "
+        ></double-check>
+
+        <dialysis-computer
+          ref="dialysis_computer"
+          :record="dialysis_order"
+          :admin_map="admin_user_map"
+          :device_number_map="device_number_map"
+          title="透析上机 "
+        ></dialysis-computer>
+
+        <dialysis-monitoring
+          ref="monitoring"
+          :monitores="monitor_records"
+          title="透析监测"
+        ></dialysis-monitoring>
+
+
+        <dialysis-off
+          ref="dialysis_off"
+          :record="dialysis_order"
+          :admin_map="admin_user_map"
+          title="透析下机 "
+        ></dialysis-off>
+
+        <assessment-after
+          ref="assessment_after"
+          :record="assessment_after_dislysis"
+          title="透后评估"
+        ></assessment-after>
+
+        <treatment-of
+          ref="treatment_of"
+          :record="treatment_summary"
+          title="治疗小结"
+        ></treatment-of>
       </div>
+      
     </div>
+    <div style="padding-top: 56px;width:100%;text-align:center;font-size:22px;color:red;" v-else>该患者未排班，请先去排班</div>
   </div>
 </template>
 
@@ -194,7 +197,8 @@ export default {
   },
   props:{
     record_date:String,
-    patientid:String
+    patientid:Number,
+    dialysisShow:Boolean
   },
   data() {
     return {
@@ -304,7 +308,8 @@ export default {
 
       queueConfig:{},
       stockType:[],
-      preparestock:[]
+      preparestock:[],
+      dialysisShow:false
     }
   },
   created() {
@@ -312,22 +317,73 @@ export default {
     var date = this.record_date
     this.patient_id = patient_id
     this.date = date
+    var ymd = parseTime(new Date(), '{y}-{m}-{d}')
+    getDialysisSchedules(ymd).then(rs => {
+      var resp = rs.data
+      if (resp.state == 1) {
+        var schedules = resp.data.schedules
+        let arr = []
+        schedules.map(item => {
+          if(item.patient_id == this.patient_id){
+            arr.push(item.patient_id)
+          }
+        })
+        if(arr.length > 0){
+          this.dialysisShow = true
+        }else{
+          this.dialysisShow = false
+        }
+        console.log('this.dialysisShowthis.dialysisShowthis.dialysisShow',this.dialysisShow)
+      } else {
+        this.$message.error(resp.msg)
+      }
+    })
 
     
 
   },
   mounted() {
-    this.getScheduleDetail()
-    this.getLongAdvice()
+    if(this.dialysisShow == true){
+      
+      this.getScheduleDetail()
+      this.getLongAdvice()
+    }
+    
   },
   watch:{
         patientid:{
             handler(newVal){
+              var ymd = parseTime(new Date(), '{y}-{m}-{d}')
+              getDialysisSchedules(ymd).then(rs => {
+                var resp = rs.data
+                if (resp.state == 1) {
+                  var schedules = resp.data.schedules
+                  let arr = []
+                  schedules.map(item => {
+                    if(item.patient_id == this.patient_id){
+                      arr.push(item.patient_id)
+                    }
+                  })
+                  if(arr.length > 0){
+                    this.dialysisShow = true
+                  }else{
+                    this.dialysisShow = false
+                  }
+                  console.log('this.dialysisShowthis.dialysisShowthis.dialysisShow',this.dialysisShow)
+                } else {
+                  this.$message.error(resp.msg)
+                }
+              })
+              console.log('执行执行执行执行执行执行',this.dialysisShow)
+              if(this.dialysisShow == true){
+                console.log('执行')
                 this.patient_id = newVal
                 this.getScheduleDetail()
                 this.getLongAdvice()
-            }
-        }
+              }
+            },
+            deep:true
+        },
   },
   computed: {
     websocket() {
@@ -444,14 +500,6 @@ export default {
       // return schedules
     }
   },
-  beforeDestroy(){
-
-    let unObj = {
-      cmd: "queue/unjoin",
-      data: {type:3},
-    };
-    this.websocketSend(unObj)
-  },
   methods: {
     adviceFunc() {
       this.getScheduleDetail()
@@ -521,12 +569,13 @@ export default {
       }
     },
     getScheduleDetail: function() {
+      
       this.loading = true
     //   var dateStr = parseTime(this.date, '{y}-{m}-{d}')
-      if(this.$route.query.showView == true){
-        this.loading = false
-        return
-      }
+      // if(this.$route.query.showView == true){
+      //   this.loading = false
+      //   return
+      // }
         console.log('this.patient_id',this.patient_id)
         console.log('this.date',this.date)
       this.doctor_advices = []
@@ -536,7 +585,7 @@ export default {
         if (resp.state == 1) {
           var patient = resp.data.patient // 患者信息
           var schedual = resp.data.schedual // 患者排班信息
-          console.log("排班22222222222",schedual)
+         
           var prescription = resp.data.prescription // 透析处方
           if (prescription != null) {
             if (prescription.body_fluid == -2) {
@@ -545,7 +594,7 @@ export default {
           }
 
           var solution = resp.data.solution // 透析方案
-          console.log("透析方案22223333333333",solution)
+         
           var receiver_treatment_access = resp.data.receiver_treatment_access // 接诊评估
 
           var predialysis_evaluation = resp.data.predialysis_evaluation // 透前评估
@@ -739,7 +788,9 @@ export default {
           }
           this.device_number_map = device_number_map
         } else {
-          this.$message.error(resp.msg)
+         // this.$message.error(resp.msg)
+          console.log("报错提示")
+          this.$message.error("该患者今日未排班,无法使用此模块,请先排班!")
         }
 
         if (this.lastDialysisPrescribe != null) {

src/xt_pages/outpatientDoctorStation/components/nextOrLastPrescription.vue

@@ -317,7 +317,8 @@
                 single_dose_unit:prescription.doctor_advice[b].single_dose_unit,
                 prescribing_number_unit:prescription.doctor_advice[b].prescribing_number_unit,
                 medical_insurance_number:prescription.doctor_advice[b].med_list_codg,
-                id:prescription.doctor_advice[b].drug_id
+                id:prescription.doctor_advice[b].drug_id,
+                drug:prescription.doctor_advice[b].drug,
               };
               tempAdvice.push(obj)
 

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -7,11 +7,15 @@
         <template slot-scope="scope"><span :title="scope.row.drug_name">{{ scope.row.drug_name }}</span></template>
       </el-table-column>
 
-      <el-table-column align="center" prop="single_dose" width="90" label="单次用量">
+      <el-table-column align="center" prop="single_dose" width="120" label="单次用量">
         <template slot-scope="scope">
           <div style="display:flex;align-items:center;">
-            <el-input v-model="scope.row.single_dose" @input="getSingleDose(scope)" style="width:65%;"></el-input>
-            <div>{{scope.row.single_dose_unit}}</div>
+            <el-input v-model="scope.row.single_dose" @input="getAllChange(scope)" style="width:50%;"></el-input>
+            <!-- <div>{{scope.row.single_dose_unit}}</div> -->
+            <el-select v-model="scope.row.single_dose_unit" placeholder="请选择" style="width:50%;" @change="getAllChange(scope)">
+              <el-option :label="scope.row.drug.min_unit" :value="scope.row.drug.min_unit"></el-option>
+              <el-option :label="scope.row.drug.dose_unit" :value="scope.row.drug.dose_unit"></el-option>
+            </el-select>
           </div>
         </template>
       </el-table-column>
@@ -29,7 +33,7 @@
       </el-table-column>
       <el-table-column align="center" prop="execution_frequency" width="100" label="频率">
         <template slot-scope="scope">
-          <el-select v-model="scope.row.execution_frequency" placehold er="请选择">
+          <el-select v-model="scope.row.execution_frequency" placeholder="请选择" @change="getAllChange(scope)">
             <el-option
               v-for="item,index in efs"
               :key="index"
@@ -44,16 +48,20 @@
       <el-table-column align="center" prop="day" width="70" label="天数">
         <template slot-scope="scope">
           <div style="display:flex;align-items:center;">
-          <el-input v-model="scope.row.day" @input="getDay(scope)" placeholder=""></el-input>{{'天'}}
+          <el-input v-model="scope.row.day" @input="getAllChange(scope)" placeholder=""></el-input>{{'天'}}
           </div>
         </template>
       </el-table-column>
 
-      <el-table-column align="center" prop="prescribing_number" width="80" label="总量">
+      <el-table-column align="center" prop="prescribing_number" width="120" label="总量">
         <template slot-scope="scope">
           <div style="display:flex;align-items:center;">
-            <el-input v-model="scope.row.prescribing_number" style="width:60%" placeholder=""></el-input>
-            <div> {{scope.row.prescribing_number_unit}}</div>
+            <el-input v-model="scope.row.prescribing_number" @input="changePrescribingNumber(scope)" style="width:50%" placeholder=""></el-input>
+            <!-- <div> {{scope.row.prescribing_number_unit}}</div> -->
+            <el-select v-model="scope.row.prescribing_number_unit" placeholder="请选择" style="width:50%;" @change="getAllChange(scope)">
+              <el-option :label="scope.row.drug.min_unit" :value="scope.row.drug.min_unit"></el-option>
+              <el-option :label="scope.row.drug.max_unit" :value="scope.row.drug.max_unit"></el-option>
+            </el-select>
           </div>
         </template>
       </el-table-column>
@@ -381,36 +389,111 @@
           .catch(() => {});
 
       },
-      getSingleDose(scope){
-        this.prescription.advices[scope.$index].prescribing_number = scope.row.single_dose * scope.row.day
+      getAllChange(scope){
+        if(scope.row.drug.min_unit == scope.row.single_dose_unit){
+          if(scope.row.prescribing_number_unit == scope.row.drug.min_unit){
+            console.log(1)
+            scope.row.prescribing_number = scope.row.single_dose * this.getNum(scope.row.execution_frequency) * scope.row.day
+          }else{
+            console.log(12)
+            scope.row.prescribing_number = Math.ceil((scope.row.single_dose * this.getNum(scope.row.execution_frequency)) * scope.row.day / scope.row.drug.min_number) 
+          }
+        }else{
+          if(scope.row.prescribing_number_unit == scope.row.drug.min_unit){
+            console.log(123)
+            scope.row.prescribing_number = Math.ceil((scope.row.single_dose * this.getNum(scope.row.execution_frequency) * scope.row.day) / scope.row.drug.dose) 
+          }else{
+            console.log(1234)
+            scope.row.prescribing_number = Math.ceil((scope.row.single_dose * this.getNum(scope.row.execution_frequency) * scope.row.day) / scope.row.drug.dose / scope.row.drug.min_number)
+          }
+        }
+        if(scope.row.prescribing_number == 0){
+          scope.row.prescribing_number = 1
+        }
+        if(scope.row.prescribing_number_unit == scope.row.drug.min_unit){
+          scope.row.retail_price = scope.row.drug.min_price * scope.row.prescribing_number
+          if(scope.row.prescribing_number > scope.row.drug.total){
+            this.$message.error(scope.row.drug_name + '库存不足')
+          }
+        }else{
+          if((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.total){
+            this.$message.error(scope.row.drug_name + '库存不足')
+          }
+          scope.row.retail_price = scope.row.drug.retail_price * scope.row.prescribing_number
+        }
+        
       },
-      getDay(scope){
-        this.prescription.advices[scope.$index].prescribing_number = scope.row.single_dose * scope.row.day
+      changePrescribingNumber(scope){
+        if(scope.row.prescribing_number_unit == scope.row.drug.min_unit){
+          if(parseInt(scope.row.prescribing_number) > scope.row.drug.total){
+            this.$message.error(scope.row.drug_name + '库存不足')
+          }
+        }else{
+          if((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.total){
+            this.$message.error(scope.row.drug_name + '库存不足')
+          }
+        }
       },
       getProjectSingleDose(scope){
         this.prescription.project[scope.$index].total = scope.row.single_dose * scope.row.number_days
+        if(this.prescription.project[scope.$index].total == 0){
+          this.prescription.project[scope.$index].total = 1
+        }
       },
       getProjectDay(scope){
         this.prescription.project[scope.$index].total = scope.row.single_dose * scope.row.number_days
+        if(this.prescription.project[scope.$index].total == 0){
+          this.prescription.project[scope.$index].total = 1
+        }
+        
+      },
+      getNum(execution_frequency){
+        let arr = [
+          {name:'立即执行',count:1},
+          {name:'透析时',count:1},
+          {name:'透析1h一次',count:1},
+          {name:'透析2h一次',count:1},
+          {name:'透析3h一次',count:1},
+          {name:'每日一次',count:1},
+          {name:'每日两次',count:2},
+          {name:'每日三次',count:1},
+          {name:'每晚一次',count:1},
+          {name:'每晚',count:1},
+          {name:'上机前',count:1},
+          {name:'下机前',count:1},
+          {name:'透析后立即',count:1},
+          {name:'持续使用',count:1},
+          {name:'临时开药',count:1},
+          {name:'临睡前',count:1},
+          {name:'隔日一次',count:1},
+          {name:'隔三日一次',count:1},
+          {name:'每二小时一次',count:12},
+          {name:'每四小时一次',count:6},
+          {name:'每六小时一次',count:4},
+          {name:'每八小时一次',count:3},
+        ]
+        let num = ''
+        arr.map(item => {
+          if(item.name == execution_frequency){
+            num = item.count
+          }
+        })
+        if(num == ''){
+          num = 1
+        }
+        return num
       }
     },mounted(){
       this.getInitData()
 
     },
     watch:{
-      // "prescription.advices":{
-      //   handler(newVal,oldVal){
-      //     newVal.map(item => {
-      //       item.prescribing_number = item.single_dose * item.day
-      //       if(item.single_dose != oldVal[index].single_dose || item.number_days != oldVal[index].number_days){
-      //         item.total = item.single_dose * item.number_days
-      //       }
-
-
-      //     })
-      //   },
-      //   deep:true
-      // },
+      "prescription.advices":{
+        handler(newVal,oldVal){
+          
+        },
+        deep:true
+      },
       // "prescription.project":{
       //   handler(newVal,oldVal){
       //     newVal.map((item,index) => {

src/xt_pages/outpatientDoctorStation/components/saveTemplate.vue

@@ -13,10 +13,10 @@
                 <!--<el-radio v-model="radio" label="1">临时</el-radio>-->
                 <!--<el-radio v-model="radio" label="2">长期</el-radio>-->
                 <!--</el-form-item>-->
-                <el-form-item label="处方模板名称:" style="width: 100%;margin-bottom:0;">
+                <el-form-item label="处方模板名称:" style="width: 60%;margin-bottom:0;">
                     <el-input v-model="form.name" placeholder=""></el-input>
                 </el-form-item>
-                <el-form-item label="透析模式 : " style="width: 100%;">
+                <el-form-item label="透析模式 : " style="width: 60%;">
                     <el-select v-model="form.mode" style="width:100%;" placeholder="请选择">
                         <el-option
                                 v-for="item in modeOptions"

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -137,7 +137,9 @@
 
                 <medicalRecord ref='medicalRecord' @func="getMsgFormSon"></medicalRecord>
                 <saveRecordTemplate ref='saveRecordTemplate'></saveRecordTemplate>
-                <dialysis-index v-if="titleType == '透析记录'" :record_date="record_date" :patientid='patientid'></dialysis-index>
+                <!--<dialysis-index v-if="titleType == '透析记录'" :record_date="record_date" :patientid='patientid'></dialysis-index>-->
+                <dialysis-index v-if="titleType == '透析记录'" :record_date="record_date" :patientid='patientid' :dialysisShow="dialysisShow"></dialysis-index>
+
             </div>
 
         </div>
@@ -283,6 +285,7 @@
         recordVisible: false,
         recordObj: {},
         additions: [],
+        dialysisShow:true,
 
         all_data: [],
         all_data_two: [],
@@ -703,6 +706,8 @@
               obj['id'] = drug_month_prescriptions.advices[a].drug_id
               // obj['retail_price'] = obj['retail_price'] +  drug_month_prescriptions.advices[a].drug.retail_price
               obj['retail_price'] = parseFloat(drug_month_prescriptions.advices[a].price)
+              obj['drug'] = drug_month_prescriptions.advices[a].drug
+
               count = count + drug_month_prescriptions.advices[a].prescribing_number
 
             }
@@ -1167,7 +1172,10 @@
                     single_dose_unit: prescription.advices[b].single_dose_unit,
                     prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                     medical_insurance_number: prescription.advices[b].med_list_codg,
-                    id: prescription.advices[b].drug_id
+                    id: prescription.advices[b].drug_id,
+                    drug: prescription.advices[b].drug,
+
+
                   };
                   tempAdvice.push(obj)
                 }
@@ -1263,7 +1271,8 @@
                       single_dose_unit: prescription.advices[b].single_dose_unit,
                       prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                       medical_insurance_number: prescription.advices[b].med_list_codg,
-                      id: prescription.advices[b].drug_id
+                      id: prescription.advices[b].drug_id,
+                      drug:prescription.advices[b].drug
                     };
                     tempAdvice.push(obj)
                   }
@@ -1355,7 +1364,9 @@
                           single_dose_unit: prescription.advices[b].single_dose_unit,
                           prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                           medical_insurance_number: prescription.advices[b].med_list_codg,
-                          id: prescription.advices[b].drug_id
+                          id: prescription.advices[b].drug_id,
+                          drug:prescription.advices[b].drug
+
                         };
                         tempAdvice.push(obj)
                       }
@@ -1440,7 +1451,7 @@
       },
 
       choosePatient(val) {
-        console.log(val);
+        console.log(111111,val);
         if(this.titleType == '电子病历'){
           console.log('this.$refs.child.watchSign',this.$refs.child.watchSign);
           if(this.$refs.child.watchSign > 2){
@@ -1553,7 +1564,9 @@
                           single_dose_unit: prescription.advices[b].single_dose_unit,
                           prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                           medical_insurance_number: prescription.advices[b].med_list_codg,
-                          id: prescription.advices[b].drug_id
+                          id: prescription.advices[b].drug_id,
+                          drug:prescription.advices[b].drug
+
                         };
                         tempAdvice.push(obj)
                       }
@@ -1649,7 +1662,9 @@
                             single_dose_unit: prescription.advices[b].single_dose_unit,
                             prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                             medical_insurance_number: prescription.advices[b].med_list_codg,
-                            id: prescription.advices[b].drug_id
+                            id: prescription.advices[b].drug_id,
+                            drug:prescription.advices[b].drug
+
                           };
                           tempAdvice.push(obj)
                         }
@@ -1741,7 +1756,9 @@
                                 single_dose_unit: prescription.advices[b].single_dose_unit,
                                 prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                                 medical_insurance_number: prescription.advices[b].med_list_codg,
-                                id: prescription.advices[b].drug_id
+                                id: prescription.advices[b].drug_id,
+                                drug:prescription.advices[b].drug
+
                               };
                               tempAdvice.push(obj)
                             }
@@ -1927,7 +1944,9 @@
                           single_dose_unit: prescription.advices[b].single_dose_unit,
                           prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                           medical_insurance_number: prescription.advices[b].med_list_codg,
-                          id: prescription.advices[b].drug_id
+                          id: prescription.advices[b].drug_id,
+                          drug:prescription.advices[b].drug
+
                         };
                         tempAdvice.push(obj)
                       }
@@ -2023,7 +2042,9 @@
                             single_dose_unit: prescription.advices[b].single_dose_unit,
                             prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                             medical_insurance_number: prescription.advices[b].med_list_codg,
-                            id: prescription.advices[b].drug_id
+                            id: prescription.advices[b].drug_id,
+                            drug:prescription.advices[b].drug
+
                           };
                           tempAdvice.push(obj)
                         }
@@ -2115,7 +2136,9 @@
                                 single_dose_unit: prescription.advices[b].single_dose_unit,
                                 prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                                 medical_insurance_number: prescription.advices[b].med_list_codg,
-                                id: prescription.advices[b].drug_id
+                                id: prescription.advices[b].drug_id,
+                                drug:prescription.advices[b].drug
+
                               };
                               tempAdvice.push(obj)
                             }
@@ -2302,7 +2325,9 @@
                           single_dose_unit: prescription.advices[b].single_dose_unit,
                           prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                           medical_insurance_number: prescription.advices[b].med_list_codg,
-                          id: prescription.advices[b].drug_id
+                          id: prescription.advices[b].drug_id,
+                          drug:prescription.advices[b].drug
+
                         };
                         tempAdvice.push(obj)
                       }
@@ -2398,7 +2423,9 @@
                             single_dose_unit: prescription.advices[b].single_dose_unit,
                             prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                             medical_insurance_number: prescription.advices[b].med_list_codg,
-                            id: prescription.advices[b].drug_id
+                            id: prescription.advices[b].drug_id,
+                            drug:prescription.advices[b].drug
+
                           };
                           tempAdvice.push(obj)
                         }
@@ -2490,7 +2517,9 @@
                                 single_dose_unit: prescription.advices[b].single_dose_unit,
                                 prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                                 medical_insurance_number: prescription.advices[b].med_list_codg,
-                                id: prescription.advices[b].drug_id
+                                id: prescription.advices[b].drug_id,
+                                drug:prescription.advices[b].drug
+
                               };
                               tempAdvice.push(obj)
                             }
@@ -2726,7 +2755,9 @@
                         single_dose_unit: prescription.advices[b].single_dose_unit,
                         prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                         medical_insurance_number: prescription.advices[b].med_list_codg,
-                        id: prescription.advices[b].drug_id
+                        id: prescription.advices[b].drug_id,
+                        drug:prescription.advices[b].drug
+
                       };
                       tempAdvice.push(obj)
                     }
@@ -2822,7 +2853,9 @@
                           single_dose_unit: prescription.advices[b].single_dose_unit,
                           prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                           medical_insurance_number: prescription.advices[b].med_list_codg,
-                          id: prescription.advices[b].drug_id
+                          id: prescription.advices[b].drug_id,
+                          drug:prescription.advices[b].drug
+
                         };
                         tempAdvice.push(obj)
                       }
@@ -2914,7 +2947,9 @@
                               single_dose_unit: prescription.advices[b].single_dose_unit,
                               prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                               medical_insurance_number: prescription.advices[b].med_list_codg,
-                              id: prescription.advices[b].drug_id
+                              id: prescription.advices[b].drug_id,
+                              drug:prescription.advices[b].drug
+
                             };
                             tempAdvice.push(obj)
                           }
@@ -3100,7 +3135,9 @@
                       single_dose_unit: prescription.advices[b].single_dose_unit,
                       prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                       medical_insurance_number: prescription.advices[b].med_list_codg,
-                      id: prescription.advices[b].drug_id
+                      id: prescription.advices[b].drug_id,
+                      drug:prescription.advices[b].drug
+
                     };
                     tempAdvice.push(obj)
                   }
@@ -3196,7 +3233,9 @@
                         single_dose_unit: prescription.advices[b].single_dose_unit,
                         prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                         medical_insurance_number: prescription.advices[b].med_list_codg,
-                        id: prescription.advices[b].drug_id
+                        id: prescription.advices[b].drug_id,
+                        drug:prescription.advices[b].drug
+
                       };
                       tempAdvice.push(obj)
                     }
@@ -3288,7 +3327,9 @@
                             single_dose_unit: prescription.advices[b].single_dose_unit,
                             prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                             medical_insurance_number: prescription.advices[b].med_list_codg,
-                            id: prescription.advices[b].drug_id
+                            id: prescription.advices[b].drug_id,
+                            drug:prescription.advices[b].drug
+
                           };
                           tempAdvice.push(obj)
                         }

src/xt_pages/outpatientDoctorStation/print.vue

@@ -13,7 +13,8 @@
       </template>
             
     <div class='dialysisPage' style="padding-top:40px;">
-      <printOne v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
+      <printOne v-if="org_id != 10088" v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printOne>
+      <printFour v-else v-bind:childResponse="childResponse" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :doctorPorject="doctorPorject" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id"></printFour>
     </div>
   </div>
 </template>
@@ -29,12 +30,14 @@ import { jsGetAge, uParseTime } from "@/utils/tools";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import print from "print-js";
 import printOne from "./template/printOne"
+import printFour from "./template/printFour"
 import { getAllDoctorList,getAllHisPatientList,getPrescriptionPrint } from "@/api/project/project"
 export default {
   name: "dialysisPrintOrder",
   components: {
     BreadCrumb,
-    printOne
+    printOne,
+    printFour
   },
   props:{
     paramsObj:Object
@@ -56,7 +59,8 @@ export default {
        patient_id:"",
        prescription_id:"",
        ids:'',
-       paramsObj:{}
+       paramsObj:{},
+       org_id:''
     };
   },
   methods:{
@@ -154,6 +158,7 @@ export default {
   },
 
   created() {
+    this.org_id = this.$store.getters.xt_user.org_id
     this.getAllDoctorList()
     var record_date = this.paramsObj.record
     this.record_date = record_date

src/xt_pages/outpatientDoctorStation/template/printFour.vue

@@ -0,0 +1,330 @@
+<template>
+  <div id='prescriptionPrint'>
+    <div v-for="(item,index) in advicePrint" :key="index">
+      <div id='prescription-print' class="prescription-print" style="page-break-after: always;">
+          <div class="printTitle">{{orgname}}处方笺</div>
+          <div class="infoTitle">
+              <p>姓名：{{item.patient.name?item.patient.name:""}}</p>
+              <p>性别：
+                <span v-if="item.patient.gender == 1">男</span>
+                <span v-if="item.patient.gender == 2">女</span>
+              </p>
+              <p>年龄：{{item.patient.age?item.patient.age:""}}岁</p>
+          </div>
+          <div class="infoMain">
+              <div style="margin-bottom: 10px;">门诊号：{{hisPatient.number?hisPatient.number:""}}</div>
+              <div style="margin-bottom: 10px;">科室：{{item.info?getDepart(item.info.departments):''}}</div>
+              <div style="margin-bottom: 10px;">医保卡号：{{item.hisPatient.number?item.hisPatient.number:""}}</div>
+              <div style="margin-bottom: 10px;">电话：{{item.patient.phone}}</div>
+              <div>地址：{{item.patient.home_address}}</div>
+              <div style="display:flex;width:50%;">临床诊断：{{getDiagnosis(item.info.diagnosis)}}</div>
+          </div>
+          <div class="prescriptionBox">
+              <div class="Rp">Rp:</div>
+              <div class="drugsBox" v-for="(it,index) in item.advices" :key="index">
+                  <!-- <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div> -->
+                  <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;<span>用法：{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.execution_frequency}}&nbsp;{{it.delivery_way}}&nbsp;</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
+                  <div style="margin-left:100px;"><span>{{it.drug.drug_spec}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</span></div>
+              </div>
+              <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
+                <div class="drugsOne">{{it.item_name?it.item_name:""}}:&nbsp;{{it.price}}元/{{it.count}}次</div>
+               </div>
+               
+              <div class="drugsBox" v-for="(it,index) in item.project" :key="index">
+                  <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{getProjectName(it.project_id)?getProjectName(it.project_id):""}}&nbsp;&nbsp;<span>用法：{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.delivery_way}}</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
+                  <div style="margin-left:100px;"><span>{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.count}}{{unit}}</span></div>
+              </div>
+              <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
+                <div class="drugsOne">{{it.project_id?it.project_id:""}}:&nbsp;{{it.price}}元/{{it.count}}次</div>
+               </div>
+               <div style="text-align:center;" >(以下空白)</div>
+
+          </div>
+          <div class="doctorBox">
+              <p>医师：{{item.doctor?item.doctor:""}}</p>
+              <p>日期：{{getTime(item.ctime)?getTime(item.ctime):""}}</p>
+          </div>
+          <div class="actionBar">
+                 <!-- <p>审核：{{getDoctor(item.advices[0].checker)?getDoctor(item.advices[0].checker):""}}</p>
+                 <p>配对：</p>
+                 <p>核对：{{getDoctor(item.advices[0].checker)?getDoctor(item.advices[0].checker):""}}</p>
+                 <p>发药：{{getDoctor(item.advices[0].execution_staff)?getDoctor(item.advices[0].execution_staff):""}}</p>
+                 <p>药费：{{getTotalOne(item.id)?getTotalOne(item.id):0}}元</p> -->
+
+                 <p>审核：</p>
+                 <p>配对：</p>
+                 <p>核对：</p>
+                 <p>发药：</p>
+                 <p>药费：{{getTotalOne(item.id).toFixed(2)?getTotalOne(item.id).toFixed(2):0}}元</p>
+          </div>
+          <div style="page-break-after:always"></div>
+      </div>
+    </div>
+    
+  </div>
+
+    
+</template>
+<script>
+import { jsGetAge, uParseTime } from '@/utils/tools'
+import {getAllDoctorList,getPrescriptionPrint,getHisPatientDetail} from "@/api/project/project"
+import {getInitData} from "@/api/his/his"
+export default {
+    props:{
+      patient_id:Number,
+      record_date:String,
+      prescription_id:Number,
+      ids:String
+    }, 
+    data(){
+      return {
+        doctorList:[],
+        advicePrint:{},
+        patient:{},
+        tableData:[],
+        prescriptionInfo:[],
+        hisPatient:{},
+        department:[],
+        prescriptions:[],
+        projectList:[],
+        orgname:"",
+        diagnoses:[],
+      }
+    },
+   methods:{
+     
+     getAllDoctorList(){
+      getAllDoctorList().then(response=>{
+        if(response.data.state == 1){
+               var doctor =  response.data.data.doctor
+               
+               this.doctorList = doctor
+             }
+         })   
+     },
+
+      getDoctor(id){
+        var name = ""
+        for(let i=0;i<this.doctorList.length;i++){
+          if(id == this.doctorList[i].admin_user_id){
+              name = this.doctorList[i].user_name
+          }
+        }
+        return name
+      },
+      getTime(value, temp) {
+        if (value != undefined) {
+            return uParseTime(value, temp)
+        }
+        return ''
+     },
+       getPrescriptionPrint(){
+         var params = {
+          // patient_id:this.patient_id,
+          // record_date:this.record_date,
+          // prescription_id:this.prescription_id,
+          patient_id:this.patient_id,
+          record_date:this.record_date,
+          prescription_id:this.prescription_id,
+          ids:this.ids
+        }
+        console.log("params",params)
+       getPrescriptionPrint(params).then(response=>{
+         if(response.data.state == 1){
+            var advicePrint =  response.data.data.advicePrint
+            console.log("adviceprint9999",advicePrint)
+            this.advicePrint = advicePrint
+            this.prescriptions = advicePrint
+            console.log("处方222222",this.prescriptions)
+            var hisPatient = response.data.data.hisPatient
+            console.log("hisPatient",hisPatient)
+            this.hisPatient = hisPatient
+            var projectlist =  response.data.data.projectlist
+            console.log("所有项目列表",projectlist)
+            this.projectList = projectlist
+          }
+       })
+     },
+     getHisPatientDetail(){
+          const params = {
+              patient_id:this.patient_id
+          }
+       getHisPatientDetail(params).then(response=>{
+          if(response.data.state == 1){
+             var hisPatient =  response.data.data.hisPatient
+             console.log("挂号病人",hisPatient)
+             this.hisPatient = hisPatient
+          }
+       })
+     },
+     getInitData(){
+       getInitData().then(response=>{
+          if(response.data.state == 1){
+            this.department = response.data.data.department
+            this.diagnoses = response.data.data.diagnose
+            console.log("争端",this.diagnoses)
+          }
+       })
+     },
+     getDepart(id){
+         var name = ""
+       for(let i=0;i<this.department.length;i++){
+           if(id == this.department[i].id){
+               name = this.department[i].name
+           }
+       }
+       return name
+     },
+    getTotalOne(id) {
+
+        var total = 0
+        var addtotal = 0
+        for (let i = 0; i < this.prescriptions.length; i++) {
+          if(id == this.prescriptions[i].id){
+            if (this.prescriptions[i].project != null) {
+              for (let a = 0; a < this.prescriptions[i].project.length; a++) {
+                total = total + this.prescriptions[i].project[a].price * this.prescriptions[i].project[a].count
+              }
+            }
+
+            if (this.prescriptions[i].additionalcharge != null) {
+              for (let a = 0; a < this.prescriptions[i].additionalcharge.length; a++) {
+                addtotal = addtotal + this.prescriptions[i].additionalcharge[a].price * this.prescriptions[i].additionalcharge[a].count
+              }
+            }
+              addtotal =  Math.floor(addtotal * 100) / 100
+        }
+       
+       }
+
+      for (let i = 0; i < this.prescriptions.length; i++) {
+          if(id == this.prescriptions[i].id){
+            if (this.prescriptions[i].advices != null) {
+              for (let a = 0; a < this.prescriptions[i].advices.length; a++) {
+                total = total + this.prescriptions[i].advices[a].price * this.prescriptions[i].advices[a].prescribing_number
+              }
+            }
+          
+            if (this.prescriptions[i].additionalcharge != null) {
+              for (let a = 0; a < this.prescriptions[i].additionalcharge.length; a++) {
+                addtotal = addtotal + this.prescriptions[i].additionalcharge[a].price * this.prescriptions[i].additionalcharge[a].count
+              }
+            }
+              addtotal =  Math.floor(addtotal * 100) / 100
+        }
+       }
+
+        return total + addtotal
+      },
+      
+     getProjectName(id){
+        var project_name = ""
+        for(let i=0;i<this.projectList.length;i++){
+           if(id == this.projectList[i].id){
+               project_name = this.projectList[i].project_name
+           }
+        }
+        return project_name
+     },
+
+     getDiagnosis(id){
+        var name = ""
+        for(let i=0;i<this.diagnoses.length;i++){
+          if(id == this.diagnoses[i].id){
+             name = this.diagnoses[i].class_name
+          }
+        }
+        return name
+     }
+
+   },
+   created(){
+      this.getAllDoctorList()
+      this.getInitData()
+      this.getPrescriptionPrint()
+      this.getHisPatientDetail()
+      var xtuser = this.$store.getters.xt_user;
+      this.orgname = xtuser.org.org_name;
+     
+   },
+   watch:{
+     ids:function(val){
+      this.ids = val
+      this.getPrescriptionPrint()
+    }
+   }
+}
+</script>
+
+
+<style lang="scss" scoped>
+.prescription-print{
+  -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
+    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset; 
+    box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
+    margin-bottom: 20px;
+    padding:20px 10px;
+}
+.printTitle{
+    font-size: 22px;
+    text-align: center;
+    font-weight: bold;
+}
+.infoTitle{
+    display: flex;
+    border-bottom: 2px solid #000;
+    margin-top:10px;
+    line-height: 24px;
+    padding:0 10px;
+}
+.infoTitle p{
+    width: 200px;
+}
+.infoMain{
+    display: flex;
+    flex-wrap: wrap;
+    border-bottom: 2px solid #000;
+    padding:0 10px;
+}
+.infoMain div{
+    width: 50%;
+    line-height: 24px;
+}
+.prescriptionBox{
+    padding:0 10px;
+    min-height:450px;
+}
+.Rp{
+    font-size: 22px;
+    font-weight: bold;
+}
+.drugsBox{
+    padding-left: 40px;
+    margin-bottom: 10px;
+}
+.drugsBox div{
+    line-height: 20px;
+}
+.drugsOne{
+    line-height: 24px;
+}
+.drugsOne span{
+    margin-right: 20px;
+}
+.doctorBox{
+    display: flex;
+    justify-content: space-between;
+    padding:0 10px;
+    line-height: 24px;
+    border-bottom: 2px solid #000;
+}
+.actionBar{
+    display: flex;
+    justify-content: space-between; 
+    line-height: 24px;
+    padding:0 10px;
+}
+.actionBar p{
+    width:150px;
+}
+</style>

src/xt_pages/qcd/basicInformationAnalysis.vue

@@ -720,7 +720,7 @@ export default {
       //本月的结束时间
       var monthEndDate = new Date(nowYear, nowMonth+1, 0);
       var timeEnd=Date.parse(monthEndDate)/1000-1;//s
-      // console.log("本月最后一天",timeEnd)
+       console.log("本月最后一天",timeEnd)
       //本月
       if(state == 0){
        //统计透析总量

src/xt_pages/role/components/AdminInfoForm.vue

@@ -440,7 +440,9 @@
 
         user_types: [
           { index: 2, name: '医生' },
-          { index: 3, name: '护士' }
+          { index: 3, name: '护士' },
+          { index:4,name:'行政'},
+          { index:5,name:'其他'}
         ],
         user_titles: [
           { index: 1, name: '医士' },

src/xt_pages/stock/detail/print.vue

@@ -184,6 +184,7 @@
       },
       getDialysisRecord() {
         this.loading = true
+        
         getPrintStockGood(this.queryParams).then(response => {
           if (response.data.state == 1) {
             var stockTotal = response.data.data.stockTotal
@@ -251,7 +252,8 @@
             return false
           }
         })
-      }, calCount(stock) {
+      }, 
+      calCount(stock) {
       
         let total = 0
         var array = []

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -164,7 +164,8 @@
         </el-table-column>
         <el-table-column label="数量" align="center">
           <template slot-scope="scope">
-            {{ scope.row.count }}
+            <span v-if="orgId!=9583">{{ scope.row.count }}</span>
+            <span v-if="orgId ==9583">{{getStockCount(scope.row.good_id) }}</span>
           </template>
         </el-table-column>
         <el-table-column label="总价" align="center">
@@ -227,6 +228,9 @@ export default {
     this.goodUnit = this.$store.getters.good_unit
     this.getPrintStockGood()
     this.getList()
+    var org_id = this.$store.getters.xt_user.org.id
+    this.orgId = org_id
+    console.log("机构信息",org_id)
   },
   data() {
     return {
@@ -260,7 +264,8 @@ export default {
       goodUnit:[],
       tableList:[],
       stockTotal:[],
-      goodInfoData:[]
+      goodInfoData:[],
+      orgId:"",
     };
   },
   methods: {
@@ -686,7 +691,6 @@ export default {
         return Math.floor(amountPrice* 100) / 100
       },
       getStockCount(id){
-
         var count = ""
         for(let i=0;i<this.stockTotal.length;i++){
             if(id == this.stockTotal[i].good_id){
@@ -758,7 +762,6 @@ export default {
         this.tableList[i].index = i+1
         this.tableList[i].min_unit = this.getUnit(this.tableList[i].good_unit)
         this.tableList[i].count = this.getStockCount(this.tableList[i].id)
-        // this.tableList[i].price = this.tableList[i].query_warehouseout_info[0].buy_price
         this.tableList[i].total = (this.getStockCount(this.tableList[i].id) * this.tableList[i].buy_price).toFixed(2)
         this.tableList[i].remark = this.tableList[i].query_warehouseout_info[0].remark
        }
@@ -800,7 +803,7 @@ export default {
        }
        return total_price
      },
-
+   
      
   }
 };

src/xt_pages/stock/drugs/cancelDrugStockOrderAdd.vue

@@ -303,6 +303,7 @@ export default {
   },
   methods: {
     comfirm: function(val) {
+     
       this.propForm.goodType = []
       this.propForm.goods = []
 

src/xt_pages/stock/drugs/drugStockInOrder.vue

@@ -422,8 +422,7 @@ export default {
           this.total = response.data.data.total;
           for (let i = 0; i < response.data.data.list.length; i++) {
             this.Warehouse.warehouseDate.push(response.data.data.list[i]);
-          }
-          console.log("列表",this.warehouse.warehouseDate)
+          }      
         }
       });
     },
@@ -432,7 +431,7 @@ export default {
       row.index = rowIndex;
     },
     onRowClick(row, event, column) {
-      this.WarehouseInfo.warehouseInfoDate = [];
+     this.WarehouseInfo.warehouseInfoDate = [];
       this.Warehouse.tableCurrentIndex = row.index;
       const params = {
         id: row.id
@@ -446,9 +445,7 @@ export default {
         } else {
           this.WarehouseInfo.loading = false;
           for (let i = 0; i < response.data.data.info.length; i++) {
-            this.WarehouseInfo.warehouseInfoDate.push(
-              response.data.data.info[i]
-            );
+            this.WarehouseInfo.warehouseInfoDate.push(response.data.data.info[i]);
           }
         }
       });
@@ -566,12 +563,12 @@ export default {
           this.$message.error(response.data.msg);
           return false;
         } else {
+          //  this.WarehouseInfo.warehouseInfoDate = []
+           
           for (let i = 0; i < response.data.data.info.length; i++) {
-            this.WarehouseInfo.warehouseInfoDate = []
-            this.WarehouseInfo.warehouseInfoDate.push(
-              response.data.data.info[i]
-            );
+            this.WarehouseInfo.warehouseInfoDate.push(response.data.data.info[i]);
           }
+          console.log("列表222222222", this.WarehouseInfo.warehouseInfoDate)
           this.WarehouseInfo.warehouse = response.data.data.warehousing;
         }
       });

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

@@ -421,7 +421,7 @@
         this.isVisibility = true
       }, 
       comfirm: function(val) {
-        console.log("Val2222222",val)
+        console.log("Val2222222",this.currentIndex)
         this.$refs.dialog.hide()
         if (val.selectedGoodInfo.length > 0) {
           for (let i = val.selectedGoodInfo.length - 1; i >= 0; i--) {

src/xt_pages/stock/drugs/drugStockInOrderEdit.vue

@@ -375,6 +375,7 @@ export default {
     comfirm: function(val) {
       this.$refs.dialog.hide();
       console.log(val)
+      console.log("下摆哦2222222",this.currentIndex)
       if (val.selectedGoodInfo.length > 0) {
         for (let i = val.selectedGoodInfo.length - 1; i >= 0 ; i--) {
           if (i == 0) {

src/xt_pages/stock/drugs/drugStockOutOrderDetailPrint.vue

@@ -8,8 +8,6 @@
     <div class="app-container ">
       <div id="dialysis-print-box">
         <div class="dialysis-print-order">
-         <div class="order-yy-name" style="font-weight:bold;">{{orgName}}</div>
-          <div class="order-title" style="font-weight:normal;">药品出库登记表</div>
          <div class="order-yy-name" style="font-size:22px;font-weight:bold;letter-spacing:0px;">{{orgName}}</div>
           <div class="order-title" style="font-weight:500;font-size:18px;">药品出库登记表</div>
 
@@ -18,8 +16,8 @@
           <table class="print-table" border="1">
             <tbody>
             <tr>
-              <td style="line-height: 50px" width="250">药品名称</td>
-              <td style="line-height: 50px" width="250">规格型号</td>
+              <td style="line-height: 50px" width="230">药品名称</td>
+              <td style="line-height: 50px" width="230">规格型号</td>
               <td style="line-height: 50px" width="50">单位</td>
               <td style="line-height: 50px" width="80">出货数量</td>
               <td style="line-height:50px" width="80">出库价格</td>
@@ -72,7 +70,7 @@
           <div v-if="orgId == 10024" style="display:flex;margin-top:1px;float:right;">
             <div style="width:50px;">科室：</div><div style="width:60px;"></div>
             <div style="width:70px;">领料人：</div><div style="width:60px;"></div>
-            <div style="width:80px;">审批：</div><div style="width:100px;"></div>
+            <div style="width:80px;">审批：</div><div style="width:100px;">肖庆娥</div>
             <div style="width:50px;">会计：</div><div style="width:100px;">徐立琼</div>
             <div style="width:50px;">审核：</div><div style="width:100px;">徐立琼</div>
             <div style="width:70px;">制单人：</div><div style="width:100px;">徐立琼</div>

src/xt_pages/stock/stockOutOrderDetailPrint.vue

@@ -164,8 +164,9 @@ export default {
             console.log("数据源头9999999999",this.warehousingOutInfo.warehousingOutData);
             var total_price = 0;
             for(let i=0;i<this.warehousingOutInfo.warehousingOutData.length;i++){
-              total_price += this.getOutStockCount(this.warehousingOutInfo.warehousingOutData[i].good_id)*this.warehousingOutInfo.warehousingOutData[i].price
+              total_price += this.warehousingOutInfo.warehousingOutData[i].total_price   
             }
+            console.log('this.allPrice',this.allPrice)
            this.allPrice = total_price;
 
            var wareoutList =  response.data.data.wareoutList;

src/xt_pages/stock/stockQuery.vue

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

src/xt_pages/user/dialysisSolution.vue

@@ -512,6 +512,19 @@
             </el-form-item>
           </el-col>
 
+         <el-col :span="8" v-if="isShows('血浆分离器')">
+             <el-form-item label="血浆分离器:">
+               <el-input v-model="addPlan.plasma_separator" @focus="showInnerDialog('8')"></el-input>
+             </el-form-item>
+         </el-col>
+
+
+        <el-col :span="8" v-if="isShows('血浆分离器')">
+             <el-form-item label="血浆分离器:">
+               <el-input v-model="addPlan.bilirubin_adsorption_column" @focus="showInnerDialog('9')"></el-input>
+             </el-form-item>
+         </el-col>
+
           <el-col :span="8" v-if="isShows('目标KT/V')">
             <el-form-item label="目标KT/V">
               <el-input v-model="addPlan.target_ktv"></el-input>
@@ -519,6 +532,10 @@
           </el-col>
         </el-row>
 
+
+    
+
+
         <el-row :gutter="24">
           <el-col :span="24">
             <el-form-item label="备注: " prop="remark">
@@ -707,6 +724,8 @@ export default {
         blood_access: '',
         dialysis_dialyszers:'',
         dialysis_irrigation:'',
+        plasma_separator:"",
+        bilirubin_adsorption_column:"",
       },
       childPlan: {
         mode: '',
@@ -835,6 +854,8 @@ export default {
      dialyzers:[],
      dialysis_dialyszers:'',
      dialysis_irrigation:"",
+     plasmaSeparatorList:[],
+     bilirubinAdsorptionColumn:[],
     }
   },
   watch: {
@@ -913,11 +934,29 @@ export default {
           this.InnerDialogProps.selected = this.dialysis_irrigation
           this.InnerDialogProps.isShowTextArea = false
 
+          break
+        case '8':
+         
+          this.InnerDialogProps.values = this.plasmaSeparatorList
+          this.InnerDialogProps.titles = '血浆分离器'
+          this.InnerDialogProps.type = 'plasma_separator'
+          this.InnerDialogProps.selected = this.addPlan.plasma_separator
+          this.InnerDialogProps.isShowTextArea = false
+
+          break
+         case '9':
+         
+          this.InnerDialogProps.values = this.bilirubinAdsorptionColumn
+          this.InnerDialogProps.titles = '胆红素吸附柱'
+          this.InnerDialogProps.type = 'bilirubin_adsorption_column'
+          this.InnerDialogProps.selected = this.addPlan.bilirubin_adsorption_column
+          this.InnerDialogProps.isShowTextArea = false
+
           break
       }
     },
     innerDialogComfirm: function(val) {
-
+      console.log("value",val)
       this.InnerDialogProps.visibility = false
       switch (val.type) {
         case 'dialyzer_perfusion_apparatus':
@@ -925,13 +964,16 @@ export default {
           break
         case 'dialyzers':
           this.dialysis_dialyszers = val.value.join(',')
-          console.log("3333333",this.addPlan.dialysis_dialyszers)
-
           break
         case 'irrigations':
           this.dialysis_irrigation = val.value.join(',')
           break
-
+        case 'plasma_separator':
+          this.addPlan.plasma_separator = val.value.join(',')
+          break
+        case 'bilirubin_adsorption_column':
+          this.addPlan.bilirubin_adsorption_column = val.value.join(',')
+          break
       }
     },
     innerDialogCancle: function() {
@@ -1376,6 +1418,8 @@ export default {
       this.addPlan.remark = row.remark
 
       this.addPlan.dialyzer_perfusion_apparatus = row.dialyzer_perfusion_apparatus.toString()
+      this.addPlan.plasma_separator = row.plasma_separator.toString()
+      this.addPlan.bilirubin_adsorption_column = row.bilirubin_adsorption_column.toString()
       this.addPlan.dialysis_irrigation = row.dialysis_irrigation
       this.addPlan.dialysis_dialyszers = row.dialysis_dialyszers
       this.dialysis_irrigation = row.dialysis_irrigation
@@ -1474,6 +1518,8 @@ export default {
         dialysis_duration_hour: '3',
         dialysis_duration_minute: '30',
         created_time:"",
+        plasma_separator:"",
+        bilirubin_adsorption_column:"",
       }
       this.addPlanTypeChange()
 
@@ -1713,7 +1759,8 @@ export default {
               displace_liqui_part: '',
               displace_liqui_value: '',
               ultrafiltration: '',
-              blood_access: ''
+              blood_access: '',
+              plasma_separator:"",
             }
 
             for (const key in tempAddPlan) {
@@ -1811,7 +1858,8 @@ export default {
       'hemodialysis',
       'dialyzer_perfusion_apparatus'
     )
-
+    this.plasmaSeparatorList = getDataConfig('hemodialysis','plasma_separator')
+    this.bilirubinAdsorptionColumn = getDataConfig('hemodialysis','bilirubin_adsorption_column')
     this.queryParams.id = this.patientID
     // this.fetchAllDoctorAndNurse();
 

src/xt_pages/workforce/appointment.vue

@@ -69,7 +69,7 @@
       <bread-crumb :crumbs="crumbs"></bread-crumb>
         <div style="display:flex;align-items:center">
           <schedule-upload-excel style="margin-right:10px;" :on-success='handleSuccess' ></schedule-upload-excel>
-           <el-button @click="printTable" type="primary" size="small">打印排班</el-button>
+           <!-- <el-button @click="printTable" type="primary" size="small">打印排班</el-button> -->
           <el-button v-if="isShow()" type="primary" size="small" @click="export_file()" :loading="downloadLoading">
             导出模版
           </el-button>
@@ -85,7 +85,7 @@
           >下载日志
           </el-button>
 
-          <el-button type="primary" size="small" icon="el-icon-printer" @click="printScheduleAction">打印</el-button>
+          <el-button type="primary" size="small" icon="el-icon-printer" @click="printScheduleAction">打印排班</el-button>
           <el-button type="primary" size="small" icon="el-icon-setting" @click="setScheduleTemplateAction">排班模板</el-button>
           <el-button type="primary" size="small" @click="copySchedule">复制排班</el-button>
         </div>
@@ -157,7 +157,7 @@
   import moment from 'moment'
   import { parseTime } from '@/utils'
   import tableData from './components/tableData'
-  import { exportSchedule, getWeekPanels, initDate,getThreeWeekList,copyPatientSchedule } from '@/api/schedule'
+  import { exportSchedule, getWeekPanels, initDate,getThreeWeekList,copyPatientSchedule,getScheduleTemplate } from '@/api/schedule'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import UploadExcel from '@/xt_pages/components/UploadExcel'
   import ScheduleUploadExcel from './components/scheduleUploadExcel/index'
@@ -216,8 +216,8 @@
         clen:7,
         nowYear: new Date().getFullYear(),
         schedule_week:0,
-        newDay:[]
-
+        newDay:[],
+       templateObj:{}
       }
     },
     components: {
@@ -227,9 +227,9 @@
       UploadExcel
     },
     methods: {
-      printTable(){
-        this.$router.push({path: '/scheduleTablePrint?partition_id='+this.partition_id+"&weekTime="+this.activeName})
-      },
+      // printTable(){
+      //   this.$router.push({path: '/scheduleTablePrint?partition_id='+this.partition_id+"&weekTime="+this.activeName})
+      // },
       generateTxt: function(log) {
         var content = ''
         var errlog = log.err_logs
@@ -638,11 +638,16 @@
         } else if (this.activeName == 'nextTwoWeek') {
           date = date + 14 * 24 * 60 * 60 * 1000
         }
-        this.$router.push({
-          path: '/workforce/schedule/print',
-          query: { date: date }
-        })
-      }, isShow() {
+        
+        if(this.templateObj.template_id == 0 || this.templateObj.template_id == 1){
+           this.$router.push({path: '/workforce/schedule/print',query: { date: date }})
+        }
+        if(this.templateObj.template_id == 2){
+          this.$router.push({path: '/scheduleTablePrint?partition_id='+this.partition_id+"&weekTime="+this.activeName})
+        }
+       
+      }, 
+      isShow() {
         let isShow = false
         if (Object.keys(this.partitions).length != 0) {
           isShow = true
@@ -2811,8 +2816,18 @@
               }
            })
         },
+        getlist(){
+          getScheduleTemplate().then(response=>{
+             if(response.data.state == 1){
+                var template = response.data.data.template
+                console.log("模版",template)
+                this.templateObj = template
+             }
+          })
+        }
     },
     created() {
+     this.getlist()
      var start_time = moment().weekday(1).format('YYYY-MM-DD');
    
      this.start_time = start_time

src/xt_pages/workforce/components/nextTableWeeks.vue

@@ -129,7 +129,10 @@
       </el-table-column>
       <el-table-column label="透析器/灌流器" min-width="100" align="center">
         <template slot-scope="scope">
-          <span v-if="org_id!=9987" > {{ scope.row.prescription.dialyzer_perfusion_apparatus }}</span>
+          <span v-if="org_id!=9987" >
+             <span v-if="scope.row.prescription.dialyzer_perfusion_apparatus!=''">{{ scope.row.prescription.dialyzer_perfusion_apparatus }}</span> 
+             <span v-if="scope.row.prescription.dialyzer_perfusion_apparatus =='' && scope.row.dialysissolution.length>0 ">{{ scope.row.dialysissolution[0].dialyzer_perfusion_apparatus }}</span> 
+          </span>
           {{scope.row.prescription.dialysis_dialyszers}}
          <span v-if="scope.row.prescription.dialysis_dialyszers!='' && scope.row.prescription.dialysis_irrigation!=''">/</span>
           <span v-if="scope.row.prescription.dialysis_irrigation!=''">{{scope.row.prescription.dialysis_irrigation}}</span>

src/xt_pages/workforce/components/tableData.vue

@@ -1066,6 +1066,9 @@ export default {
         }, 0);
         sums[index];
       });
+      this.$nextTick(() => {
+        this.$refs.table.doLayout();
+      });
 
       return sums;
     },

src/xt_pages/workforce/components/tableWeeks.vue

@@ -146,8 +146,11 @@
       </el-table-column>
       <el-table-column label="透析器/灌流器" min-width="100" align="center">
         <template slot-scope="scope">
-          <span v-if="org_id!=9987">{{ scope.row.prescription.dialyzer_perfusion_apparatus }}</span>
-          {{scope.row.prescription.dialysis_dialyszers}}
+          <span v-if="org_id!=9987">
+             <span v-if="scope.row.prescription.dialyzer_perfusion_apparatus!=''">{{ scope.row.prescription.dialyzer_perfusion_apparatus }}</span> 
+             <span v-if="scope.row.prescription.dialyzer_perfusion_apparatus==''&& scope.row.dialysissolution.length>0 ">{{scope.row.dialysissolution[0].dialyzer_perfusion_apparatus}}</span>
+          </span>
+           {{scope.row.prescription.dialysis_dialyszers}}
           <span v-if="scope.row.prescription.dialysis_dialyszers!='' && scope.row.prescription.dialysis_irrigation!=''">/</span>
           <span v-if="scope.row.prescription.dialysis_irrigation!=''">{{scope.row.prescription.dialysis_irrigation}}</span>
         </template>

src/xt_pages/workforce/next_remind_print.vue

@@ -61,7 +61,10 @@
                   {{modeOptions[main_collection.mode_id].name}}
                 </td>
                 <td :width="td_1_width" v-if="printObj.dialyzers == 1 && printObj.perfusion_apparatus == 1">
-                  <span v-if="org_id!=9987">{{main_collection.prescription.dialyzer_perfusion_apparatus}}</span> 
+                 <span v-if="org_id!=9987">
+                     <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus!=''"> {{main_collection.prescription.dialyzer_perfusion_apparatus}}</span>
+                     <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus ==''&& main_collection.dialysissolution.length>0">{{main_collection.dialysissolution[0].dialyzer_perfusion_apparatus}}</span> 
+                  </span>
                   {{main_collection.prescription.dialysis_dialyszers}} 
                   <span v-if="main_collection.prescription.dialysis_dialyszers!='' && main_collection.prescription.dialysis_irrigation!=''">/</span>
                   <span v-if="main_collection.prescription.dialysis_irrigation!=''"> {{main_collection.prescription.dialysis_irrigation}}</span>

src/xt_pages/workforce/remind_print.vue

@@ -60,8 +60,11 @@
                   {{modeOptions[main_collection.mode_id].name}}
                 </td>
                 <td :width="td_1_width" v-if="printObj.dialyzers == 1 && printObj.perfusion_apparatus ==1">
-                  <span v-if="org_id!=9987">{{main_collection.prescription.dialyzer_perfusion_apparatus}}</span>
-                  {{main_collection.prescription.dialysis_dialyszers}}
+                  <span v-if="org_id!=9987">
+                     <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus!=''"> {{main_collection.prescription.dialyzer_perfusion_apparatus}}</span>
+                     <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus ==''&& main_collection.dialysissolution.length>0">{{main_collection.dialysissolution[0].dialyzer_perfusion_apparatus}}</span> 
+                  </span>
+                    {{main_collection.prescription.dialysis_dialyszers}}
                   <span v-if="main_collection.prescription.dialysis_dialyszers!=''&& main_collection.prescription.dialysis_irrigation!='' ">/</span>
                   <span v-if="main_collection.prescription.dialysis_irrigation!=''">{{main_collection.prescription.dialysis_irrigation}}</span>
 

src/xt_pages/workforce/scheduleTablePrint.vue

@@ -12,7 +12,7 @@
                 <td colspan="3">周五({{ weekTitle[4] }})</td>
                 <td colspan="3">周六({{ weekTitle[5] }})</td>
                 <td colspan="3">周日({{ weekTitle[6] }})</td>
-                <td colspan="3">总数</td>
+                <td>总数</td>
             </tr>
             <tr>
                 <td>上午</td>
@@ -678,7 +678,7 @@ export default {
                           }
 
                          //礼拜三晚上
-                         if(this.scheduleCountList[j].schedule_week == 3 && this.scheduleCountList[j].schedule_type == 2){
+                         if(this.scheduleCountList[j].schedule_week == 3 && this.scheduleCountList[j].schedule_type == 3){
                             
                               newArr[i].Wed_N.patient = this.scheduleCountList[j].Count
                           }
@@ -686,76 +686,76 @@ export default {
 
 
                         //礼拜四上午
-                         if(this.scheduleCountList[j].schedule_week == 3 && this.scheduleCountList[j].schedule_type == 1){
+                         if(this.scheduleCountList[j].schedule_week == 4 && this.scheduleCountList[j].schedule_type == 1){
                             
-                              newArr[i].Thurs_A.patient = this.scheduleCountList[j].Count
+                              newArr[i].Thurs_M.patient = this.scheduleCountList[j].Count
                           } 
 
                          //礼拜四下午
-                         if(this.scheduleCountList[j].schedule_week == 3 && this.scheduleCountList[j].schedule_type == 2){
+                         if(this.scheduleCountList[j].schedule_week == 4 && this.scheduleCountList[j].schedule_type == 2){
                             
-                              newArr[i].Thurs_M.patient = this.scheduleCountList[j].Count
+                              newArr[i].Thurs_A.patient = this.scheduleCountList[j].Count
                           }
 
                          //礼拜四晚上
-                         if(this.scheduleCountList[j].schedule_week == 3 && this.scheduleCountList[j].schedule_type == 2){
+                         if(this.scheduleCountList[j].schedule_week == 4 && this.scheduleCountList[j].schedule_type == 3){
                             
                               newArr[i].Thurs_N.patient = this.scheduleCountList[j].Count
                           }
 
 
                         //礼拜五上午
-                         if(this.scheduleCountList[j].schedule_week == 3 && this.scheduleCountList[j].schedule_type == 1){
+                         if(this.scheduleCountList[j].schedule_week == 5 && this.scheduleCountList[j].schedule_type == 1){
                             
-                              newArr[i].Fri_A.patient = this.scheduleCountList[j].Count
+                              newArr[i].Fri_M.patient = this.scheduleCountList[j].Count
                           } 
 
                          //礼拜五下午
-                         if(this.scheduleCountList[j].schedule_week == 3 && this.scheduleCountList[j].schedule_type == 2){
+                         if(this.scheduleCountList[j].schedule_week == 5 && this.scheduleCountList[j].schedule_type == 2){
                             
-                              newArr[i].Fri_M.patient = this.scheduleCountList[j].Count
+                              newArr[i].Fri_A.patient = this.scheduleCountList[j].Count
                           }
 
                          //礼拜五晚上
-                         if(this.scheduleCountList[j].schedule_week == 3 && this.scheduleCountList[j].schedule_type == 2){
+                         if(this.scheduleCountList[j].schedule_week == 5 && this.scheduleCountList[j].schedule_type == 3){
                             
                               newArr[i].Fri_N.patient = this.scheduleCountList[j].Count
                           }
 
 
                         //礼拜六上午
-                         if(this.scheduleCountList[j].schedule_week == 3 && this.scheduleCountList[j].schedule_type == 1){
+                         if(this.scheduleCountList[j].schedule_week == 6 && this.scheduleCountList[j].schedule_type == 1){
                             
-                              newArr[i].Sat_A.patient = this.scheduleCountList[j].Count
+                              newArr[i].Sat_M.patient = this.scheduleCountList[j].Count
                           } 
 
                          //礼拜六下午
-                         if(this.scheduleCountList[j].schedule_week == 3 && this.scheduleCountList[j].schedule_type == 2){
+                         if(this.scheduleCountList[j].schedule_week == 6 && this.scheduleCountList[j].schedule_type == 2){
                             
-                              newArr[i].Sat_M.patient = this.scheduleCountList[j].Count
+                              newArr[i].Sat_A.patient = this.scheduleCountList[j].Count
                           }
 
                          //礼拜六晚上
-                         if(this.scheduleCountList[j].schedule_week == 3 && this.scheduleCountList[j].schedule_type == 2){
+                         if(this.scheduleCountList[j].schedule_week == 6 && this.scheduleCountList[j].schedule_type == 3){
                             
                               newArr[i].Sat_N.patient = this.scheduleCountList[j].Count
                           }
                          
 
                           //礼拜日上午
-                         if(this.scheduleCountList[j].schedule_week == 3 && this.scheduleCountList[j].schedule_type == 1){
+                         if(this.scheduleCountList[j].schedule_week == 7 && this.scheduleCountList[j].schedule_type == 1){
                             
-                              newArr[i].Sun_A.patient = this.scheduleCountList[j].Count
+                              newArr[i].Sun_M.patient = this.scheduleCountList[j].Count
                           } 
 
                          //礼拜日下午
-                         if(this.scheduleCountList[j].schedule_week == 3 && this.scheduleCountList[j].schedule_type == 2){
+                         if(this.scheduleCountList[j].schedule_week == 7 && this.scheduleCountList[j].schedule_type == 2){
                             
-                              newArr[i].Sun_M.patient = this.scheduleCountList[j].Count
+                              newArr[i].Sun_A.patient = this.scheduleCountList[j].Count
                           }
 
                          //礼拜日晚上
-                         if(this.scheduleCountList[j].schedule_week == 3 && this.scheduleCountList[j].schedule_type == 2){
+                         if(this.scheduleCountList[j].schedule_week == 7 && this.scheduleCountList[j].schedule_type == 3){
                             
                               newArr[i].Sun_N.patient = this.scheduleCountList[j].Count
                           }
@@ -793,7 +793,7 @@ export default {
             return [weekArr[week], typeArr[schedule_type]];
         },
         printAction: function() {
-            const style = '@media print {#scheduleTable{font-size:14px;} .scheduleTable tr td{text-align: center;padding: 5px;}}'
+            const style = '@media print {#scheduleTable{font-size:16px;} .scheduleTable tr td{text-align: center;padding: 5px;}}'
 
             printJS({
             printable: 'scheduleTable',
@@ -818,13 +818,14 @@ export default {
                theType = 4
             }
            var partionStr = this.partition_id
+           console.log("partionStr",partionStr)
             var arr = this.zoneIdList.join(',')
             var str = ""
             if(partionStr == 0){
                 str = arr
             }
             if(partionStr != 0){
-                str = partionStr.join(',')
+                str = partionStr
             }
             var params = {
              weekTime:theType,