8月15日

src/api/dialysis.js

     params: params
   })
 }
+
+export function getSolutionlistByOrgId(params) {
+  return request({
+    url: '/api/patient/getsolutionlistbyorgid',
+    method: 'get',
+    params: params
+  })
+}

src/router/modules/dialysis.js

       is_menu: false,
       hidden: true
     },
-
-    // {
-    //   path: '/dialysis/consumable/dialysis/print',
-    //   component: () => import('@/xt_pages/dialysis/details/consumable/signPrint'),
-    //   name: '标签打印',
-    //   is_menu: false,
-    //   hidden: true
-    // },
+    {
+      path: '/dialysis/consumable/dialysis/print',
+      component: () => import('@/xt_pages/dialysis/details/consumable/signPrint'),
+      name: '标签打印',
+      is_menu: false,
+      hidden: true
+    },
     {
       path: '/dialysis/consumable/dialysis/parameter/print',
       component: () => import('@/xt_pages/dialysis/details/consumable/dialysisParameterPrint'),

src/xt_pages/dialysis/details/consumable/dialysisDrug.vue

                       :editable="false" :clearable="false" style="width: 196px;margin-right:10px;" type="date"
                       format="yyyy-MM-dd"
                       value-format="yyyy-MM-dd"
-                      placeholder="选择日期时间" align="right"></el-date-picker>
+                      placeholder="选择日期时间" align="right"
+                     :picker-options="pickerOptions"></el-date-picker>
       <el-input size="small" style="width: 180px;" @keyup.enter.native='searchAction' v-model.trim="search_input"
                 class="filter-item" v-model="query.keywords"/>
       <el-button size="small" class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
       </div>
       <div>
         <el-button size="small" type="primary" @click="statistics">统计表</el-button>
-        <el-button size="small" icon="el-icon-printer" @click="exportList" type="primary">导出</el-button>
-        <el-button size="small" icon="el-icon-printer" @click="toPrint" type="primary">打印</el-button>
+        <el-button size="small"  @click="exportList" type="primary">导出</el-button>
+        <el-button size="small" icon="el-icon-printer"  @click="toPrint" type="primary">打印</el-button>
       </div>
     </div>
   
 
         <el-table-column label="透析机号" align="center" width="55">
            <template slot-scope="scope">
-              {{scope.row.device_number.number}}
+              {{scope.row.device_number.zone.name}}  {{scope.row.device_number.number}}
            </template>
         </el-table-column>
 
               :value="item.id">
             </el-option>
            </el-select>
-           <el-button size="small" icon="el-icon-printer" @click="toPrintOne" type="primary">打印</el-button>
-           <el-button size="small" icon="el-icon-printer" @click="toExportListOne" type="primary">导出</el-button>
+           <el-button size="small" icon="el-icon-printer"  @click="toPrintOne" type="primary">打印</el-button>
+           <el-button size="small"  @click="toExportListOne" type="primary">导出</el-button>
         </div> 
 
        <el-table
        
         <el-table-column  align="center"   label="数量">
            <template slot-scope="scope">
-              {{getCount(scope.row.child)}}
+             <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>
         
         tableList:[],
         config:{},
         ids:"",
+        pickerOptions:{ //禁用当前日期之前的日期
+           disabledDate(v) {
+            //Date.now()是javascript中的内置函数，它返回自1970年1月1日00:00:00 UTC以来经过的毫秒数。
+            return v.getTime() < new Date().getTime() - 86400000;
+          },
+        },
       }
     },
     created() {
             this.total = response.data.data.total
             var adviceList = response.data.data.adviceList
             this.adviceList = adviceList
-            // var templateList = response.data.data.templateList
+          
             var druglist = response.data.data.drugList
-            // for(let i=0;i<templateList.length;i++){
-            //   templateList[i].advice_desc = ""
-            //  for(let j=0;j<druglist.length;j++){
-            //    if(templateList[i].drug_id == druglist[j].id){
-            //      templateList[i].advice_desc = druglist[j].dose + druglist[j].dose_unit +"*"+druglist[j].min_unit +druglist[j].min_number+"/"+druglist[j].max_unit
-            //    }
-            //  }
-            // }
-            // console.log("医嘱模版",templateList)
-            // this.templateList = templateList
+          
            
             this.config = response.data.data.config
              
                }
              }
             console.log("hisArr223323323223",hisArr)
+            var newHisArr = []
             for(let i=0;i<hisArr.length;i++){
-              hisArr[i].advice_desc = ""
+              for(let j=0;j<druglist.length;j++){
+                if(hisArr[i].drug_id == druglist[j].id){
+                   newHisArr.push(hisArr[i])
+                }
+              }
+            }
+            for(let i=0;i<newHisArr.length;i++){
+              newHisArr[i].advice_desc = ""
              for(let j=0;j<druglist.length;j++){
-               if(hisArr[i].drug_id == druglist[j].id){
-                 hisArr[i].advice_desc = druglist[j].dose + druglist[j].dose_unit +"*" +druglist[j].min_number+ druglist[j].min_unit +"/"+druglist[j].max_unit
+               if(newHisArr[i].drug_id == druglist[j].id){
+                 newHisArr[i].advice_desc = druglist[j].dose + druglist[j].dose_unit +"*" +druglist[j].min_number+ druglist[j].min_unit +"/"+druglist[j].max_unit
                }
              }
             }
-            this.templateList = hisArr
+            this.templateList = newHisArr
           }
         })
       },
                       child: [],
                       count:0,
                       drug_id:item.drug_id,
-                      specification_name:item.advice_desc,
+                      specification_name:item.advice_desc +item.drug_spec_unit,
                       patient_id:item.patient_id,
                     }
                   }
            
 
 
-             var templateList = response.data.data.templateList
-             console.log("templatelist",templateList)
+             
              var tablelist =  response.data.data.tablelist
              console.log("tablelist233232232",tablelist)
              var hisArr= []
                  }
                }
              }
