8月15日

src/router/modules/dialysis.js

         noCache: true
       }
     },
+    {
+      path: '/dialysis/consumable/dialysisgoodprint',
+      component: () => import('@/xt_pages/dialysis/details/consumable/dialysisGoodPrint'),
+      name: '透前耗材',
+      meta: {
+        title: '透前耗材',
+        noCache: true
+      },
+      is_menu: false,
+      hidden: true
+    },
+    {
+      path: '/dialysis/consumable/dialysisgoodcountprint',
+      component: () => import('@/xt_pages/dialysis/details/consumable/dialysisGoodCountPrint'),
+      name: '透前统计耗材',
+      meta: {
+        title: '透前统计耗材',
+        noCache: true
+      },
+      is_menu: false,
+      hidden: true
+    },
     // {
     //   path: '/dialysis/consumable/dialysis/print',
     //   component: () => import('@/xt_pages/dialysis/details/consumable/signPrint'),

src/xt_pages/dialysis/components/consumables.vue

           this.list.map(item => {
             a.push(item.good_type)
           })
-          // console.log('aaaaaaaaa',a)
+          console.log('aaaaaaaaa',a)
           let b = []
 
           a.map(item => {
             b.push(obj)
           })
           var temp = []
-          // console.log('bbbbbbbbbb',b)
+          console.log('bbbbbbbbbb',b)
           for(let i=0;i<b.length;i++){
             var objC = {...b[i]}
             temp.push(objC)
               obj2[str] = i[str]
             })
             tempTwo.push(obj2)
-            // console.log(325556574342354234234,tempTwo)
           })
 
           this.arrList.push(...tempTwo)
 
        exportList(){
          import('@/vendor/Export2Excel').then(excel => {
-
-
-
          var arrTwo = []
          for(let i=0;i<this.arrKey.length;i++){
             arrTwo.push('name'+i)

src/xt_pages/dialysis/details/acceptsAssessment.vue

       </ul>
       <ul>
         <li v-if="this.record.condition == 1">
-          <label> 住院号</label>
+          <label> 住院号:</label>
           <span class="content">{{ this.record.admission_number }}</span>
         </li>
 
+        <li v-if="this.record.condition == 1">
+          <label> 住院科室:</label>
+          <span class="content">{{ this.record.his_department }}</span>
+        </li>
+
+        <li v-if="this.record.condition == 1">
+          <label> 住院床位:</label>
+          <span class="content">{{ this.record.his_bed }}</span>
+        </li>
+
         <li v-if="isShow('病人意识')">
           <label>病人意识 :</label>
           <span class="content">{{ consciousness }}</span>

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="exportList" 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" 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" 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>
               :value="item.id">
             </el-option>
            </el-select>
+
+         <el-button size="small" icon="el-icon-printer" @click="toPrintOne" type="primary">打印</el-button>
         </div> 
        <el-table
         :data="tableList"
         schedule_type:0,
         partion_type:0,
         goodTypeList:[],
-        his_config:"",
+        his_config:{},
         startDialogVisibleOne:false,
         type_name:false,
         checkedOne:false,
     methods: {
     
       exportList(){
+        import('@/vendor/Export2Excel').then(excel => {
+         
+         var arr= []
+        
+         arr.push('序号')
+         arr.push('透析机号')
+         arr.push('姓名')
+         arr.push('透析号')
+       
+         console.log("list23322323232",this.rowList)
+         if(this.rowList!=null && this.rowList.length > 0){
+           for(let i=0;i<this.rowList.length;i++){
+             arr.push(this.rowList[i].filed_name_cn)
+           }
+         }
+        
+         arr.push("备注")
+         console.log("arr",arr)
 
+         var arrTwo = []
+         for(let i=0;i<arr.length;i++){
+            arrTwo.push('name'+i)
+         }
+         console.log("arrTwo",arrTwo)
+         const tHeader = arr
+        const filterVal = arrTwo
+        
+        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].name2 = this.list[i].patient.name
+            this.list[i].name3 = this.list[i].patient.dialysis_no
+            if(this.rowList!=null && this.rowList.length > 0){
+              for(let j=0;j<this.rowList.length;j++){
+                this.list[i]['name'+(j+4)] = this.getName(this.list[i].rowList[j].filed_name_cn,this.list[i].dialysis_solution)
+                this.list[i]['name'+(this.rowList.length+4)] = this.list[i].dialysis_solution.remark
+              }
+            }
+         
+          }
+        }
+        console.log("list32232232323wi",this.list)
+        const data = this.formatJson(filterVal, this.list)
+         excel.export_json_to_excel({
+           header: tHeader,
+           data,
+           filename: '透析耗材查询'
+         })
+          this.downloadLoading = false
+        }) 
+      },
+      formatJson(filterVal, jsonData) {
+        return jsonData.map(v => filterVal.map(j => v[j]));
+      },
+      createKeys(arr){
+        const obj = {};
+        arr.forEach((value,index)=>{
+          obj['name' + index] = value;
+        })
+        return obj;
       },
       open(){
        this.getlist()
       },
       getlist(){
+         console.log("paramsy2332322323",this.query)
         getPatientDialysisSolutionGroupList(this.query).then(response=>{
            if(response.data.state == 1){
              var list = response.data.data.list
         })
       },
       statistics() {
-        
         var params = {
           schedule_type:this.schedule_type,
           partion_type:this.partion_type,
        }
     
       return str
+    },
+    toPrint(){
+     this.$router.push({path:'/dialysis/consumable/dialysisgoodprint?limit='+this.query.limit+"&page="+this.query.page+"&partition_id="+this.query.partition_id+"&schedule_date="+this.query.schedule_date+"&schedule_type="+this.query.schedule_type+"&keywords="+this.query.keywords})
+    },
+    toPrintOne(){
+      this.$router.push({path:"/dialysis/consumable/dialysisgoodcountprint?schedule_type="+this.schedule_type+"&partion_type="+this.partion_type+"&selected_date="+this.query.schedule_date+"&is_open="+this.his_config.is_open})
     }
    }
   }

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

         <el-input v-model="receiveTreatmentAsses.admission_number"></el-input>
       </el-form-item>
 
+      <el-form-item
+        label="住院科室 : "
+        v-if="isShow('住院科室')&&this.receiveTreatmentAsses.condition == '1'"
+      >
+        <el-input v-model="receiveTreatmentAsses.his_department"></el-input>
+      </el-form-item>
+      
+      <el-form-item
+        label="住院床位 : "
+        v-if="isShow('住院床位')&&this.receiveTreatmentAsses.condition == '1'"
+      >
+        <el-input v-model="receiveTreatmentAsses.his_bed"></el-input>
+      </el-form-item>
+      
+
       <el-form-item
         label="诊断:" v-if="isShow('诊断') && this.receiveTreatmentAsses.condition == '1'"
       >
           v-model="receiveTreatmentAsses.posture"
           >{{ item.name }}
         </el-radio>
-        <!--<el-radio v-model="receiveTreatmentAsses.posture" label="1">自动体位</el-radio>-->
-        <!--<el-radio v-model="receiveTreatmentAsses.posture" label="2">平卧位</el-radio>-->
-        <!--<el-radio v-model="receiveTreatmentAsses.posture" label="3">半卧位</el-radio>-->
-        <!--<el-radio v-model="receiveTreatmentAsses.posture" label="4">端坐位</el-radio>-->
-        <!--<el-radio v-model="receiveTreatmentAsses.posture" label="5">躁动不安</el-radio>-->
       </el-form-item>
 
       <el-form-item label="病情: " v-if="isShow('病情')">
         admission_number: "",
         diacrisis:"",
         tumble:"",
+        his_department:"",
+        his_bed:"",
       },
       precautionTwo: []
     };

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

                     <el-col :span="8" v-if="isShows('透析模式')">
                         <el-form-item label="透析模式">
                             <el-select
