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

src/api/advice.js

@@ -604,3 +604,22 @@ export function getDocAdviceByPatientId(params){
     params:params,
   })
 }
+
+
+export function getDoctorAdviceMonthList(params){
+ 
+  return request({
+    url:"/api/schedule/getdoctoradvicemonthlist",
+    method:"get",
+    params:params,
+  })
+}
+
+export function getHisPrescrptionProjectMonthList(params){
+
+  return request({
+    url:"/api/schedule/gethisprescriptionprojectmonthlist",
+    method:"get",
+    params:params
+  })
+}

src/api/config.js

@@ -251,4 +251,13 @@ export function getSelfPrintList(params){
     method:"get",
     params:params,
   })
+}
+
+export function changeDrugCodeOpen(params){
+ 
+  return request({
+    url:"/api/changedrugcodeopen",
+    method:"get",
+    params:params
+  })
 }

src/api/pharmacy.js

@@ -173,4 +173,13 @@ export function updateDrugInventoryWarehouseInfo(params){
     method:"get",
     params:params
   })
+}
+
+export function changeDrugCode(params){
+
+  return request({
+    url:"/api/pharmacy/changedrugcode",
+    method:"get",
+    params:params,
+  })
 }

src/router/modules/dialysis.js

@@ -120,6 +120,30 @@ export default {
       }
     },
 
+    {
+      path: '/dialysis/doctorMonthAdviceStaticPrint',
+      component: () => import('@/xt_pages/dialysis/doctorAdviceMonthStaticPrint'),
+      name: '透析医嘱月统计打印',
+      hidden: true,
+      is_menu: false,
+      meta: {
+        title: '透析医嘱月统计打印',
+        noCache: true
+      }
+    },
+
+    {
+      path: '/dialysis/dialysisRecordPrint',
+      component: () => import('@/xt_pages/user/dialysisRecordPrint'),
+      name: '并发症打印',
+      hidden: true,
+      is_menu: false,
+      meta: {
+        title: '并发症打印',
+        noCache: true
+      }
+    },
+
     {
       path: '/dialysis/doctorNewAdviceStaticPrint',
       component: () => import('@/xt_pages/dialysis/doctorNewAdviceStaticPrint'),
@@ -155,6 +179,17 @@ export default {
         noCache: true
       }
     },
+    {
+      path: '/dialysis/doctocAdviceProjectPrint',
+      component: () => import('@/xt_pages/dialysis/doctorAdviceProjectPrint'),
+      name: '透析耗材统计打印',
+      hidden: true,
+      is_menu: false,
+      meta: {
+        title: '透析耗材统计打印',
+        noCache: true
+      }
+    },
 
     {
       path: '/dialysis/signPrint',

src/xt_pages/Dialysisanalysis/weightblood/components/blood_table.vue

@@ -53,7 +53,7 @@
               </el-select>
             </div>
             <div>
-              患者状态:
+              统计类型:
               <el-select v-model="blood_value" placeholder="请选择" style="width: 100px;">
                 <el-option :key="0" label="不限" :value="0"></el-option>
                 <el-option

src/xt_pages/Pharmacy/DrugDispensing.vue

@@ -195,14 +195,14 @@
             <el-table-column
               type="index"
               label="序号"
-              width="120"
+              width="50"
               align="center"
             >
             </el-table-column>
             <el-table-column
               prop="name"
               label="患者名称"
-              width="180"
+              width="100"
               align="center"
             >
               <template slot-scope="scope">
@@ -212,7 +212,7 @@
             <el-table-column
               prop="name"
               label="单次用量"
-              width="170"
+              width="100"
               align="center"
             >
               <template slot-scope="scope">
@@ -222,7 +222,7 @@
             <el-table-column
               prop="name"
               label="用法"
-              width="160"
+              width="100"
               align="center"
             >
               <template slot-scope="scope">
@@ -232,7 +232,7 @@
             <el-table-column
               prop="name"
               label="频率"
-              width="160"
+              width="100"
               align="center"
             >
               <template slot-scope="scope">
@@ -242,7 +242,7 @@
             <el-table-column
               prop="name"
               label="天数"
-              width="160"
+              width="100"
               align="center"
             >
               <template slot-scope="scope">
@@ -252,17 +252,22 @@
             <el-table-column
               prop="name"
               label="总量"
-              width="160"
+              width="100"
               align="center"
             >
               <template slot-scope="scope">
                 {{ scope.row.total }}
               </template>
             </el-table-column>
+            <el-table-column label="药品追溯码" width="162" align="center">
+              <template slot-scope="scope">
+                 <el-input style="width: 100;" v-model="scope.row.DrugCode" @input="changeDrugCode(scope.row.ID,scope.row.DataSources,scope.row.DrugCode)"></el-input>
+              </template>
+            </el-table-column>
             <el-table-column
               prop="name"
               label="数据来源"
-              width="162"
+              width="102"
               align="center"
             >
               <template slot-scope="scope">
@@ -454,6 +459,7 @@ import {
   getcurrentname,
   getpartitionlist,
   routeofadministration,
+  changeDrugCode
 } from "@/api/pharmacy";
 const moment = require("moment");
 export default {
@@ -506,6 +512,29 @@ export default {
   },
 
   methods: {
+    changeDrugCode(id,DataSources,drug_code){
+       var is_source =0
+       if (DataSources == "his处方"){
+        is_source = 1
+       }
+       if (DataSources == "临时医嘱"){
+         is_source = 2
+       }
+       var params = {
+        id:id,
+        data_source:is_source,
+        drug_code:drug_code,
+       }
+       console.log("paramss",params)
+      
+      changeDrugCode(params).then(response=>{
+         if(response.data.state == 1){
+            this.$message.success("保存成功!")
+         }
+      })
+    
+
+    },
     tt() {},
     async fun3() {
       this.fun1().then((val) => {

src/xt_pages/Pharmacy/PatientDispensing.vue

@@ -178,11 +178,11 @@
             <el-table-column
               type="index"
               label="序号"
-              width="120"
+              width="50"
               align="center"
             >
             </el-table-column>
-            <el-table-column label="名称" width="200" align="center">
+            <el-table-column label="名称" width="100" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.Name ? scope.row.Name : "" }}</span>
               </template>
@@ -226,6 +226,11 @@
                 <span>{{ getManutuer(scope.row.DrugId) }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="药品追溯码" width="162" align="center">
+              <template slot-scope="scope">
+                 <el-input style="width: 100;" v-model="scope.row.DrugCode" @input="changeDrugCode(scope.row.ID,scope.row.DataSources,scope.row.DrugCode)"></el-input>
+              </template>
+            </el-table-column>
             <el-table-column label="开立医生" width="150" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.Doctor ? scope.row.Doctor : "" }}</span>
@@ -243,6 +248,8 @@
                 <span>{{getDrugName(scope.row.DrugId)}}</span>
               </template>
             </el-table-column>
+
+        
             <el-table-column label="备注" width="170" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.Remarks ? scope.row.Remarks : "" }}</span>
@@ -304,7 +311,9 @@ import {
   dispensingmedicine,
   drugwithdrawal,
   getpartitionlist,
+  changeDrugCode
 } from "@/api/pharmacy";
+import dataDruguse from "../../router/modules/dataDruguse";
 const moment = require("moment");
 export default {
   components: {
@@ -792,6 +801,28 @@ export default {
          }
        }
        return spc
+    },
+    changeDrugCode(id,DataSources,drug_code){
+       var is_source =0
+       if (DataSources == "his处方"){
+        is_source = 1
+       }
+       if (DataSources == "临时医嘱"){
+         is_source = 2
+       }
+       var params = {
+        id:id,
+        data_source:is_source,
+        drug_code:drug_code,
+       }
+       console.log("paramss",params)
+      changeDrugCode(params).then(response=>{
+         if(response.data.state == 1){
+            this.$message.success("保存成功!")
+         }
+      })
+    
+
     }
   },
 };

src/xt_pages/data/basicConfig.vue

@@ -57,6 +57,11 @@
             <p style="margin-top:20px;">药品在执行时自备药出库：
                <el-switch v-model="self_drug_out_open" @change="changeSelfPrescriptionOutOpen"></el-switch>
             </p>
+
+            
+            <p style="margin-top:20px;">药品在患者发药显示：
+               <el-switch v-model="drug_code_open" @change="changeDrugCodeOpen"></el-switch>
+            </p>
         </div>
 
 
@@ -112,7 +117,7 @@
 
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
-import { getAllIsOpenInit,postXtHisIsOpen,postMonitorIsOpen,changeFuncPrint,getDataPrintList,postXtHisProjectIsOpen,changeStockSetting,changeAdviceConfig,changePrescriptionConfig,changeDrugOpenConfig,changeSettleOpenConfig,changeGoodOutOpen,changeSelfPrescriptionOpen,changeSelfPrescriptionOutOpen,getSelfPrintList} from '@/api/config'
+import { getAllIsOpenInit,postXtHisIsOpen,postMonitorIsOpen,changeFuncPrint,getDataPrintList,postXtHisProjectIsOpen,changeStockSetting,changeAdviceConfig,changePrescriptionConfig,changeDrugOpenConfig,changeSettleOpenConfig,changeGoodOutOpen,changeSelfPrescriptionOpen,changeSelfPrescriptionOutOpen,getSelfPrintList,changeDrugCodeOpen} from '@/api/config'
 
 export default {
   name: "printTemplate",
@@ -137,7 +142,8 @@ export default {
       drug_settle_open:false,
       good_out_open:false,
       self_prescription_out_open:false,
-      self_drug_out_open:false
+      self_drug_out_open:false,
+      drug_code_open:false,
     };
   },
   methods: {
@@ -195,6 +201,12 @@ export default {
               this.good_out_open = false
             }
 
+            if(response.data.data.is_code_open == 1){
+               this.drug_code_open = true
+            }else{
+                this.drug_code_open = false
+            }
+
           } else {
             this.$message.error(response.data.msg)
           }