-             console.log("hisArr223323323223",hisArr)
+            //  console.log("下盘子3223323223",hisArr)
+          
+            var newHisArr = []
+            for(let i=0;i<hisArr.length;i++){
+               hisArr[i].count_one = 0
+              for(let j=0;j<druglist.length;j++){
+                 if(hisArr[i].prescribing_number_unit == hisArr[i].drug.max_unit){
+                    hisArr[i].prescribing_number = parseInt(hisArr[i].prescribing_number) * hisArr[i].drug.min_number
+                    hisArr[i].count_one =  parseInt(hisArr[i].prescribing_number) * hisArr[i].drug.min_number
+                 }
+                if(hisArr[i].drug_id == druglist[j].id){
+                   newHisArr.push(hisArr[i])
+                }
+              }
+            }
+            console.log("下盘子3223323223",newHisArr)
+            
              if(config.is_open == 1){
-               if(hisArr!=null && hisArr.length > 0){
+               if(newHisArr!=null && newHisArr.length > 0){
                   let dataInfoOne = {}
-                  hisArr.forEach((item, index) => {
+                  newHisArr.forEach((item, index) => {
                   let { advice_name } = item
                   if (!dataInfoOne[advice_name]) {
                     dataInfoOne[advice_name] = {
                       specification_name:this.getSpecification(item.drug_id),
                       drug_id:item.drug_id,
                       patient_id:item.patient_id,
+                      min_number:item.drug.min_number,
+                      max_unit:item.drug.max_unit,
+                      min_unit:item.drug.min_unit
                     }
                   }
                 })
                 let hisarr = Object.values(dataInfoOne)
                 console.log("hisarr233232233232",hisarr)
                 if(hisarr.length > 0){
-                  for(let i=0;i<hisArr.length;i++){
+                  for(let i=0;i<newHisArr.length;i++){
                     for(let j=0;j<hisarr.length;j++){
-                      if(hisArr[i].drug_id == hisarr[j].drug_id){
-                          hisarr[j].child.push(hisArr[i])
+                      if(newHisArr[i].drug_id == hisarr[j].drug_id){
+                          hisarr[j].child.push(newHisArr[i])
                       }
                     }
                   }
                   }
                 }
               }
+
+              console.log("中国人民解放军",this.tableList)
              }
      
            
           if(this.list!=null && this.list.length > 0){
             for(let i=0;i<this.list.length;i++){
               this.list[i].index = i+1
-              this.list[i].number = this.list[i].device_number.number
+              this.list[i].number =this.list[i].device_number.zone.name + this.list[i].device_number.number
               this.list[i].patient_name = this.list[i].patient.name
               this.list[i].dialysis_no = this.list[i].patient.dialysis_no
               if(this.config.is_open != 1){
           if(this.tableList!=null && this.tableList.length > 0){
             for(let i=0;i<this.tableList.length;i++){
               this.tableList[i].index = i+1
-              this.tableList[i].total_count = this.getCount(this.tableList[i].child)
+              if(this.config.is_open == 1){
+                this.tableList[i].total_count = this.getHisCount(this.tableList[i].child,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
+              }
+              if(this.config.is_open!=1){
+                this.tableList[i].total_count = this.getCount(this.tableList[i].child)
+              }
+             
             }
           }
           const tHeader = ['序号','药品名称','规格','数量']
         }
         if(newArr!=null && newArr.length > 0){
           for(let i=0;i<newArr.length;i++){
-            his_str += newArr[i].advice_name +' '+newArr[i].advice_desc +' '+ newArr[i].prescribing_number +' '+newArr[i].prescribing_number_unit + "。"
+            his_str += newArr[i].advice_name +' '+newArr[i].advice_desc  +newArr[i].drug_spec_unit +' ' +newArr[i].prescribing_number  +newArr[i].prescribing_number_unit + "。"
           }
         }
         return his_str
        }else{
         return 0
        }
+      },
+      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;
+        
       },
       handleSelectionChange(val){
         var arr = []

src/xt_pages/dialysis/details/consumable/dialysisGood.vue

       </div>
       <div>
         <el-button size="small" icon="el-icon-printer" @click="toSett" type="primary" v-if="his_config.is_open == 1">设置</el-button>
+        <el-button size="small" icon="el-icon-printer" @click="toClick" type="primary">脚本</el-button>
         <el-button size="small" icon="el-icon-printer" @click="toPrint" type="primary">打印</el-button>
-        <el-button size="small" icon="el-icon-printer" @click="exportListOne" type="primary" v-if="his_config.is_open == 1">导出</el-button>
-        <el-button size="small" icon="el-icon-printer" @click="exportList" type="primary" v-if="his_config.is_open != 1">导出</el-button>
+        <el-button size="small"  @click="exportListOne" type="primary" v-if="his_config.is_open == 1">导出</el-button>
+        <el-button size="small" @click="exportList" type="primary" v-if="his_config.is_open != 1">导出</el-button>
         <el-button size="small" type="primary" v-if="his_config.is_open != 1" @click="statistics">统计表</el-button>
         <el-button size="small" type="primary" v-if="his_config.is_open == 1" @click="toStatistics">统计表</el-button>
       </div>
              {{scope.$index + 1}}
            </template>
         </el-table-column>
-        <el-table-column  align="center"  width="55" label="透析机号">
+        <el-table-column  align="center"  width="100" label="透析机号">
          <template slot-scope="scope">
-             {{scope.row.device_number.number}}
+             {{scope.row.device_number.zone.name}}  {{scope.row.device_number.number}}
            </template>
         </el-table-column>
         <el-table-column  align="center"  width="55" label="姓名">
              {{scope.$index + 1}}
            </template>
         </el-table-column>
-        <el-table-column  align="center"  width="55" label="透析机号">
+        <el-table-column  align="center"  width="100" label="透析机号">
          <template slot-scope="scope">
-             {{scope.row.device_number.number}}
+             {{scope.row.device_number.zone.name}}  {{scope.row.device_number.number}}
            </template>
         </el-table-column>
         <el-table-column  align="center"  width="55" label="姓名">
 
       <el-pagination
         @size-change="handleSizeChangeOne"
-        @current-change="handleSizeChangeOne"
+        @current-change="handleCurrentChangeOne"
         :page-sizes="[10, 50, 100]"
         :page-size="10"
         background
             </el-option>
            </el-select>
 
-         <el-button size="small" icon="el-icon-printer" @click="toPrintOne" type="primary">打印</el-button>
-         <el-button size="small" icon="el-icon-printer" @click="toExportListOne" type="primary">导出</el-button>
+         <el-button size="small" icon="el-icon-printer"  @click="toPrintOne" type="primary">打印</el-button>
+         <el-button size="small"  @click="toExportListOne" type="primary">导出</el-button>
         </div> 
        <el-table
         :data="tableList"
             </el-option>
            </el-select>
            <el-button size="small" icon="el-icon-printer" @click="toHisPrint" type="primary">打印</el-button>
-           <el-button size="small" icon="el-icon-printer" @click="toExportListTwo" type="primary">导出</el-button>
+           <el-button size="small"  @click="toExportListTwo" type="primary">导出</el-button>
         </div> 
        <el-table
         :data="tableList"
 
 
 <script>
-  import { GetAllZone,getPatientDialysisSolutionGroupList,getDialysisGoodTotalCount,saveHisDialysis,getHisDialysisGoodCount } from '@/api/dialysis'
+  import { GetAllZone,getPatientDialysisSolutionGroupList,getDialysisGoodTotalCount,saveHisDialysis,getHisDialysisGoodCount,getSolutionlistByOrgId } from '@/api/dialysis'
  import {GetAllGoodType} from '@/api/stock'
   import { uParseTime } from "@/utils/tools";
   import { getDataConfig } from '@/utils/data'
         checkedTwentyNight:false,
         startHisDialogVisible:false,
         typeList:[],
-        ids:""
+        ids:"",
+        org_id:0,
       }
     },
     created() {
+      this.org_id = this.$store.getters.xt_user.org.id
       let date = uParseTime(new Date(), "{y}-{m}-{d}")
       var newDate = new Date();
       var y = newDate.getFullYear();
         if(this.list!=null && this.list.length > 0){
           for(let i=0;i<this.list.length;i++){
             this.list[i].name0 = i+1
-            this.list[i].name1= this.list[i].device_number.number
+            this.list[i].name1= this.list[i].device_number.zone.name + this.list[i].device_number.number
             this.list[i].name2 = this.list[i].patient.name
             this.list[i].name3 = this.list[i].patient.dialysis_no
             if(this.rowList!=null && this.rowList.length > 0){
         //  console.log("arrTwo",arrTwo)
          const tHeader = arr
         const filterVal = arrTwo
-        
+        console.log("list23323223wo",this.list)
         if(this.list!=null && this.list.length > 0){
           for(let i=0;i<this.list.length;i++){
             this.list[i].name0 = i+1
-            this.list[i].name1= this.list[i].device_number.number
+            this.list[i].name1= this.list[i].device_number.zone.name + this.list[i].device_number.number
             this.list[i].name2 = this.list[i].patient.name
             this.list[i].name3 = this.list[i].patient.dialysis_no
             if(this.typeList!=null && this.typeList.length > 0){
          
           }
         }
-        // console.log("list32232232323wi",this.list)
+
+        console.log("list32232232323wi",this.list)
+      
         const data = this.formatJson(filterVal, this.list)
          excel.export_json_to_excel({
            header: tHeader,
         return obj;
       },
       open(){
+        this.rowList = []
+        var filedList = this.$store.getters.xt_user.fileds
+        for (let i = 0; i < filedList.length; i++) {
+          if ( filedList[i].module == 1 && filedList[i].is_show == 1 && (filedList[i].filed_name_cn == '透析器/灌流器' || filedList[i].filed_name_cn == '透析器' || filedList[i].filed_name_cn == '灌流器'  || filedList[i].filed_name_cn == '钾' || filedList[i].filed_name_cn == '钠' || filedList[i].filed_name_cn == '钙' || filedList[i].filed_name_cn == '葡萄糖'  || filedList[i].filed_name_cn == '穿刺针')) {
+            this.rowList.push(filedList[i])
+          }
+        }
        this.getlist()
       },
       getlist(){
-        //  console.log("paramsy2332322323",this.query)
         getPatientDialysisSolutionGroupList(this.query).then(response=>{
            if(response.data.state == 1){
              var list = response.data.data.list
                    }
                    
                  }
-                // console.log("list列表",list)
                  this.list = list 
                }
              }
                   calciumArr.push(list[i].dialysis_solution)
                 }
 
-                if(list[i].dialysis_solution!=null&&list[i].dialysis_solution.glucose > 0){
-                  list[i].dialysis_solution.specification_three = "葡萄糖" + list[i].dialysis_solution.glucose
+                if(list[i].dialysis_solution!=null&&list[i].dialysis_solution.amylaceum !=0){
+                  list[i].dialysis_solution.specification_three = "葡萄糖" + list[i].dialysis_solution.amylaceum
                   glucoseArr.push(list[i].dialysis_solution)
                 }
               
               }
             }
 
-            console.log("kaliumArr",kaliumArr)
+            console.log("glucoseArr",glucoseArr)
             if(kaliumArr!=null && kaliumArr.length > 0){
               let dataInfo = {}
               kaliumArr.forEach((item, index) => {
             }
 
             for(let i=0;i<newArr.length;i++){
-              for(let j=0;j<newArr[i].child.length;j++){
-                newArr[i].count += newArr[i].child[j].kalium
-              }
+               newArr[i].count = newArr[i].child.length
             }
            
             console.log("newArr",newArr)
             }
 
             for(let i=0;i<newArr.length;i++){
-              for(let j=0;j<newArr[i].child.length;j++){
-                newArr[i].count += newArr[i].child[j].sodium
-              }
+             newArr[i].count += newArr[i].child.length
+              
             }
            
             console.log("newArr",newArr)
             }
 
             for(let i=0;i<newArr.length;i++){
-              for(let j=0;j<newArr[i].child.length;j++){
-                newArr[i].count += newArr[i].child[j].calcium
-              }
+              newArr[i].count = newArr[i].child.length
+              
             }
            
             console.log("newArr",newArr)
               let { specification_three } = item
               if (!dataInfo[specification_three]) {
                 dataInfo[specification_three] = {
-                  name:"钠(mmol/L)",
+                  name:"葡萄糖",
                   specification_three:item.specification_three,
-                  specification_name:item.glucose,
+                  specification_name:item.amylaceum,
                   child: [],
                   count:0,
                 }
             }
 
             for(let i=0;i<newArr.length;i++){
-              for(let j=0;j<newArr[i].child.length;j++){
-                newArr[i].count += newArr[i].child[j].glucose
-              }
+             newArr[i].count += newArr[i].child.length
+              
             }
            
             console.log("newArr",newArr)
           
         }
         if(filed_name_cn == "目标超滤量"){
-          return val.target_ultrafiltration
+
+          return val.target_ultrafiltration?val.target_ultrafiltration:""
         }
         if(filed_name_cn == "透析液配方"){
           return this.getDialysateFormulation(val.dialysate_formulation)
           return this.getAnticoagulant(val.anticoagulant)
         }
         if(filed_name_cn == "首剂"){
-          return val.anticoagulant_shouji
+          return val.anticoagulant_shouji?val.anticoagulant_shouji:""
         }
         if(filed_name_cn == "维持"){
-          return val.anticoagulant_weichi
+          return val.anticoagulant_weichi?val.anticoagulant_weichi:""
         }
         if(filed_name_cn == "总量"){
-          return val.anticoagulant_zongliang
+          return val.anticoagulant_zongliang?val.anticoagulant_zongliang:""
         }
         if(filed_name_cn == "置换量"){
-           return val.replacement_total
+           return val.replacement_total?val.replacement_total:""
         }
         if(filed_name_cn == "钾"){
-          return val.kalium
+          return val.kalium?val.kalium:""
         }
         if(filed_name_cn == "钠"){
-           return val.sodium
+           return val.sodium?val.sodium:""
         }
         if(filed_name_cn == "钙"){
-           return val.calcium
+           return val.calcium?val.calcium:""
         }
         if(filed_name_cn == "碳酸氢盐"){
-           return val.bicarbonate
+           return val.bicarbonate?val.bicarbonate:""
         }
         if(filed_name_cn == "透析液流量"){
-            return val.dialysate_flow
+            return val.dialysate_flow?val.dialysate_flow:""
         }
         if(filed_name_cn == "透析液温度"){
-           return val.dialysate_temperature
+           return val.dialysate_temperature?val.dialysate_temperature:""
         }
         if(filed_name_cn == "电导度"){
-           return val.conductivity
+           return val.conductivity?val.conductivity:""
         }
         if(filed_name_cn == "透析器/灌流器"){
            return val.dialyzer_perfusion_apparatus
         }
         if(filed_name_cn == "钙名称"){
-          return val.anticoagulant_gaimingcheng
+          return val.anticoagulant_gaimingcheng?val.anticoagulant_gaimingcheng:""
         }
        if(filed_name_cn == "钙剂量"){
-           return val.anticoagulant_gaijiliang
+           return val.anticoagulant_gaijiliang?val.anticoagulant_gaijiliang:""
         }
        if(filed_name_cn == "体液过多症状"){
           return this.getBodyFluid(val.body_fluid)
           return   val.dialysis_duration_hour + "小时" + val.dialysis_duration_minute + "分钟"
         }
         if(filed_name_cn == "置换液总量"){
-         return val.displace_liqui_value
+         return val.displace_liqui_value?val.displace_liqui_value:""
         }
         if(filed_name_cn == "透析器"){
           return val.dialysis_dialyszers
           return ""
         }
         if(filed_name_cn == "葡萄糖"){
-           return val.glucose
+           return val.amylaceum?val.amylaceum:""
         }
         if(filed_name_cn == "单超时长"){
            return  ""
           return  ""
         }
         if(filed_name_cn == "血浆分离器"){
-           return val.plasma_separator
+           return val.plasma_separator?val.plasma_separator:""
         }
        if(filed_name_cn == "透析管路"){
           return this.getHemodialysisPipelines(val.hemodialysis_pipelines)
           return ""
         }
        if(filed_name_cn == "穿刺针"){
-          return val.puncture_needle
+          return val.puncture_needle?val.puncture_needle:""
         }
       //  if(filed_name_cn == "穿刺针支数"){
       //     return val.puncture_needle_count
       //   }
        if(filed_name_cn == "促红素"){
-          return val.epo_count
+          return val.epo_count?val.epo_count:""
         }
         if(filed_name_cn == "促红素支数"){
-          return val.epo_count
+          return val.epo_count?val.epo_count:""
         }
         if(filed_name_cn == "最大超滤率"){
-          return val.max_ultrafiltration_rate
+          return val.max_ultrafiltration_rate?val.max_ultrafiltration_rate:""
         }
       },
       getModeName(id){
        this.tableList = []
        this.toStatistics()
      }
+    },
+    toClick(){
+      const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+       })
+      getSolutionlistByOrgId().then(response=>{
+        if(response.data.state == 1){
+          var list =  response.data.data.list
+          console.log("list23322323",list)
+          loading.close()
+          this.$message.success("更新成功!")
+        }
+      })
     }
    }
   }