+                                   filterable
                                     v-model="dialysisPrescription.mode_id"
                                     @change="changePrescription(dialysisPrescription.mode_id)"
                             >

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

                 template_id == 56 ||
                 template_id == 60 ||
                 org_id == 10210 ||
-                org_id == 9555)
+                org_id == 9555 || org_id == 10387)
             "
           >
             <template slot-scope="scope">
               template_id != 56 &&
               template_id != 60 &&
               org_id!= 10210 &&
-              org_id != 9555
+              org_id != 9555 && org_id!=10387
             "
           >
             <template slot-scope="scope">
                 template_id == 60 ||
                 org_id == 10210 ||
                 org_id == 9555 ||
-                org_id == 10340)
+                org_id == 10340 ||
+                org_id == 10387)
             "
           >
             <el-form-item label="超滤量(ml)：">
               template_id == 60 &&
               org_id !=  10210 &&
               org_id !=  10340 &&
-              org_id != 9555
+              org_id != 9555 && org_id!=10387
             "
           >
             <el-form-item label="超滤量(L)：">

src/xt_pages/dialysis/details/dialysisMonitoring.vue

           <th width="76px">静脉压/动脉压({{monitores[0]&&monitores[0]['venous_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
           <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
           <th v-if="isShow('跨膜压')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
-          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10340)" width="76px" > 超滤量(ml)</th>
-          <th v-if=" isShow('超滤量') && template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53  && template_id != 54  && template_id != 56  && template_id != 60 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10340"  width="76px"> 超滤量(L) </th>
+          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10340  || this.$store.getters.xt_user.template_info.org_id == 10387)" width="76px" > 超滤量(ml)</th>
+          <th v-if=" isShow('超滤量') && template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53  && template_id != 54  && template_id != 56  && template_id != 60 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id!=10387"  width="76px"> 超滤量(L) </th>
           <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47  || template_id == 48  || template_id == 53 || template_id == 54 || template_id == 56  || template_id == 60)" width="50px"> 超滤率 <br />(ml/h) </th>
           <th v-if="isShow('超滤率') && template_id !=6 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48 &&  template_id !=53 &&  template_id !=54 &&  template_id !=56 &&  template_id !=60" width="50px"> 超滤率 <br />(L/h) </th>
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>

src/xt_pages/outpatientCharges/statementTemplate/printOne.vue

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