@@ -536,7 +548,27 @@ export default {
            }
         }
       })
+    },
+    changeDrugCodeOpen(){
+
+      var drug_out_open = 0 
+        if(this.drug_code_open == true){
+          drug_out_open = 1
+        }
+        if(this.drug_code_open == false){
+          drug_out_open = 2
+        }
+        var params = {
+          is_open:drug_out_open,
+        }
+      changeDrugCodeOpen(params).then(response=>{
+         if(response.data.state ==1){
+           var drugCodeOpen = response.data.data.drugCodeOpen
+           this.$message.success("保存成功!")
+         }
+      })
     }
+    
   },
   created() {
     this.getInitIsOpenConfig()

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -825,6 +825,72 @@
                           >
                           HDF1000
                           </div>
+                          <div
+                            class="under_line"
+                            style="
+                              width: 100px;
+                              text-align: center;
+                              font-weight: 600;
+                            "
+                            v-if="record.prescription.mode_id == 38"
+                          >
+                          HDF80
+                          </div>
+                          <div
+                            class="under_line"
+                            style="
+                              width: 100px;
+                              text-align: center;
+                              font-weight: 600;
+                            "
+                            v-if="record.prescription.mode_id == 39"
+                          >
+                          HF16
+                          </div>
+                          <div
+                            class="under_line"
+                            style="
+                              width: 100px;
+                              text-align: center;
+                              font-weight: 600;
+                            "
+                            v-if="record.prescription.mode_id == 40"
+                          >
+                           HD(无肝素)
+                          </div>
+                          <div
+                            class="under_line"
+                            style="
+                              width: 100px;
+                              text-align: center;
+                              font-weight: 600;
+                            "
+                            v-if="record.prescription.mode_id == 41"
+                          >
+                           HDF17H
+                          </div>
+                          <div
+                            class="under_line"
+                            style="
+                              width: 100px;
+                              text-align: center;
+                              font-weight: 600;
+                            "
+                            v-if="record.prescription.mode_id == 42"
+                          >
+                           HD.
+                          </div>
+                          <div
+                            class="under_line"
+                            style="
+                              width: 100px;
+                              text-align: center;
+                              font-weight: 600;
+                            "
+                            v-if="record.prescription.mode_id == 43"
+                          >
+                          HD(2)
+                          </div>
                         </div>
                       </div>
 

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -615,7 +615,8 @@
         </div>
       </div>
 
-      <div style="margin-left: 1050px; margin-bottom: 10px;">
+      <div style="margin-left: 1100px; margin-bottom: 10px;">
+        <el-button type="primary" size="small" @click="printOrder">透析并发症登记打印</el-button>
         <el-button type="primary" size="small" @click="toExport">导出</el-button>
       </div>
 
@@ -1884,6 +1885,10 @@ export default {
     // this.template_id = this.$store.getters.xt_user.template_info.template_id;
   },
   methods: {
+   
+    printOrder(){
+      this.$router.push({ path: "/dialysis/dialysisRecordPrint",query:{page:this.listQuery.page,limit:this.listQuery.limit,schedul_type:this.listQuery.schedul_type,partition_type:this.listQuery.partition_type,schedul_time:this.listQuery.schedul_time,keywords:this.listQuery.keywords,start_time:this.listQuery.start_time,end_time:this.listQuery.end_time}} );
+    },
     getTemplateInfo() {
       getPrintTemplate().then(response => {
         if (response.data.state == 0) {

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -23,7 +23,10 @@
          <li v-if="isShow('置换速度')&& this.$store.getters.xt_user.template_info.org_id!=10375">
           <label>置换速度 : </label>
           <span class="content">{{displace_speed }}</span>
-            <span class="unit">L/h</span>
+            <span class="unit">
+              <span v-if="this.$store.getters.xt_user.template_info.org_id!=10414">L/h</span>
+              <span v-if="this.$store.getters.xt_user.template_info.org_id==10414">ml/min</span>
+            </span>
         </li>
 
         <li v-if="isShow('置换速度') && this.$store.getters.xt_user.template_info.org_id == 10375">

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

@@ -4739,7 +4739,8 @@ mu
         id === 14 ||
         id === 15 ||
         id === 16 ||
-        id === 19
+        id === 19 ||
+        id === 42
       ) {
         this.zhiShow = false
         this.huShow = false

src/xt_pages/dialysis/doctorAdviceMonthStaticPrint.vue

@@ -0,0 +1,367 @@
+<template>
+    <div class="main-contain">
+      <div class="position">
+        <bread-crumb :crumbs="crumbs"></bread-crumb>
+        <el-row style="float:right;">
+          <el-col :span="24">
+            <el-button size="small" icon="el-icon-printer" type="primary" @click="printAction">打印</el-button>
+          </el-col>
+        </el-row>
+      </div>
+      <div class="app-container" style="background-color: white;">
+  
+        <div id="print_content">
+          <div class="print_main_content">
+            <div class="order_title_panl">
+              <span class="main_title"> &nbsp;
+                透析药品
+              </span>
+              <span  style="float:right;">打印日期: &nbsp;
+                  {{ getNowTime() }}
+              </span>
+            </div>
+            <div class="table_panel">
+  
+              <table class="table">
+                <thead>
+                <tr>
+                  <td width="50">序号</td>
+                  <td width="100">药品名称</td>
+                  <td width="100">规格</td>
+                  <td width="100">数量</td>
+                  <td width="100">厂家</td>
+                </tr>
+                </thead>
+                <tbody>
+                 <tr v-for="(item,i) in tableMonthList" :key="i">
+                  <td>{{i+1}}</td>
+                  <td>{{item.advice_name}}</td>
+                   <td>{{item.specification_name}}</td>
+                  <td>
+                    <span v-if="config.is_open == 1">{{getHisCount(item.child,item.max_unit,item.min_unit,item.min_number)}}</span>
+                    <span v-if="config.is_open != 1">{{getCount(item.child)}}</span>
+                  </td>
+                  <td width="100">{{item.manufacturer_name}}</td>
+                 </tr>
+                </tbody>
+              </table>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </template>
+  
+  <script>
+    import { getDoctorAdviceMonthList } from '@/api/advice'
+    import { parseTime } from '@/utils'
+    import { uParseTime } from '@/utils/tools'
+    import BreadCrumb from '@/xt_pages/components/bread-crumb'
+    import print from 'print-js'
+    import { getDataConfig } from '@/utils/data'
+    export default {
+      name: 'SchedulePrint',
+      data() {
+        return {
+          crumbs: [
+            { path: false, name: '排班管理' },
+            { path: false, name: '排班打印' }
+          ],
+          td_1_width: '8%',
+          td_2_width: '8%',
+          td_3_width: '64%',
+          td_4_width: '20%',
+          month: 1,
+          begin_day: 1,
+          total:[],
+          list:[],
+          schedule_date:"",
+          schedule_type:0,
+          partition_type:0,
+          keywords:"",
+          loading:false,
+          tableData:[],
+          numberList:[],
+          partitionArr:[],
+          his_config:{},
+          typeList:[],
+          rowList:[],
+          dialysate_formulation:[],
+          body_fluid_option:[],
+          displace_liqui_part_option:[],
+          blood_access_option:[],
+          hemodialysisPipelinesOptions:[],
+          tableList:[],
+          druglist:[],
+          config:{},
+          org_id:0,
+          manufacturerList:[],
+          tableMonthList:[]
+        }
+      },
+      components: {
+        BreadCrumb
+      },
+      created() {
+        this.org_id = this.$store.getters.xt_user.template_info.org_id;
+        this.getlist()
+      },
+      methods: {
+       getNowTime: function () {
+        let dateTime;
+        let yy = new Date().getFullYear();
+        let mm = new Date().getMonth() + 1;
+        let dd = new Date().getDate();
+        
+        dateTime = yy + '-' + mm + '-' + dd
+        return dateTime
+       },
+        getlist(){
+        var params = {
+          start_time:this.$route.query.start_time,
+          end_time:this.$route.query.end_time
+        }
+        getDoctorAdviceMonthList(params).then(response=>{
+          if(response.data.state == 1){
+            var config = response.data.data.config
+            this.config = {}
+            this.config = config
+            var drugs = response.data.data.drugs
+            this.druglist = []
+            this.druglist = drugs
+            var manufacturerList =  response.data.data.manufacturerList
+            this.manufacturerList = []
+            this.manufacturerList = manufacturerList
+            var adviceMonthList = response.data.data.adviceList
+            var hisAdviceMonthList = response.data.data.hisAdviceList
+            if(config.is_open == 1){
+               
+              if(hisAdviceMonthList!=null && hisAdviceMonthList.length>0){
+                let dataInfo = {}
+                hisAdviceMonthList.forEach((item, index) => {
+                let { drug_id } = item
+                if (!dataInfo[drug_id])  {
+                  dataInfo[drug_id] = {
+                    drug_id:item.drug_id,
+                    advice_name:item.advice_name,
+                    manufacturer_name:this.getManufacturer(item.drug.manufacturer),
+                    specification_name:item.drug.dose + item.drug.dose_unit +"*"+item.drug.min_number+item.drug.min_unit+"/"+item.drug.max_unit,
+                    max_unit:item.drug.max_unit,
+                    min_unit:item.drug.min_unit,
+                    min_number:item.drug.min_number,
+                    child: [],
+                  }
+                }
+               })
+                let newArr = Object.values(dataInfo)
+                console.log("newArr----------------",newArr)
+                if(newArr!=null && newArr.length>0){
+                   for(let i=0;i<newArr.length;i++){
+                     for(let j=0;j<hisAdviceMonthList.length;j++){
+                       if(newArr[i].drug_id == hisAdviceMonthList[j].drug_id){
+                           newArr[i].child.push(hisAdviceMonthList[j])
+                       }
+                     }
+                   }
+                }
+                this.tableMonthList = []
+                this.tableMonthList = newArr
+
+              }
+            }
+
+            if(config.is_open == 2 || config.is_open ==0){
+             
+              if(adviceMonthList!=null && adviceMonthList.length>0){
+                 
+                if(adviceMonthList!=null && adviceMonthList.length > 0){
+                  let dataInfo = {}
+                  adviceMonthList.forEach((item, index) => {
+                  item.advice_name = item.advice_name.replace(/\s/g,"")
+                  let { advice_name } = item
+                  if (!dataInfo[advice_name]) {
+                      dataInfo[advice_name] = {
+                      advice_name:item.advice_name,
+                      child: [],
+                      count:0,
+                      specification_name:item.advice_desc +item.drug_spec_unit,
+                      manufacturer_name:""
+                    }
+                  }
+                  })
+                  let arr = Object.values(dataInfo)
+                  for(let i=0;i<arr.length;i++){
+                    for(let j=0;j<adviceMonthList.length;j++){
+                    if(arr[i].advice_name == adviceMonthList[j].advice_name){
+                        arr[i].child.push(adviceMonthList[j])
+                    }
+                  }
+                  }
+                   this.tableMonthList = []
+                   this.tableMonthList = arr
+                   console.log("hhhhhhhhhhhhhh",this.tableMonthList)
+                  }
+              }
+            }
+          }
+        })
+
+
+        console.log("params-=----",params)
+
+      },
+       getTimeOne(val) {
+          if(val == ""){
+          return ""
+          }else {
+          return uParseTime(val, '{y}-{m}-{d}')
+          }
+       },
+       getCount(val){
+         var count = 0
+         if(val!=null && val.length > 0){
+          for(let i=0;i<val.length;i++){
+            count += parseInt(val[i].prescribing_number)
+          }
+         }
+         if(count > 0){
+          return count
+         }else{
+          return 0
+         }
+       },
+      printAction: function() {
+      const style = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } }'
+  
+      printJS({
+          printable: 'print_content',
+          type: 'html',
+          documentTitle: '  ',
+          style: style,
+          scanStyles: false
+       })
+      },
+      getSpecification(id){
+          var specification_name = ""
+          for(let i=0;i<this.druglist.length;i++){
+            if(id == this.druglist[i].id){
+              specification_name = this.druglist[i].dose+this.druglist[i].dose_unit +"*"+this.druglist[i].min_number+this.druglist[i].min_unit +"/"+this.druglist[i].max_unit
+            }
+          }
+          return specification_name
+        },
+       getHisCount(val,max_unit,min_unit,min_number){
+          var total = 0
+          var max_str = "";
+          var min_str = "";
+          for(let i=0;i<val.length;i++){
+            total+=parseInt(val[i].prescribing_number)
+          }
+          if (total < min_number) {
+          min_str = total + min_unit;
+        }
+        if (total == 0) {
+          min_str = "";
+          max_str = "";
+        }
+        if (total >= min_number) {
+          if (parseInt(total / min_number) != 0) {
+            max_str = parseInt(total / min_number) + max_unit;
+          }
+          if (total % min_number != 0) {
+            min_str = (total % min_number) + min_unit;
+          }
+        }
+        return max_str + min_str;
+          
+        },
+        getManufacturer(id){
+          var  manufacturer_name = ""
+          for(let i=0;i<this.manufacturerList.length;i++){
+              if(id== this.manufacturerList[i].id){
+                manufacturer_name = this.manufacturerList[i].manufacturer_name
+              }
+          }
+          return manufacturer_name
+      }
+     }
+    }
+  </script>
+  
+  <style rel="stylesheet/scss" lang="scss" scoped>
+    .print_main_content {
+      background-color: white;
+      width: 960px;
+      margin: 0 auto;
+      padding: 0 0 20px 0;
+  
+    .order_title_panl {
+      text-align: center;
+  
+    .main_title {
+      font-size: 18px;
+      line-height: 40px;
+      font-weight: 500;
+    }
+  
+    }
+    .table_panel {
+  
+    .table {
+      width: 100%;
+      border: 1px solid;
+      border-collapse: collapse;
+      padding: 2px;
+  
+    thead {
+  
+    tr {
+  
+    td {
+      border: 1px solid;
+      text-align: center;
+      font-size: 20px;
+      padding: 15px 5px;
+    }
+  
+    }
+    }
+    tbody {
+  
+    tr {
+  
+    td {
+      border: 1px solid;
+      text-align: center;
+      font-size: 18px;
+      padding: 10px 5px;
+  
+    .proj {
+      padding: 5px 0;
+      text-align: left;
+  
+    .proj_title {
+      font-size: 16px;
+      font-weight: 500;
+      line-height: 25px;
+    }
+  
+    .proj_item {
+      font-size: 15px;
+      line-height: 20px;
+  
+    .zone_name {
+      font-weight: 500;
+    }
+  
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+  </style>
+  
+  

src/xt_pages/dialysis/doctorAdviceProjectPrint.vue

@@ -0,0 +1,309 @@
+<template>
+    <div class="main-contain">
+      <div class="position">
+        <bread-crumb :crumbs="crumbs"></bread-crumb>
+        <el-row style="float:right;">
+          <el-col :span="24">
+            <el-button size="small" icon="el-icon-printer" type="primary" @click="printAction">打印</el-button>
+          </el-col>
+        </el-row>
+      </div>
+      <div class="app-container" style="background-color: white;">
+  
+        <div id="print_content">
+          <div class="print_main_content">
+            <div class="order_title_panl">
+              <span class="main_title"> &nbsp;
+                透析耗材
+              </span>
+              <span  style="float:right;">打印日期: &nbsp;
+                {{ getNowTime() }}
+              </span>
+            </div>
+            <div class="table_panel">
+  
+              <table class="table">
+                <thead>
+                <tr>
+                  <td width="50">序号</td>
+                  <td width="100">耗材名称</td>
+                  <td width="100">规格</td>
+                  <td width="100">数量</td>
+                  
+                </tr>
+                </thead>
+                <tbody>
+                 <tr v-for="(item,i) in tableProjectList" :key="i">
+                  <td>{{i+1}}</td>
+                  <td>{{item.good_name}}</td>
+                   <td>{{item.specification_name}}</td>
+                  <td>
+                    {{item.count}}
+                  </td>
+                 </tr>
+                </tbody>
+              </table>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </template>
+  
+  <script>
+    import { getHisPrescrptionProjectMonthList  } from '@/api/advice'
+    import { parseTime } from '@/utils'
+    import { uParseTime } from '@/utils/tools'
+    import BreadCrumb from '@/xt_pages/components/bread-crumb'
+    import print from 'print-js'
+    import { getDataConfig } from '@/utils/data'
+    export default {
+      name: 'SchedulePrint',
+      data() {
+        return {
+          crumbs: [
+            { path: false, name: '排班管理' },
+            { path: false, name: '排班打印' }
+          ],
+          td_1_width: '8%',
+          td_2_width: '8%',
+          td_3_width: '64%',
+          td_4_width: '20%',
+          month: 1,
+          begin_day: 1,
+          total:[],
+          list:[],
+          schedule_date:"",
+          schedule_type:0,
+          partition_type:0,
+          keywords:"",
+          loading:false,
+          tableData:[],
+          numberList:[],
+          partitionArr:[],
+          his_config:{},
+          typeList:[],
+          rowList:[],
+          dialysate_formulation:[],
+          body_fluid_option:[],
+          displace_liqui_part_option:[],
+          blood_access_option:[],
+          hemodialysisPipelinesOptions:[],
+          tableList:[],
+          druglist:[],
+          config:{},
+          tableProjectList:[]
+        }
+      },
+      components: {
+        BreadCrumb
+      },
+      created() {
+        this.getlist()
+      },
+      methods: {
+       getNowTime: function () {
+            let dateTime;
+            let yy = new Date().getFullYear();
+            let mm = new Date().getMonth() + 1;
+            let dd = new Date().getDate();
+            
+            dateTime = yy + '-' + mm + '-' + dd
+            return dateTime
+       },
+       getlist(){
+        var params = {
+          start_time:this.$route.query.start_time,
+          end_time:this.$route.query.end_time
+        }
+        getHisPrescrptionProjectMonthList(params).then(response=>{
+          if(response.data.state ==1){
+            var projectMonthList = response.data.data.projectMonthList
+            console.log("projectMonthList",projectMonthList)
+
+            if(projectMonthList!=null && projectMonthList.length>0){
+              
+              let dataInfo = {}
+              projectMonthList.forEach((item, index) => {
+              let { project_id } = item
+              if (!dataInfo[project_id]) {
+                dataInfo[project_id] = {
+                  project_id:item.project_id,
+                  good_name:item.good_info.good_name,
+                  specification_name:item.good_info.specification_name,
+                  child: [],
+                  count:0,
+                }
+              }
+            })
+            let arr = Object.values(dataInfo)
+
+            if(arr!=null && arr.length >0){
+                for(let i =0;i<arr.length;i++){
+                  for(let j=0;j<projectMonthList.length;j++){
+                    if(arr[i].project_id == projectMonthList[j].project_id){
+                        arr[i].child.push(projectMonthList[j])
+                    }
+                  }
+                }
+                for(let i =0;i<arr.length;i++){
+                  for(let j=0;j<arr[i].child.length;j++){
+                    arr[i].count += parseInt(arr[i].child[j].count)
+                  }
+                }
+
+                console.log("arr0000000000000000000000",arr)
+                this.tableProjectList = []
+                this.tableProjectList = arr
+
+             }
+            }
+          }
+        })
+       },
+       getTimeOne(val) {
+          if(val == ""){
+          return ""
+          }else {
+          return uParseTime(val, '{y}-{m}-{d}')
+          }
+       },
+       getCount(val){
+         var count = 0
+         if(val!=null && val.length > 0){
+          for(let i=0;i<val.length;i++){
+            count += parseInt(val[i].prescribing_number)
+          }
+         }
+         if(count > 0){
+          return count
+         }else{
+          return 0
+         }
+       },
+      printAction: function() {
+      const style = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } }'
+  
+      printJS({
+          printable: 'print_content',
+          type: 'html',
+          documentTitle: '  ',
+          style: style,
+          scanStyles: false
+       })
+      },
+      getSpecification(id){
+          var specification_name = ""
+          for(let i=0;i<this.druglist.length;i++){
+            if(id == this.druglist[i].id){
+              specification_name = this.druglist[i].dose+this.druglist[i].dose_unit +"*"+this.druglist[i].min_number+this.druglist[i].min_unit +"/"+this.druglist[i].max_unit
+            }
+          }
+          return specification_name
+        },
+       getHisCount(val,max_unit,min_unit,min_number){
+          var total = 0
+          var max_str = "";
+          var min_str = "";
+          for(let i=0;i<val.length;i++){
+            total+=parseInt(val[i].prescribing_number)
+          }
+          if (total < min_number) {
+          min_str = total + min_unit;
+        }
+        if (total == 0) {
+          min_str = "";
+          max_str = "";
+        }
+        if (total >= min_number) {
+          if (parseInt(total / min_number) != 0) {
+            max_str = parseInt(total / min_number) + max_unit;
+          }
+          if (total % min_number != 0) {
+            min_str = (total % min_number) + min_unit;
+          }
+        }
+        return max_str + min_str;
+          
+        },
+     }
+    }
+  </script>
+  
+  <style rel="stylesheet/scss" lang="scss" scoped>
+    .print_main_content {
+      background-color: white;
+      width: 960px;
+      margin: 0 auto;
+      padding: 0 0 20px 0;
+  
+    .order_title_panl {
+      text-align: center;
+  
+    .main_title {
+      font-size: 18px;
+      line-height: 40px;
+      font-weight: 500;
+    }
+  
+    }
+    .table_panel {
+  
+    .table {
+      width: 100%;
+      border: 1px solid;
+      border-collapse: collapse;
+      padding: 2px;
+  
+    thead {
+  
+    tr {
+  
+    td {
+      border: 1px solid;
+      text-align: center;
+      font-size: 20px;
+      padding: 15px 5px;
+    }
+  
+    }
+    }
+    tbody {
+  
+    tr {
+  
+    td {
+      border: 1px solid;
+      text-align: center;
+      font-size: 18px;
+      padding: 10px 5px;
+  
+    .proj {
+      padding: 5px 0;
+      text-align: left;
+  
+    .proj_title {
+      font-size: 16px;
+      font-weight: 500;
+      line-height: 25px;
+    }
+  
+    .proj_item {
+      font-size: 15px;
+      line-height: 20px;
+  
+    .zone_name {
+      font-weight: 500;
+    }
+  
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+  </style>
+  
+  

src/xt_pages/dialysis/newDoctorAdvice.vue

@@ -187,8 +187,13 @@
 
         <el-button type="primary" size="small" @click="toStaticOne" v-if="org_id == 9671 || org_id==10340">药品统计</el-button>
 
+
+        <el-button type="primary" size="small" @click="toStaticThree">药品月统计</el-button>
+
         <el-button type="primary" size="small" @click="toStaticTwo">耗材统计</el-button>
 
+        <el-button type="primary" size="small" @click="toStaticFour">耗材月统计</el-button>
+
 
       </div>
 
@@ -815,6 +820,171 @@
         <el-button type="primary" @click="startdialogVisibleTwo = false">确 定</el-button>
       </span>
     </el-dialog>
+
+    <el-dialog
+      title="药品月统计表"
+      :visible.sync="startMothdialogVisible"
+      width="60%">
+      <span>
+        <div class="cell clearfix" style="margin-bottom:10px">
+          <label class="title"> <span class="name">日期查询</span> : </label>
+          开始:
+          <el-date-picker
+            v-model="start_time"
+            prefix-icon="el-icon-date"
+            :editable="false"
+            style="width: 250px;"
+            type="date"
+            placeholder="选择日期时间"
+            align="right"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+           
+        ></el-date-picker>
+          结束:
+          <el-date-picker
+            v-model="end_time"
+            prefix-icon="el-icon-date"
+            :editable="false"
+            style="width: 250px;"
+            type="date"
+            placeholder="选择日期时间"
+            align="right"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+           
+        ></el-date-picker>
+           <el-button size="small"  @click="getAllQuery" type="primary">查询</el-button>
+           <el-button size="small" icon="el-icon-printer"  @click="toPrintTen" type="primary">打印</el-button>
+           <el-button size="small"  @click="toExportListThree" type="primary">导出</el-button>
+        </div>
+     
+      <el-table
+        :data="tableMonthList"
+        border
+        :row-style="{ color: '#303133' }"
+        :header-cell-style="{
+          backgroundColor: 'rgb(245, 247, 250)',
+          color: '#606266'
+        }"
+      >
+         <el-table-column  align="center"  label="序号">
+           <template slot-scope="scope">
+              {{scope.$index+1}}
+           </template>
+        </el-table-column>
+        <el-table-column  align="center"   label="药品名称">
+         <template slot-scope="scope">
+            {{scope.row.advice_name}}
+          </template>
+        </el-table-column>
+        <el-table-column  align="center"  label="规格">
+           <template slot-scope="scope">
+             {{scope.row.specification_name}}
+           </template>
+        </el-table-column>
+
+        <el-table-column  align="center"   label="数量">
+           <template slot-scope="scope">
+             <span v-if="config.is_open!=1">{{getCount(scope.row.child)}}</span>
+             <span v-if="config.is_open ==1">{{getHisCount(scope.row.child,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span>
+           </template>
+        </el-table-column>
+      
+        <el-table-column align="center" label="厂家">
+           <template slot-scope="scope">
+             {{scope.row.manufacturer_name}}
+           </template>
+        </el-table-column>
+
+
+      </el-table>
+      </span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="startMothdialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="startMothdialogVisible = false">确 定</el-button>
+      </span>
+    </el-dialog>
+
+
+    <el-dialog
+      title="耗材统计表"
+      :visible.sync="startMonthdialogVisible"
+      width="60%">
+      <span>
+        <div class="cell clearfix" style="margin-bottom:10px">
+          <label class="title"> <span class="name">日期查询</span> : </label>
+          开始:
+          <el-date-picker
+            v-model="start_time"
+            prefix-icon="el-icon-date"
+            :editable="false"
+            style="width: 250px;"
+            type="date"
+            placeholder="选择日期时间"
+            align="right"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+           
+        ></el-date-picker>
+          结束:
+          <el-date-picker
+            v-model="end_time"
+            prefix-icon="el-icon-date"
+            :editable="false"
+            style="width: 250px;"
+            type="date"
+            placeholder="选择日期时间"
+            align="right"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+           
+        ></el-date-picker>
+           <el-button size="small"  @click="getGoodAllQuery" type="primary">查询</el-button>
+           <el-button size="small" icon="el-icon-printer"  @click="toExportListFour" type="primary">打印</el-button>
+           <el-button size="small"  @click="toExportListFour" type="primary">导出</el-button>
+        </div>
+      <el-table
+        :data="tableProjectList"
+        border
+        :row-style="{ color: '#303133' }"
+        :header-cell-style="{
+          backgroundColor: 'rgb(245, 247, 250)',
+          color: '#606266'
+        }"
+      >
+         <el-table-column  align="center"  label="序号">
+           <template slot-scope="scope">
+              {{scope.$index+1}}
+           </template>
+        </el-table-column>
+        <el-table-column  align="center"   label="耗材名称">
+         <template slot-scope="scope">
+            {{scope.row.good_name}}
+          </template>
+        </el-table-column>
+        <el-table-column  align="center"  label="规格">
+           <template slot-scope="scope">
+             {{scope.row.specification_name}}
+           </template>
+        </el-table-column>
+
+        <el-table-column  align="center"   label="数量">
+           <template slot-scope="scope">
+              {{scope.row.count}}
+           </template>
+        </el-table-column>
+
+
+
+      </el-table>
+      </span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="startMonthdialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="startMonthdialogVisible = false">确 定</el-button>
+      </span>
+    </el-dialog>
+
     </div>
 
 
@@ -828,7 +998,7 @@ import { parseTime } from "@/utils";
 import { uParseTime } from '@/utils/tools'
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import { getPrintTemplate } from "@/api/data";
-import { getNewSchedualDoctors,excutionDoctorAdvice,checkNewDoctorAdvice,settleNewDoctorAdvice,excutionDoctorAdviceById,GetMobileScheduleList } from '@/api/advice'
+import { getNewSchedualDoctors,excutionDoctorAdvice,checkNewDoctorAdvice,settleNewDoctorAdvice,excutionDoctorAdviceById,GetMobileScheduleList,getDoctorAdviceMonthList,getHisPrescrptionProjectMonthList } from '@/api/advice'
 import { PostSearch } from '@/api/patient'
 export default {
   name: "Patient",
@@ -906,6 +1076,7 @@ export default {
       startdialogVisible:false,
       startdialogVisibleOne:false,
       startdialogVisibleTwo:false,
+      startMonthdialogVisible:false,
       schedule_type:0,
       partion_type:0,
       druglist:[],
@@ -920,7 +1091,13 @@ export default {
       partion_str:"",
       keyword:"",
       tableProjectList:[],
-      manufacturerList:[]
+      manufacturerList:[],
+      start_time: moment().startOf('month').format('YYYY-MM-DD'),
+      end_time: moment().endOf('month').format('YYYY-MM-DD'),
+      startMothdialogVisible:false,
+      adviceMonthList:[],
+      hisAdviceMonthList:[],
+      tableMonthList:[]
     };
   },
   created() {
@@ -2188,6 +2365,156 @@ export default {
            }
          })
       },
+      getAllQuery(){
+        this.toStaticThree()
+      },
+      toStaticThree(){
+        var params = {
+          start_time:this.start_time,
+          end_time:this.end_time
+        }
+        getDoctorAdviceMonthList(params).then(response=>{
+          if(response.data.state == 1){
+            this.startMothdialogVisible = true
+            var config = response.data.data.config
+            this.config = {}
+            this.config = config
+            var drugs = response.data.data.drugs
+            this.druglist = []
+            this.druglist = drugs
+            var manufacturerList =  response.data.data.manufacturerList
+            this.manufacturerList = []
+            this.manufacturerList = manufacturerList
+            var adviceMonthList = response.data.data.adviceList
+            var hisAdviceMonthList = response.data.data.hisAdviceList
+            if(config.is_open == 1){
+               
+              if(hisAdviceMonthList!=null && hisAdviceMonthList.length>0){
+                let dataInfo = {}
+                hisAdviceMonthList.forEach((item, index) => {
+                let { drug_id } = item
+                if (!dataInfo[drug_id])  {
+                  dataInfo[drug_id] = {
+                    drug_id:item.drug_id,
+                    advice_name:item.advice_name,
+                    manufacturer_name:this.getManufacturer(item.drug.manufacturer),
+                    specification_name:item.drug.dose + item.drug.dose_unit +"*"+item.drug.min_number+item.drug.min_unit+"/"+item.drug.max_unit,
+                    max_unit:item.drug.max_unit,
+                    min_unit:item.drug.min_unit,
+                    min_number:item.drug.min_number,
+                    child: [],
+                  }
+                }
+               })
+                let newArr = Object.values(dataInfo)
+                console.log("newArr----------------",newArr)
+                if(newArr!=null && newArr.length>0){
+                   for(let i=0;i<newArr.length;i++){
+                     for(let j=0;j<hisAdviceMonthList.length;j++){
+                       if(newArr[i].drug_id == hisAdviceMonthList[j].drug_id){
+                           newArr[i].child.push(hisAdviceMonthList[j])
+                       }
+                     }
+                   }
+                }
+                this.tableMonthList = []
+                this.tableMonthList = newArr
+
+              }
+            }
+
+            if(config.is_open == 2 || config.is_open ==0){
+             
+              if(adviceMonthList!=null && adviceMonthList.length>0){
+                 
+                if(adviceMonthList!=null && adviceMonthList.length > 0){
+                  let dataInfo = {}
+                  adviceMonthList.forEach((item, index) => {
+                  item.advice_name = item.advice_name.replace(/\s/g,"")
+                  let { advice_name } = item
+                  if (!dataInfo[advice_name]) {
+                      dataInfo[advice_name] = {
+                      advice_name:item.advice_name,
+                      child: [],
+                      count:0,
+                      specification_name:item.advice_desc +item.drug_spec_unit,
+                      manufacturer_name:""
+                    }
+                  }
+                  })
+                  let arr = Object.values(dataInfo)
+                  for(let i=0;i<arr.length;i++){
+                    for(let j=0;j<adviceMonthList.length;j++){
+                    if(arr[i].advice_name == adviceMonthList[j].advice_name){
+                        arr[i].child.push(adviceMonthList[j])
+                    }
+                  }
+                  }
+                   this.tableMonthList = []
+                   this.tableMonthList = arr
+                   console.log("hhhhhhhhhhhhhh",this.tableMonthList)
+                  }
+              }
+            }
+          }
+        })
+
+
+        console.log("params-=----",params)
+
+      },
+      toStaticFour(){
+        var params = {
+          start_time:this.start_time,
+          end_time:this.end_time
+        }
+        getHisPrescrptionProjectMonthList(params).then(response=>{
+          if(response.data.state ==1){
+            var projectMonthList = response.data.data.projectMonthList
+            console.log("projectMonthList",projectMonthList)
+
+            if(projectMonthList!=null && projectMonthList.length>0){
+              
+              let dataInfo = {}
+              projectMonthList.forEach((item, index) => {
+              let { project_id } = item
+              if (!dataInfo[project_id]) {
+                dataInfo[project_id] = {
+                  project_id:item.project_id,
+                  good_name:item.good_info.good_name,
+                  specification_name:item.good_info.specification_name,
+                  child: [],
+                  count:0,
+                }
+              }
+            })
+            let arr = Object.values(dataInfo)
+
+            if(arr!=null && arr.length >0){
+                for(let i =0;i<arr.length;i++){
+                  for(let j=0;j<projectMonthList.length;j++){
+                    if(arr[i].project_id == projectMonthList[j].project_id){
+                        arr[i].child.push(projectMonthList[j])
+                    }
+                  }
+                }
+                for(let i =0;i<arr.length;i++){
+                  for(let j=0;j<arr[i].child.length;j++){
+                    arr[i].count += parseInt(arr[i].child[j].count)
+                  }
+                }
+
+                console.log("arr0000000000000000000000",arr)
+
+                this.startMonthdialogVisible = true
+                this.tableProjectList = []
+                this.tableProjectList = arr
+
+             }
+            }
+          }
+        })
+      },
       getDrugAdviceCount(advice_name,zone_name){
         var str = ""
         var arr =[]
@@ -2330,6 +2657,56 @@ export default {
             this.downloadLoading = false
           })
       },
+      toExportListThree(){
+        import('@/vendor/Export2Excel').then(excel => {
+
+          if(this.tableMonthList!=null && this.tableMonthList.length > 0){
+            for(let i=0;i<this.tableMonthList.length;i++){
+              this.tableMonthList[i].index = i+1
+              if(this.config.is_open == 1){
+                this.tableMonthList[i].total_count = this.getHisCount(this.tableMonthList[i].child,this.tableMonthList[i].max_unit,this.tableMonthList[i].min_unit,this.tableMonthList[i].min_number)
+              }
+              if(this.config.is_open!=1){
+                this.tableMonthList[i].total_count = this.getCount(this.tableMonthList[i].child)
+              }
+
+            }
+          }
+          const tHeader = ['序号','药品名称','规格','数量','厂家']
+          const filterVal = ['index','advice_name','specification_name','total_count','manufacturer_name']
+
+          const data = this.formatJson(filterVal, this.tableMonthList)
+          excel.export_json_to_excel({
+            header: tHeader,
+            data,
+            filename: '药品月统计'
+          })
+            this.downloadLoading = false
+          })
+      },
+      toExportListFour(){
+        import('@/vendor/Export2Excel').then(excel => {
+
+          if(this.tableProjectList!=null && this.tableProjectList.length > 0){
+            for(let i=0;i<this.tableProjectList.length;i++){
+              this.tableProjectList[i].index = i+1
+            }
+          }
+          const tHeader = ['序号','耗材名称','规格','数量']
+          const filterVal = ['index','good_name','specification_name','count']
+
+          const data = this.formatJson(filterVal, this.tableProjectList)
+          excel.export_json_to_excel({
+            header: tHeader,
+            data,
+            filename: '耗材统计'
+          })
+            this.downloadLoading = false
+          })
+      },
+      getGoodAllQuery(){
+        this.toExportListThree()
+      },
       formatJson(filterVal, jsonData) {
         return jsonData.map(v => filterVal.map(j => v[j]));
       },
@@ -2689,6 +3066,38 @@ export default {
             }
         }
         return manufacturer_name
+    },
+    getDrugName(drug_id,drugs){
+      
+      var drug_name = ""
+      for(let i=0;i<drugs.length;i++){
+         if(drug_id == drugs[i].id){
+            drug_name = drugs[i].drug_name
+         }
+      }
+      return drug_name
+    },
+    getMonthManufacturer(drug_id,drugs,manufacturerList){
+      var manufacturer = 0
+      for(let i=0;i<drugs.length;i++){
+         if(drug_id == drugs[i].id){
+          manufacturer = drugs[i].manufacturer
+         }
+      }
+   
+      var  manufacturer_name = ""
+        for(let i=0;i<manufacturerList.length;i++){
+            if(manufacturer== manufacturerList[i].id){
+              manufacturer_name = manufacturerList[i].manufacturer_name
+            }
+        }
+        return manufacturer_name
+    },
+    toPrintTen(){
+      this.$router.push("/dialysis/doctorMonthAdviceStaticPrint?start_time="+this.start_time+"&end_time="+this.end_time)
+    },
+    toPrintTenOne(){
+      this.$router.push("/dialysis/doctocAdviceProjectPrint?start_time="+this.start_time+"&end_time="+this.end_time)
     }
 
   },

src/xt_pages/dialysis/template/DialysisPrintOrderSeventyeight.vue

@@ -1918,9 +1918,10 @@ export default {
         checkDate.push(obj29)
       } if (
         this.prescription.dialysis_irrigation == '' &&
-        this.prescription.dialysis_dialyszers == ''
+        this.prescription.dialysis_dialyszers == '' &&
+        this.prescription.dialysis_strainer == ''
       ){
-        const obj30 = "人工肾装置"
+        const obj30 = "透析器"
         checkDate.push(obj30)
       } if (this.predialysis.machine_type == 0) {
         const obj31 = "透析机型"

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -517,7 +517,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          font-weight: 600;
+                         
                         "
                         v-if="prescription.mode_id == 1"
                       >
@@ -528,7 +528,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          font-weight: 600;
+                        
                         "
                         v-if="prescription.mode_id == 2"
                       >
@@ -539,7 +539,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          font-weight: 600;
+                         
                         "
                         v-if="prescription.mode_id == 3"
                       >
@@ -550,7 +550,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          font-weight: 600;
+                          
                         "
                         v-if="prescription.mode_id == 4"
                       >
@@ -561,7 +561,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          font-weight: 600;
+                         
                         "
                         v-if="prescription.mode_id == 5"
                       >
@@ -572,7 +572,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          font-weight: 600;
+                         
                         "
                         v-if="prescription.mode_id == 6"
                       >
@@ -583,7 +583,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          font-weight: 600;
+                          
                         "
                         v-if="prescription.mode_id == 7"
                       >
@@ -594,7 +594,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          font-weight: 600;
+                         
                         "
                         v-if="prescription.mode_id == 8"
                       >
@@ -605,7 +605,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          font-weight: 600;
+                          
                         "
                         v-if="prescription.mode_id == 9"
                       >
@@ -616,7 +616,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          font-weight: 600;
+                          
                         "
                         v-if="prescription.mode_id == 10"
                       >
@@ -627,7 +627,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          font-weight: 600;
+                         
                         "
                         v-if="prescription.mode_id == 11"
                       >
@@ -638,7 +638,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          font-weight: 600;
+                          
                         "
                         v-if="prescription.mode_id == 12"
                       >
@@ -649,7 +649,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          font-weight: 600;
+                         
                         "
                         v-if="prescription.mode_id == 13"
                       >
@@ -660,7 +660,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          font-weight: 600;
+                         
                         "
                         v-if="prescription.mode_id == 14"
                       >
@@ -671,7 +671,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          font-weight: 600;
+                         
                         "
                         v-if="prescription.mode_id == 15"
                       >
@@ -682,7 +682,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          font-weight: 600;
+                          
                         "
                         v-if="prescription.mode_id == 16"
                       >
@@ -693,7 +693,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          font-weight: 600;
+                          
                         "
                         v-if="prescription.mode_id == 17"
                       >
@@ -704,7 +704,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          font-weight: 600;
+                          
                         "
                         v-if="prescription.mode_id == 18"
                       >
@@ -715,7 +715,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          font-weight: 600;
+                          
                         "
                         v-if="prescription.mode_id == 19"
                       >
@@ -726,7 +726,7 @@
                         style="
                           width: 150px;
                           text-align: center;
-                          font-weight: 600;
+                         
                         "
                         v-if="prescription.mode_id == 22"
                       >
@@ -737,7 +737,7 @@
                         style="
                           width: 150px;
                           text-align: center;
-                          font-weight: 600;
+                          
                         "
                         v-if="prescription.mode_id == 23"
                       >
@@ -748,7 +748,7 @@
                         style="
                           width: 150px;
                           text-align: center;
-                          font-weight: 600;
+                         
                         "
                         v-if="prescription.mode_id == 24"
                       >
@@ -758,7 +758,7 @@
                         class="under_line"
                         style="width: 100px;
                           text-align: center;
-                          font-weight: 600;
+                         
                         "
                         v-if="prescription.mode_id == 25"
                       >
@@ -769,7 +769,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          font-weight: 600;
+                         
                         "
                         v-if="prescription.mode_id == 29"
                       >
@@ -780,7 +780,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          font-weight: 600;
+                          
                         "
                         v-if="prescription.mode_id == 30"
                       >
@@ -791,7 +791,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          font-weight: 600;
+                          
                         "
                         v-if="prescription.mode_id == 31"
                       >
@@ -802,7 +802,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          font-weight: 600;
+                          
                         "
                         v-if="prescription.mode_id == 32"
                       >
@@ -813,7 +813,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          font-weight: 600;
+                          
                         "
                         v-if="prescription.mode_id == 33"
                       >
@@ -824,7 +824,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          font-weight: 600;
+                          
                         "
                         v-if="prescription.mode_id == 34"
                       >
@@ -835,7 +835,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          font-weight: 600;
+                         
                         "
                         v-if="prescription.mode_id == 35"
                       >
@@ -846,7 +846,7 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          font-weight: 600;
+                          
                         "
                         v-if="prescription.mode_id == 36"
                       >
@@ -857,12 +857,82 @@
                         style="
                           width: 100px;
                           text-align: center;
-                          font-weight: 600;
+                         
                         "
                         v-if="prescription.mode_id == 37"
                       >
                       HDF1000
                       </div>
+                      <div
+                        class="under_line"
+                        style="
+                          width: 100px;
+                          text-align: center;
+                         
+                        "
+                        v-if="prescription.mode_id == 38"
+                      >
+                      HDF80
+                      </div>
+                      <div
+                        class="under_line"
+                        style="
+                          width: 100px;
+                          text-align: center;
+                          
+                        "
+                        v-if="prescription.mode_id == 39"
+                      >
+                      HF16
+                      </div>
+
+                      <div
+                        class="under_line"
+                        style="
+                          width: 100px;
+                          text-align: center;
+                          
+                        "
+                        v-if="prescription.mode_id == 40"
+                      >
+                      HD(无肝素)
+                      </div>
+
+                      <div
+                        class="under_line"
+                        style="
+                          width: 100px;
+                          text-align: center;
+                         
+                        "
+                        v-if="prescription.mode_id == 41"
+                      >
+                      HDF17H
+                      </div>
+
+                      <div
+                        class="under_line"
+                        style="
+                          width: 100px;
+                          text-align: center;
+                         
+                        "
+                        v-if="prescription.mode_id == 42"
+                      >
+                       HD.
+                      </div>
+
+                      <div
+                        class="under_line"
+                        style="
+                          width: 100px;
+                          text-align: center;
+                          
+                        "
+                        v-if="prescription.mode_id == 43"
+                      >
+                        HD(2)
+                      </div>
                     </div>
 
                     <div
@@ -5365,7 +5435,7 @@ export default {
 
         console.log("haaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",this.doctor_advices)
 
-        if(this.org_id ==10206 || this.org_id ==10644 || this.org_id ==10633 || this.org_id == 10489){
+        if(this.org_id ==10206 || this.org_id ==10644 || this.org_id ==10633 || this.org_id == 10489 || this.org_id == 0){
           let projectsOne = [];
           response.data.data.projects.map((item) => {
               projectsOne.push(item);
@@ -5475,6 +5545,14 @@ export default {
             }
             }
 
+          
+
+            for(let i=0;i<newHisArr.length;i++){
+              newHisArr[i].advice_name_str = ""
+              newHisArr[i].advice_name_str = newHisArr[i].project_team + (newHisArr[i].prescription_id).toString()
+            }
+            console.log("newHisArr===================================",newHisArr)
+
             var ordHisArr = this.getQuChong(newHisArr)
 
            this.doctor_advices.push(...ordHisArr)
@@ -5616,9 +5694,9 @@ export default {
       let result = [];
         let obj = {};
         for (let i = 0; i < tempArr.length; i++) {
-            if (!obj[tempArr[i].project_team]) {
+            if (!obj[tempArr[i].advice_name_str]) {
                 result.push(tempArr[i]);
-                obj[tempArr[i].project_team] = true;
+                obj[tempArr[i].advice_name_str] = true;
             };
         };
         return result;

src/xt_pages/outpatientDoctorStation/print.vue

@@ -3,7 +3,7 @@
     <div class="dialysisPage" style="padding-top: 40px">
       <div v-if="org_id != 10138 && org_id != 10278 && org_id != 10243 && org_id != 10537 && org_id != 10610 ">
 
-        <printOne v-if="org_id != 10088 && org_id != 10215 && org_id != 10375 && org_id != 10188 && org_id != 10217 && org_id != 10598 && org_id != 10644 && org_id != 10510 && org_id!=10653&&org_id !=0" v-bind:childResponse="childResponse"
+        <printOne v-if="org_id != 10088 && org_id != 10215 && org_id != 10375 && org_id != 10188 && org_id != 10217 && org_id != 10598 && org_id != 10644 && org_id != 10510 && org_id!=10653" 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>
@@ -27,7 +27,7 @@
           :prescription_id="prescription_id">
         </prinSeven>
 
-        <prineight v-if="org_id == 10644 "
+        <prineight v-if="org_id == 10644"
           v-bind:childResponse="childResponse"
           :advicePrint="advicePrint"
           :ids="ids"
@@ -64,7 +64,7 @@
           :prescription_id="prescription_id"
           :his_patient_id ="his_patient_id"
         ></printFive>
-        <printTwoteen v-if="org_id==10653 || org_id == 0"
+        <printTwoteen v-if="org_id==10653"
           v-bind:childResponse="childResponse"
           :advicePrint="advicePrint"
           :ids="ids"

src/xt_pages/outpatientDoctorStation/template/printOne.vue

@@ -58,11 +58,10 @@
         </div>
         <div class="prescriptionBox" style="min-height: 350px;">
           <div class="Rp">Rp:</div>
-          <div
-            class="drugsBox"
+          <div class="drugsBox" 
             v-for="(it, index) in item.advices"
             :key="index"
-            :style="{'page-break-after':index==yi&&item.advices.length>5? 'always':'auto'}"
+            :style="{'page-break-after':index==yi&&item.advices.length>5? 'always':'auto','position': 'relative'}"
           >
             <!-- class="drugsBox"  item.advices.length>=5 ? 'danzhang' : 'drugsBox'  'page-break-after':item.advices.length>=3&& item.advices[2]?'always':'auto'-->
             <!-- <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> -->
@@ -70,19 +69,27 @@
               <span style="font-weight: bold">{{ index + 1 + "." }}</span
               >{{ it.advice_name ? it.advice_name : "" }}&nbsp;&nbsp;<span
               v-if="it.drug.min_unit != it.drug.dose_unit"
-            >{{ it.drug.dose }}{{ it.drug.dose_unit }}&nbsp;* &nbsp;</span
-            >{{ it.drug.min_number }}{{ it.drug.min_unit }}/{{
-                it.drug.max_unit
-              }}&nbsp;×&nbsp; {{ it.prescribing_number
-              }}{{ it.prescribing_number_unit }}
+              >{{ it.drug.dose }}{{ it.drug.dose_unit }}&nbsp;* &nbsp;</span
+              >{{ it.drug.min_number }}{{ it.drug.min_unit }}/{{
+                  it.drug.max_unit
+                }}&nbsp;×&nbsp; {{ it.prescribing_number
+                }}{{ it.prescribing_number_unit }}
+              <!-- <div style="display: inline-block;margin-left: 30px;">
+                <span>{{ it.price}}</span>
+              </div> -->
             </div>
             <div style="margin-left: 100px">
-              <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>
+                <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="display: inline-block;position: absolute; top:0;right: 10%;"
+              v-if="org_id ==10210 || org_id ==0">
+                <span>{{ it.price}}</span>
             </div>
           </div>
 

src/xt_pages/stock/detail/cancelStockDetail.vue

@@ -126,6 +126,12 @@
           </template>
         </el-table-column>
 
+        <el-table-column label="生产厂商" align="center">
+          <template slot-scope="scope">
+            {{ getManufactuerName(scope.row.manufacturer) }}
+          </template>
+        </el-table-column>
+
         <!-- <el-table-column label="单据类型" align="center">
           <template slot-scope="scope">
             {{ getTypeName(scope.row) }}

src/xt_pages/stock/detail/stockInDetail.vue

@@ -131,6 +131,12 @@
             </template>
           </el-table-column>
 
+          <el-table-column label="生产厂商" align="center">
+            <template slot-scope="scope">
+              {{ getManufactuerName(scope.row.manufacturer) }}
+            </template>
+          </el-table-column>
+
           <el-table-column label="操作时间" align="center">
             <template slot-scope="scope">
               {{ getTime(scope.row.Warehousing.warehousing_time) }}

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

@@ -118,6 +118,12 @@
           </template>
         </el-table-column>
 
+        <el-table-column label="生产厂家" align="center">
+          <template slot-scope="scope">
+           {{getManufacturerName(scope.row.GoodInfo.manufacturer)}}
+          </template>
+        </el-table-column>
+
         <!-- <el-table-column label="单据类型" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.type == 1">药品退库单</span>
@@ -377,6 +383,7 @@ export default {
          if(response.data.state == 1){
            loading.close()
            var order =  response.data.data.order
+           console.log("order=----------------",order)
            var list = response.data.data.orderPrint
            this.dealerList =  response.data.data.dealerList
            this.manufacturerList =  response.data.data.manufacturerList

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

@@ -128,6 +128,12 @@
           </template>
         </el-table-column>
 
+        <el-table-column label="生产厂家" align="center">
+          <template slot-scope="scope">
+           {{getManufacturerName(scope.row.manufacturer)}}
+          </template>
+        </el-table-column>
+
         <el-table-column label="操作时间" align="center">
           <template slot-scope="scope">
             <span>{{getTime(scope.row.ctime)}}</span>

src/xt_pages/stock/query/purchaseNewStockQuery.vue

@@ -161,11 +161,6 @@
           >
             </el-pagination>
      </div>
-
-
-
-  
-
   </div>
 </template>
 <script>

src/xt_pages/stock/stockInventory.vue

@@ -22,9 +22,9 @@
                 <stockDamaged ref="childOne"></stockDamaged>
             </el-tab-pane>
 
-            <!-- <el-tab-pane label="盘点日志表" name="seven">
+            <el-tab-pane label="盘点日志表" name="seven">
                 <inventory-record ref="childSeven"></inventory-record>
-            </el-tab-pane> -->
+            </el-tab-pane>
         </el-tabs>
         
     </div>

src/xt_pages/user/components/PatientDetail.vue

@@ -120,7 +120,6 @@
               <el-form-item
                 label="身份证号 : "
                 class="is-required"
-                prop="idCardNo"
               >
                 <el-input v-model="form.idCardNo" disabled></el-input>
               </el-form-item>

src/xt_pages/user/components/PatientForm.vue

@@ -129,10 +129,8 @@
               <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
                 <el-form-item
                   label="身份证号 : "
-                  prop="idCardNo"
                 >
                   <el-input
-                    @input="checkIdCardNo"
                     v-model="form.idCardNo"
                   ></el-input><!---->
                 </el-form-item>

src/xt_pages/user/dialysisRecord.vue

@@ -8,6 +8,8 @@
     <div class="patient-app-container app-container">
       <div style="clearfix">
 
+       
+
         <el-button
           style="float:right;"
           size="small"
@@ -834,6 +836,7 @@ export default {
         });
       }, 1);
     },
+   
     clickCurrent(val) {
 
       this.patient_id = val.patient_id

src/xt_pages/user/dialysisRecordPrint.vue

@@ -0,0 +1,348 @@
+<template>
+    <div class="main-contain">
+      <div class="position">
+        <bread-crumb :crumbs="crumbs"></bread-crumb>
+        <el-row style="float:right;">
+          <el-col :span="24">
+            <el-button size="small" icon="el-icon-printer" type="primary" @click="printAction">打印</el-button>
+          </el-col>
+        </el-row>
+      </div>
+      <div class="app-container" style="background-color: white;">
+  
+        <div id="print_content">
+          <div class="print_main_content">
+            <div class="order_title_panl">
+              <span class="main_title"> &nbsp;
+                透析并发症登记
+              </span>
+              <span  style="float:right;">打印日期: &nbsp;
+                  {{ getNowTime() }}
+              </span>
+            </div>
+            <div class="table_panel">
+  
+              <table class="table">
+                <thead>
+                <tr>
+                  <td width="50">序号</td>
+                  <td width="100">时间</td>
+                  <td width="100">姓名</td>
+                  <td width="100">性别</td>
+                  <td width="100">诊断</td>
+                  <td width="100">透析并发症</td>
+                  <td width="100">症状及处理</td>
+                  <td width="100">结果</td>
+                </tr>
+                </thead>
+                <tbody>
+                  <tr v-for="(item,i) in tableDataList" :key="i">
+                  <td width="50">{{ i+1 }}</td>
+                  <td width="100">{{ getTime(item.schedule_date) }}</td>
+                  <td width="100">{{item.patient.name}}</td>
+                  <td width="100">
+                    <span v-if="item.patient.gender==1">男</span>
+                    <span v-if="item.patient.gender==2">女</span>
+                  </td>
+                  <td width="100">{{ item.patient.diagnose }}</td>
+                  <td width="100">
+                    {{ item.assessment_before_dislysis.complication }}
+                  </td>
+                  <td width="100">
+                    {{ getMonitorSymptom(item.monitoring_record) }} {{ getMonitorDispose(item.monitoring_record) }}
+                  </td>
+                  <td width="100">{{ getMonitorSymptomResult(item.monitoring_record) }}</td>
+                  </tr>
+                </tbody>
+              </table>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </template>
+  
+  <script>
+    import { parseTime } from '@/utils'
+    import { uParseTime } from '@/utils/tools'
+    import BreadCrumb from '@/xt_pages/components/bread-crumb'
+    import print from 'print-js'
+    import { getDataConfig } from '@/utils/data'
+    import { getSchedualPatient } from "@/api/dialysis";
+    export default {
+      name: 'SchedulePrint',
+      data() {
+        return {
+          crumbs: [
+            { path: false, name: '排班管理' },
+            { path: false, name: '排班打印' }
+          ],
+          td_1_width: '8%',
+          td_2_width: '8%',
+          td_3_width: '64%',
+          td_4_width: '20%',
+          month: 1,
+          begin_day: 1,
+          total:[],
+          list:[],
+          schedule_date:"",
+          schedule_type:0,
+          partition_type:0,
+          keywords:"",
+          loading:false,
+          tableData:[],
+          numberList:[],
+          partitionArr:[],
+          his_config:{},
+          typeList:[],
+          rowList:[],
+          dialysate_formulation:[],
+          body_fluid_option:[],
+          displace_liqui_part_option:[],
+          blood_access_option:[],
+          hemodialysisPipelinesOptions:[],
+          tableList:[],
+          druglist:[],
+          config:{},
+          org_id:0,
+          manufacturerList:[],
+          tableMonthList:[],
+          tableDataList:[],
+        }
+      },
+      components: {
+        BreadCrumb
+      },
+      created() {
+        this.org_id = this.$store.getters.xt_user.template_info.org_id;
+ 
+         this.getlist()
+      },
+      methods: {
+        getMonitorDispose(val){
+          var dispose = ""
+          if(val!=null && val.length>0){
+
+            for(let i=0;i<val.length;i++){
+              dispose +=val[i].dispose+" "
+            }
+          }
+          return dispose
+        },
+        getMonitorSymptom(val){
+           
+          var symptom = ""
+          if(val!=null && val.length>0){
+             
+            for(let i=0;i<val.length;i++){
+               symptom +=val[i].symptom+" "
+            }
+          }
+          return symptom
+        },
+        getMonitorSymptomResult(val){
+            var result = ""
+          if(val!=null && val.length>0){
+             
+            for(let i=0;i<val.length;i++){
+                result +=val[i].result+" "
+            }
+          }
+          return result
+        },
+        getTime(val) {
+         if(val < 0){
+           return ""
+         }
+         if(val == ""){
+          return ""
+         }else {
+          return uParseTime(val, '{y}-{m}-{d}')
+         }
+        },
+        getlist(){
+             var params = {
+                page:this.$route.query.page,
+                limit:this.$route.query.limit,
+                schedul_type:this.$route.query.schedule_type,
+                partition_type:this.$route.query.partition_type,
+                schedul_time:this.$route.query.schedul_time,
+                partition_type:this.$route.query.partition_type,
+                schedul_time:this.$route.query.schedul_time,
+                keywords:this.$route.query.keywords,
+                start_time:this.$route.query.start_time,
+                end_time:this.$route.query.end_time
+
+             }
+           getSchedualPatient(params).then(response=>{
+             if(response.data.state == 1){
+                var schedule =  response.data.data.schedule
+                this.tableDataList = schedule
+             }
+           })
+        },
+       getNowTime: function () {
+        let dateTime;
+        let yy = new Date().getFullYear();
+        let mm = new Date().getMonth() + 1;
+        let dd = new Date().getDate();
+        
+        dateTime = yy + '-' + mm + '-' + dd
+        return dateTime
+       },
+       
+       getTimeOne(val) {
+          if(val == ""){
+          return ""
+          }else {
+          return uParseTime(val, '{y}-{m}-{d}')
+          }
+       },
+       getCount(val){
+         var count = 0
+         if(val!=null && val.length > 0){
+          for(let i=0;i<val.length;i++){
+            count += parseInt(val[i].prescribing_number)
+          }
+         }
+         if(count > 0){
+          return count
+         }else{
+          return 0
+         }
+       },
+      printAction: function() {
+      const style = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } }'
+  
+      printJS({
+          printable: 'print_content',
+          type: 'html',
+          documentTitle: '  ',
+          style: style,
+          scanStyles: false
+       })
+      },
+      getSpecification(id){
+          var specification_name = ""
+          for(let i=0;i<this.druglist.length;i++){
+            if(id == this.druglist[i].id){
+              specification_name = this.druglist[i].dose+this.druglist[i].dose_unit +"*"+this.druglist[i].min_number+this.druglist[i].min_unit +"/"+this.druglist[i].max_unit
+            }
+          }
+          return specification_name
+        },
+       getHisCount(val,max_unit,min_unit,min_number){
+          var total = 0
+          var max_str = "";
+          var min_str = "";
+          for(let i=0;i<val.length;i++){
+            total+=parseInt(val[i].prescribing_number)
+          }
+          if (total < min_number) {
+          min_str = total + min_unit;
+        }
+        if (total == 0) {
+          min_str = "";
+          max_str = "";
+        }
+        if (total >= min_number) {
+          if (parseInt(total / min_number) != 0) {
+            max_str = parseInt(total / min_number) + max_unit;
+          }
+          if (total % min_number != 0) {
+            min_str = (total % min_number) + min_unit;
+          }
+        }
+        return max_str + min_str;
+          
+        },
+        getManufacturer(id){
+          var  manufacturer_name = ""
+          for(let i=0;i<this.manufacturerList.length;i++){
+              if(id== this.manufacturerList[i].id){
+                manufacturer_name = this.manufacturerList[i].manufacturer_name
+              }
+          }
+          return manufacturer_name
+      }
+     }
+    }
+  </script>
+  
+  <style rel="stylesheet/scss" lang="scss" scoped>
+    .print_main_content {
+      background-color: white;
+      width: 960px;
+      margin: 0 auto;
+      padding: 0 0 20px 0;
+  
+    .order_title_panl {
+      text-align: center;
+  
+    .main_title {
+      font-size: 18px;
+      line-height: 40px;
+      font-weight: 500;
+    }
+  
+    }
+    .table_panel {
+  
+    .table {
+      width: 100%;
+      border: 1px solid;
+      border-collapse: collapse;
+      padding: 2px;
+  
+    thead {
+  
+    tr {
+  
+    td {
+      border: 1px solid;
+      text-align: center;
+      font-size: 20px;
+      padding: 15px 5px;
+    }
+  
+    }
+    }
+    tbody {
+  
+    tr {
+  
+    td {
+      border: 1px solid;
+      text-align: center;
+      font-size: 18px;
+      padding: 10px 5px;
+  
+    .proj {
+      padding: 5px 0;
+      text-align: left;
+  
+    .proj_title {
+      font-size: 16px;
+      font-weight: 500;
+      line-height: 25px;
+    }
+  
+    .proj_item {
+      font-size: 15px;
+      line-height: 20px;
+  
+    .zone_name {
+      font-weight: 500;
+    }
+  
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+  </style>
+  
+  

src/xt_pages/user/doctorAdvice.vue

@@ -102,6 +102,22 @@
           </ul>
         </div>
       </div>
+
+      <div class="cell clearfix">
+        <label class="title"> <span class="name">给药途径</span> : </label>
+        <div class="time">
+          <ul class>
+            <li
+              :class="item.id == listQuery.delivery_way ? 'active' : ''"
+              @click="selectDeliveryWay(item.id)"
+              v-for="item in deliveryWay"
+              :key="item.id"
+            >
+              {{ item.name }}
+            </li>
+          </ul>
+        </div>
+      </div>
      
 
       <div class="cell clearfix">
@@ -3533,16 +3549,16 @@ export default {
       };
     },
     getList() {
-      //  var name = ""
-      //   for(let i=0;i<this.deliveryWay.length;i++){
-      //       if(this.listQuery.delivery_way == this.deliveryWay[i].id){
-      //         name = this.deliveryWay[i].name
-      //       }
-      //   }
-      //   if(name == '全部'){
-      //     name = ""
-      //   }
-      //  this.listQuery.delivery_way_one = name
+       var name = ""
+        for(let i=0;i<this.deliveryWay.length;i++){
+            if(this.listQuery.delivery_way == this.deliveryWay[i].id){
+              name = this.deliveryWay[i].name
+            }
+        }
+        if(name == '全部'){
+          name = ""
+        }
+       this.listQuery.delivery_way_one = name
       getDoctorAdviceList(this.listQuery).then(response => {
         if (response.data.state == 1) {
           this.adviceTableData = response.data.data.advices;
@@ -4525,10 +4541,10 @@ export default {
           this.deliveryWayOptions =
             response.data.data.drugways === null? []: response.data.data.drugways;
           this.executionFrequencyOptions = response.data.data.efs === null ? [] : response.data.data.efs;
-          // var dics  =  response.data.data.dics
-          // var obj = {id:0,name:"全部"}
-          // this.deliveryWay.push(obj)
-          // this.deliveryWay.push(...dics)
+          var dics  =  response.data.data.dics
+          var obj = {id:0,name:"全部"}
+          this.deliveryWay.push(obj)
+          this.deliveryWay.push(...dics)
         }
       });
     },