src/xt_pages/dialysis/details/consumable/dialysisParameter.vue

                       :editable="false" :clearable="false" style="width: 196px;margin-right:10px;" type="date"
                       format="yyyy-MM-dd"
                       value-format="yyyy-MM-dd"
-                      placeholder="选择日期时间" align="right"></el-date-picker>
+                      placeholder="选择日期时间" align="right"
+                      :picker-options="pickerOptions"></el-date-picker>
       <el-input size="small" style="width: 180px;" @keyup.enter.native='searchAction' v-model.trim="search_input"
                 class="filter-item" v-model="query.keywords"/>
       <el-button size="small" class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
         <el-button size="small" icon="el-icon-printer" @click="toSign" type="primary">标签打印</el-button>
         <el-button size="small" icon="el-icon-printer" @click="printAction" type="primary">标签打印设置</el-button>
         
-        <el-button size="small" icon="el-icon-printer" @click="exportList" type="primary">导出</el-button>
-        <el-button size="small" icon="el-icon-printer" @click="toPrint" type="primary">打印</el-button>
+        <el-button size="small"  @click="exportList" type="primary">导出</el-button>
+        <el-button size="small"  @click="toPrint" icon="el-icon-printer" type="primary">打印</el-button>
         <el-button size="small" type="primary" @click="statistics">统计表</el-button>
       </div>
     </div>
 
        <el-table-column align="center" label="封管液" v-if="dialysisSett.sealing_fluid_dispose == 1">
            <template slot-scope="scope">
-             <span v-if="scope.row.xt_assesment_after_dislysis.sealing_fluid_dispose>0">{{scope.row.xt_assesment_after_dislysis.sealing_fluid_dispose}} </span> 
+             <span>{{scope.row.xt_assesment_after_dislysis.sealing_fluid_dispose}} </span> 
            </template>
         </el-table-column>
 
         <el-table-column align="center" label="葡萄糖"  v-if="dialysisSett.glucose==1">
            <template slot-scope="scope">
-             <span  v-if="scope.row.dialysis_prescription.amylaceum>0">{{scope.row.dialysis_prescription.amylaceum}} </span> 
+             <span>{{scope.row.dialysis_prescription.amylaceum?scope.row.dialysis_prescription.amylaceum:""}} </span> 
+           </template>
+        </el-table-column>
+
+       <el-table-column align="center" label="血流量"  v-if="dialysisSett.blood_flow_volume==1">
+           <template slot-scope="scope">
+             <span>{{scope.row.dialysis_prescription.blood_flow_volume?scope.row.dialysis_prescription.blood_flow_volume:""}} </span> 
            </template>
         </el-table-column>
       </el-table>
               :value="item.id">
             </el-option>
            </el-select>
-           <el-button size="small" icon="el-icon-printer" @click="toPrintOne" type="primary">打印</el-button>
-           <el-button size="small" icon="el-icon-printer" @click="exportListOne" type="primary">导出</el-button>
+           <el-button size="small" @click="toPrintOne" icon="el-icon-printer" type="primary">打印</el-button>
+           <el-button size="small"  @click="exportListOne" type="primary">导出</el-button>
         </div> 
        <el-table
         :data="tableList"
         anticoagulant_zongliang: false,
         doctor_advice: false,
         displace_liqui_part_option:[],
-        ids:""
+        ids:"",
+        form: {
+          id: 0,
+          prescription_status: '',
+          week: '',
+          name: '',
+          zone: '',
+          classes: '',
+          number: '',
+          mode: '',
+          dialyzers: '',
+          perfusion_apparatus: '',
+          anticoagulant: '',
+          anticoagulant_zongliang: '',
+          doctor_advice: ''
+        },
+        pickerOptions:{ //禁用当前日期之前的日期
+           disabledDate(v) {
+            //Date.now()是javascript中的内置函数，它返回自1970年1月1日00:00:00 UTC以来经过的毫秒数。
+            return v.getTime() < new Date().getTime() - 86400000;
+          },
+        },
       }
     },
     created() {
            if(response.data.state == 1){
             this.startdialogVisible = true
             var list = response.data.data.list
-            // console.log("list232323223222wid",list)
-            var total = 0
-            var total_one = 0
-            var total_two = 0
-            var total_three = 0
-            var total_four = 0
-            var total_five = 0
-            var total_six = 0
-            var total_seven =0
-            var total_eight = 0
-            var total_night =0
-            var total_ten = 0
-            var total_elven = 0
-            var total_twenty = 0
-          
+            var anticoagulantList = []
             if(list!=null && list.length>0){
               for(let i=0;i<list.length;i++){
                  list[i].dialysis_dialyszers_arr = []
                  if(list[i].dialysis_prescription.dialysis_irrigation!=""){
                    list[i].dialysis_irrigation_arr = list[i].dialysis_prescription.dialysis_irrigation.split(",")
                  }
+
+                
                  if(list[i].dialysis_prescription.anticoagulant == 1){
-                     total += list[i].dialysis_prescription.anticoagulant_zongliang 
+                    anticoagulantList.push(list[i].dialysis_prescription)
                  }
                  if(list[i].dialysis_prescription.anticoagulant == 2){
-                     total_one += list[i].dialysis_prescription.anticoagulant_zongliang 
+                    anticoagulantList.push(list[i].dialysis_prescription)
                  }
                 if(list[i].dialysis_prescription.anticoagulant == 3){
-                     total_two += list[i].dialysis_prescription.anticoagulant_zongliang 
+                    anticoagulantList.push(list[i].dialysis_prescription)
                  }
                  if(list[i].dialysis_prescription.anticoagulant == 4){
-                     total_three += list[i].dialysis_prescription.anticoagulant_zongliang 
+                    anticoagulantList.push(list[i].dialysis_prescription)
                  }
                 if(list[i].dialysis_prescription.anticoagulant == 5){
-                     total_four += list[i].dialysis_prescription.anticoagulant_zongliang 
+                   anticoagulantList.push(list[i].dialysis_prescription)
                  }
                   if(list[i].dialysis_prescription.anticoagulant == 6){
-                     total_five += list[i].dialysis_prescription.anticoagulant_zongliang 
+                    anticoagulantList.push(list[i].dialysis_prescription)
                  }
                   if(list[i].dialysis_prescription.anticoagulant == 7){
-                     total_six += list[i].dialysis_prescription.anticoagulant_zongliang 
+                   anticoagulantList.push(list[i].dialysis_prescription)
                  }
                   if(list[i].dialysis_prescription.anticoagulant == 8){
-                     total_seven += list[i].dialysis_prescription.anticoagulant_zongliang 
+                   anticoagulantList.push(list[i].dialysis_prescription)
                  }
                  if(list[i].dialysis_prescription.anticoagulant == 9){
-                     total_eight += list[i].dialysis_prescription.anticoagulant_zongliang 
+                   anticoagulantList.push(list[i].dialysis_prescription)
                  }
                   if(list[i].dialysis_prescription.anticoagulant == 10){
-                     total_night += list[i].dialysis_prescription.anticoagulant_zongliang 
+                    anticoagulantList.push(list[i].dialysis_prescription)
                  }
                   if(list[i].dialysis_prescription.anticoagulant == 11){
-                     total_ten+= list[i].dialysis_prescription.anticoagulant_zongliang 
+                    anticoagulantList.push(list[i].dialysis_prescription)
                  }
                   if(list[i].dialysis_prescription.anticoagulant == 12){
-                     total_elven+= list[i].dialysis_prescription.anticoagulant_zongliang 
+                    anticoagulantList.push(list[i].dialysis_prescription)
                  }
-                   if(list[i].dialysis_prescription.anticoagulant == 13){
-                     total_twenty+= list[i].dialysis_prescription.anticoagulant_zongliang 
+                 if(list[i].dialysis_prescription.anticoagulant == 13){
+                   anticoagulantList.push(list[i].dialysis_prescription)
                  }
               }
             }
+            console.log("anticoagulantList",anticoagulantList)
+           this.tableList = []
+           if(anticoagulantList!=null && anticoagulantList.length > 0){
+                let dataInfoOne = {}
+                anticoagulantList.forEach((item, index) => {
+                let { anticoagulant } = item
+                if (!dataInfoOne[anticoagulant]) {
+                  dataInfoOne[anticoagulant] = {
+                    anticoagulant:item.anticoagulant,
+                    name: "抗凝剂",
+                    specification_name:this.getAnticoagualnt(item.anticoagulant),
+                    count:0,
+                    child:[]
+                  }
+                }
+              })
+            let hisarr = Object.values(dataInfoOne)
+            if(hisarr!=null && hisarr.length > 0){
+              for(let i=0;i<anticoagulantList.length;i++){
+                for(let j=0;j<hisarr.length;j++){
+                  if(anticoagulantList[i].anticoagulant == hisarr[j].anticoagulant){
+                     hisarr[j].child.push(anticoagulantList[i])
+                  }
+                }
+              }
+            }
+            for(let i=0;i<hisarr.length;i++){
+              hisarr[i].count = hisarr[i].child.length
+              this.tableList.push(hisarr[i])
+            }
+            console.log("hisarr",hisarr)
+           }
             var dialysisDialyszersArr = []
             var dialyzerPerfusionApparaArr = []
             var dialysisIrrigationArr = []
             for(let i=0;i<list.length;i++){
              for(let j=0;j<list[i].dialysis_dialyszers_arr.length;j++){
-              // console.log("list23323232",list[i].dialysis_dialyszers_arr[j])
                dialysisDialyszersArr.push(list[i].dialysis_dialyszers_arr[j])  
              }
              for(let z=0;z<list[i].dialyzer_perfusion_apparatus_arr.length;z++){
               dialysisIrrigationArr.push(list[i].dialysis_irrigation_arr[y])
              }
             }
-            // console.log("透析器",dialysisDialyszersArr)
-            // console.log("透析器/灌流器",dialyzerPerfusionApparaArr)
-            // console.log("灌流器",dialysisIrrigationArr)
-             
            let obj = {}
            let objOne = {}
            let objTwo = {}
               a.specification_name = i
               Arr.push(a);
             }
-          //   console.log("newa",Arr)
-          //  console.log("total_one",total_one)
-           var  objArr = {name:"抗凝剂",specification_name:"无肝素",count:0}
-           objArr.count = total
-           var objArrOne = {name:"抗凝剂",specification_name:"普通肝素",count:0}
-            objArrOne.count = total_one
-           var objArrTwo = {name:"抗凝剂",specification_name:"低分子肝素",count:0}
-            objArrTwo.count = total_two
-           var objArrThree = {name:"抗凝剂",specification_name:"阿加曲班",count:0}
-            objArrThree.count = total_three
-           var objArrFour = {name:"抗凝剂",specification_name:"枸橼酸钠",count:0}
-            objArrFour.count = total_four
-           var objArrFive = {name:"抗凝剂",specification_name:"低分子肝素钙",count:0}
-            objArrFive.count = total_five
-           var objArrSix = {name:"抗凝剂",specification_name:"低分子肝素钠",count:0}
-            objArrSix.count = total_six
-           var objArrSeven = {name:"抗凝剂",specification_name:"依诺肝素",count:0}
-            objArrSeven.count = total_seven
-           var objArrEight = {name:"抗凝剂",specification_name:"达肝素",count:0}
-            objArrSeven.count = total_eight
-           var objArrNight = {name:"抗凝剂",specification_name:"体外抗凝",count:0}
-            objArrNight.count = total_eight
-           var objArrTen = {name:"抗凝剂",specification_name:"那屈肝素",count:0}
-            objArrTen.count = total_ten
-           var objArrEleven = {name:"抗凝剂",specification_name:"无抗凝剂",count:0}
-            objArrEleven.count = total_elven
-           var objArrTwenty = {name:"抗凝剂",specification_name:"那屈肝素钙",count:0}
-            objArrTwenty.count = total_twenty
-            //  console.log("objArrOne",objArrOne.count)
-             this.tableList = []
-              if(parseInt(objArr.count) > 0){
-                this.tableList.push(objArr)
-              }
-              // console.log("objArrOne",parseInt(objArrOne.count))
-             if(parseInt(objArrOne.count) > 0){
-                // console.log("j你了了呃呃呃呃呃呃")
-                this.tableList.push(objArrOne)
-              }
-              if(parseInt(objArrTwo).count > 0){
-                this.tableList.push(objArrTwo)
-              }
-               if(parseInt(objArrThree).count > 0){
-                this.tableList.push(objArrThree)
-              }
-               if(parseInt(objArrFour.count) > 0){
-                this.tableList.push(objArrFour)
-              }
-               if(parseInt(objArrFive.count) > 0){
-                this.tableList.push(objArrFive)
-              }
-               if(parseInt(objArrSix.count) > 0){
-                this.tableList.push(objArrSix)
-              }
-               if(parseInt(objArrSeven.count) > 0){
-                this.tableList.push(objArrSeven)
-              }
-               if(parseInt(objArrEight.count) > 0){
-                this.tableList.push(objArrEight)
-              }
-               if(parseInt(objArrNight.count) > 0){
-                this.tableList.push(objArrNight)
-              }
-               if(parseInt(objArrTen.count) > 0){
-                this.tableList.push(objArrTen)
-              }
-               if(parseInt(objArrEleven.count) > 0){
-                this.tableList.push(objArrEleven)
-              }
-               if(parseInt(objArrTwenty).count > 0){
-                this.tableList.push(objArrTwenty)
-              }
-              
-            
+
             if(Arr.length >0){
               for(let i=0;i<Arr.length;i++){
                  this.tableList.push(Arr[i])
               this.list[i].patient_name = this.list[i].patient.name
               this.list[i].dialysis_no = this.list[i].patient.dialysis_no
               this.list[i].admission_number = this.list[i].xt_receive_treatment_asses.admission_number
-              this.list[i].weight_before = this.list[i].assessment_befor_dislysis.weight_befor
-              this.list[i].dry_weight = this.list[i].assessment_befor_dislysis.dry_weight
-              this.list[i].blood_pressure = this.list[i].assessment_befor_dislysis.systolic_blood_pressure + "/" + this.list[i].assessment_befor_dislysis.diastolic_blood_pressure
-              this.list[i].ultrafiltration_volume = this.list[i].dialysis_prescription.target_ultrafiltration
+              this.list[i].weight_before = this.list[i].assessment_befor_dislysis.weight_before?this.list[i].assessment_befor_dislysis.weight_before:"",
+              this.list[i].dry_weight = this.list[i].assessment_befor_dislysis.dry_weight?this.list[i].assessment_befor_dislysis.dry_weight:""
+              this.list[i].blood_pressure = this.list[i].assessment_befor_dislysis.systolic_blood_pressure?this.list[i].assessment_befor_dislysis.systolic_blood_pressure:"" + "/" + this.list[i].assessment_befor_dislysis.diastolic_blood_pressure? this.list[i].assessment_befor_dislysis.diastolic_blood_pressure:""
+              if(this.list[i].blood_pressure == 0){
+                this.list[i].blood_pressure = ""
+              }
+              this.list[i].ultrafiltration_volume = this.list[i].dialysis_prescription.target_ultrafiltration?this.list[i].dialysis_prescription.target_ultrafiltration:""
              
-              this.list[i].anticoagulant_one = this.getAnticoagualnt(this.list[i].dialysis_prescription.anticoagulant) + this.list[i].dialysis_prescription.anticoagulant_shouji + this.list[i].dialysis_prescription.anticoagulant_weichi+this.list[i].dialysis_prescription.anticoagulant_zongliang
-              
-              this.list[i].dialysis_time = this.list[i].dialysis_prescription.dialysis_duration_hour + "时"+ this.list[i].dialysis_prescription.dialysis_duration_minute + "分"
+              this.list[i].anticoagulant_one = this.getAnticoagualnt(this.list[i].dialysis_prescription.anticoagulant) + "(" + this.list[i].dialysis_prescription.anticoagulant_shouji?this.list[i].dialysis_prescription.anticoagulant_shouji:"" +")" + "("+this.list[i].dialysis_prescription.anticoagulant_weichi?this.list[i].dialysis_prescription.anticoagulant_weichi:"" +")"+ +"("+this.list[i].dialysis_prescription.anticoagulant_zongliang?this.list[i].dialysis_prescription.anticoagulant_zongliang:""+")"
+              if(this.list[i].anticoagulant_one == 0){
+                this.list[i].anticoagulant_one = ""
+              }
+              this.list[i].dialysis_time = this.list[i].dialysis_prescription.dialysis_duration_hour?this.list[i].dialysis_prescription.dialysis_duration_hour:"" + "时"+ this.list[i].dialysis_prescription.dialysis_duration_minute?this.list[i].dialysis_prescription.dialysis_duration_minute:"" + "分"
+              if(this.list[i].dialysis_time == 0){
+               this.list[i].dialysis_time = ""
+              }
               this.list[i].device_type = this.list[i].assessment_befor_dislysis.machine_type
               this.list[i].dialyzer_perfusion_apparatus = this.list[i].dialysis_prescription.dialyzer_perfusion_apparatus
               this.list[i].dialysis_dialyszers = this.list[i].dialysis_prescription.dialysis_dialyszers
               this.list[i].dialysis_irrigation = this.list[i].dialysis_prescription.dialysis_irrigation
-              this.list[i].displace_liqui_value = this.list[i].dialysis_prescription.replacement_total
-              this.list[i].kalium = this.list[i].dialysis_prescription.kalium
-              this.list[i].sodium = this.list[i].dialysis_prescription.sodium
-              this.list[i].calcium = this.list[i].dialysis_prescription.bicarbonate
+              this.list[i].displace_liqui_part = this.getDisplaceLiquiPart(this.list[i].dialysis_prescription.displace_liqui_part)
+              this.list[i].displace_liqui_value = this.list[i].dialysis_prescription.displace_liqui_value? this.list[i].dialysis_prescription.displace_liqui_value:""
+              this.list[i].kalium = this.list[i].dialysis_prescription.kalium?this.list[i].dialysis_prescription.kalium:""
+              this.list[i].sodium = this.list[i].dialysis_prescription.sodium?this.list[i].dialysis_prescription.sodium:""
+              this.list[i].calcium = this.list[i].dialysis_prescription.calcium?this.list[i].dialysis_prescription.calcium:""
               this.list[i].blood_access = this.getBloodAccessOption(this.list[i].dialysis_prescription.blood_access)
               this.list[i].sealing_fluid_dispose =this.list[i].xt_assesment_after_dislysis.sealing_fluid_dispose
-              this.list[i].glucose = this.list[i].dialysis_prescription.amylaceum
+              this.list[i].glucose = this.list[i].dialysis_prescription.glucose?this.list[i].dialysis_prescription.glucose:""
+              this.list[i].blood_flow_volume = this.list[i].dialysis_prescription.blood_flow_volume?this.list[i].dialysis_prescription.blood_flow_volume:""
+              this.list[i].bicarbonate = this.list[i].dialysis_prescription.bicarbonate? this.list[i].dialysis_prescription.bicarbonate:""
             }
          }
 
-        // console.log("list23323232322323wode",this.list)
+         console.log("list23323232322323wode",this.list)
+         
          var arr= []
          var arrTwo = []
          arr.push('序号')
          }
          if(this.dialysisSett.weight_befor == 1){
            arr.push("透前体重")
-           arrTwo.push("weight_befor")
+           arrTwo.push("weight_before")
          }
          if(this.dialysisSett.dry_weight == 1){
            arr.push("干体重")
            arr.push("灌流器")
            arrTwo.push("dialysis_irrigation")
          }
+         if(this.dialysisSett.displace_liqui_part == 1){
+           arr.push("置换液")
+           arrTwo.push("displace_liqui_part")
+         }
          if(this.dialysisSett.displace_liqui_value == 1){
            arr.push("置换液总量")
            arrTwo.push("displace_liqui_value")
            arr.push("葡萄糖")
            arrTwo.push("glucose")
         }
+       if(this.dialysisSett.blood_flow_volume == 1){
+           arr.push("血流量")
+           arrTwo.push("blood_flow_volume")
+        }
          
        
         const tHeader = arr
         getRemindPrintList().then(response => {
           if (response.data.state == 1) {
             var list = response.data.data.list
-            // console.log('list222332', list)
+            console.log('list222332', list)
             if (list.anticoagulant == 1) {
               // console.log('进来22222')
               this.anticoagulant = true

src/xt_pages/dialysis/dialysisPrintOrder.vue

             v-if="org_template_info.template_id == 50"
           >
           </DialysisPrintOrderFifty>
-          <DialysisPrintOrderSixtyOne
+          
+          <DialysisPrintOrderFiftyOne
             v-bind:childResponse="childResponse"
             v-if="org_template_info.template_id == 51"
           >
-          </DialysisPrintOrderSixtyOne>
+          </DialysisPrintOrderFiftyOne>
           <DialysisPrintOrderFiftyTwo
             v-bind:childResponse="childResponse"
             v-if="org_template_info.template_id == 52"

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyOne.vue

         console.log("ooo");
         name = name.replace("区", "");
       }
+      console.log("name2232323",name)
       return name;
     },
 

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyThree.vue

                           </span>
                         </div>
                         <div style="width: 250px">
-                          透析次数第:&nbsp;<span>
+                          透析次数:&nbsp;第<span>
                             {{
                               patientInfo.total_dialysis +
                               patientInfo.user_sys_before_count

src/xt_pages/user/dialysisSolution.vue

             <el-col :span="6" v-if="isShows('透析器')"><div class="grid-content bg-purple">透析器:{{current_solution.dialysis_dialyszers}}</div></el-col>
             <el-col :span="6" v-if="isShows('灌流器')"><div class="grid-content bg-purple">灌流器:{{current_solution.dialysis_irrigation}}</div></el-col>
             <el-col :span="6" v-if="isShows('碳酸氢盐')"><div class="grid-content bg-purple">碳酸氢盐(mmol/L):{{current_solution.bicarbonate}}</div></el-col>
-            <el-col :span="6" v-if="isShows('葡萄糖')"><div class="grid-content bg-purple">葡萄糖(mmol/L):{{current_solution.glucose}}</div></el-col>
+            <el-col :span="6" v-if="isShows('葡萄糖')"><div class="grid-content bg-purple">葡萄糖(mmol/L):{{current_solution.amylaceum}}</div></el-col>
          </el-row>
 
             <el-row :gutter="20">
               <el-input v-model="addPlan.bicarbonate"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8" v-if="isShows('葡萄糖')">
+          <!-- <el-col :span="8" v-if="isShows('葡萄糖')">
             <el-form-item label="葡萄糖（mmol/L）: " prop="glucose">
               <el-input v-model="addPlan.glucose"></el-input>
             </el-form-item>
+          </el-col> -->
+          
+          <el-col :span="8" v-if="isShows('葡萄糖')">
+            <el-form-item label="葡萄糖（mmol/L）: " prop="amylaceum">
+              <el-input v-model="addPlan.amylaceum"></el-input>
+            </el-form-item>
           </el-col>
 
+
           <el-col :span="8" v-if="isShows('透析液流量')">
             <el-form-item label="透析液流量（ml/min）: " prop="dialysate_flow">
               <el-input v-model="addPlan.dialysate_flow"></el-input>
         epo:"",
         epo_count:"",
         max_ultrafiltration_rate:"",
-
+        amylaceum:"",
       },
       childPlan: {
         mode: '',