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

src/xt_pages/charging/charging_cz.vue

@@ -6,7 +6,21 @@
     <div class="app-container">
       <div style="display: flex;">
         <div style="flex: 2;display: flex;justify-content: space-around;">
-          <div > <el-input v-model="input" placeholder="请输入内容"></el-input></div>
+          <div > 
+              <el-autocomplete
+                  class="inline-input"
+                  v-model.trim="smart_keyword"
+                  :fetch-suggestions="querySearch"
+                  placeholder="请输入内容"
+                  @select="handleSelectTwo"
+                  
+                >
+              <i class="el-icon-search el-input__icon" slot="suffix"></i>
+              <template slot-scope="{ item }">
+                <div class="name">{{ item.name }}</div>
+              </template>
+              </el-autocomplete>
+          </div>
           <div>
             日期查询:
             <el-date-picker
@@ -23,9 +37,7 @@
           <div><el-button type="primary" @click="query">查询</el-button></div>
           <el-button type="primary" @click="newcz_show=true">新增</el-button>
         </div>
-        <div style="flex: 1;text-align: right;">
-          
-        </div>
+       
       </div>
       <div style="margin:10px 0;">
         <el-table border :data="tableData" style="width: 100%" :header-cell-style="{'text-align':'center'}" :cell-style="{'text-align':'center'}">
@@ -110,10 +122,10 @@
           <el-form-item label="患者姓名:">
             <el-autocomplete
               class="inline-input"
-               v-model.trim="smart_keyword"
+               v-model.trim="smart_keyword_one"
               :fetch-suggestions="querySearch"
               placeholder="请输入内容"
-              @select="handleSelect"
+              @select="handleSelectOne"
               
             >
            <i class="el-icon-search el-input__icon" slot="suffix"></i>
@@ -168,6 +180,7 @@ import { start } from "nprogress";
 
         },
         smart_keyword:"",
+        smart_keyword_one:"",
         currentPage:1,
         tableData: [],
         patient_id:0,
@@ -183,6 +196,8 @@ import { start } from "nprogress";
         userList:[],
         start_time:"",
         end_time:"",
+        patient_id_one:"",
+        page:1,
       }
     },
     methods:{
@@ -208,6 +223,14 @@ import { start } from "nprogress";
         this.patient_id = val.id
         this.getlist()
       },
+      handleSelectOne(val){
+        this.smart_keyword_one = val.name;
+        this.patient_id_one = val.id
+      },
+      handleSelectTwo(val){
+        this.smart_keyword = val.name;
+        this.patient_id = val.id
+      },
       querySearch(queryString, cb){
         let key = ''
         if (queryString != undefined) {
@@ -242,7 +265,7 @@ import { start } from "nprogress";
       },
       savePatentCount(){
         var params = {
-          patient_id:this.patient_id,
+          patient_id:this.patient_id_one,
           hd_count:this.hd_count,
           hdf_count:this.hdf_count,
           hdhp_count:this.hdhp_count,
@@ -255,6 +278,7 @@ import { start } from "nprogress";
              var msg = response.data.data.msg
              this.$message.success("保存成功")
              this.newcz_show = false
+             this.getlist()
           }
        }) 
       },

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

@@ -2105,6 +2105,28 @@
       }
       ,
       show(his_is_open,is_advice_open) {
+
+       
+        if(this.org_id == 0 || this.org_id == 10744){
+          var newArr = []
+          if(this.doctor_advices!=null && this.doctor_advices.length>0){
+            for(let i=0;i<this.doctor_advices.length>0;i++){
+                if(this.doctor_advices[i].origin == 1){
+                  newArr.push(this.doctor_advices[i])
+                }
+                if(this.doctor_advices[i].origin == 2){
+                  if(this.doctor_advices[i].delivery_way != '口服'){
+                    newArr.push(this.doctor_advices[i])
+                  }  
+                }
+            }
+          }
+          this.doctor_advices = []
+          this.doctor_advices = newArr  
+        }
+      
+       
+       
        this.handleSpanTempArrOne()
       // var childMap = {}
       // for (const index in this.doctor_advices) {

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

@@ -856,7 +856,7 @@
                         </el-form-item>
                     </el-col>
 
-                    <el-col :span="8" v-if="isShows('透析器') && this.$store.getters.xt_user.template_info.org_id != 10164 && this.$store.getters.xt_user.template_info.org_id != 10727">
+                    <el-col :span="8" v-if="isShows('透析器') && this.$store.getters.xt_user.template_info.org_id != 10751 && this.$store.getters.xt_user.template_info.org_id != 10727">
                         <el-form-item label="透析器:" prop="dialysis_dialyszers" :rules="isCheckmust('透析器')">
                             <el-input v-model="dialysisPrescription.dialysis_dialyszers"
                                       @focus="showInnerDialog('7')"></el-input>
@@ -864,7 +864,7 @@
                     </el-col>
 
 
-                    <el-col :span="8" v-if="isShows('透析器') && (this.$store.getters.xt_user.template_info.org_id == 10164 || this.$store.getters.xt_user.template_info.org_id == 10727)"  >
+                    <el-col :span="8" v-if="isShows('透析器') && (this.$store.getters.xt_user.template_info.org_id == 10751 || this.$store.getters.xt_user.template_info.org_id == 10727)"  >
                         <el-form-item label="透析器:" prop="dialysis_dialyszers" :rules="isCheckmust('透析器')">
                             <el-input v-model="dialysisPrescription.dialysis_dialyszers"
                                       @focus="showInnerDialog('20')"></el-input>
@@ -874,14 +874,14 @@
                 
 
 
-                    <el-col :span="8" v-if="isShows('灌流器') && this.$store.getters.xt_user.template_info.org_id != 10164">
+                    <el-col :span="8" v-if="isShows('灌流器') && this.$store.getters.xt_user.template_info.org_id != 10164&& this.$store.getters.xt_user.template_info.org_id != 10751">
                         <el-form-item label="灌流器:" prop="dialysis_irrigation" :rules="isCheckmust('灌流器')">
                             <el-input v-model="dialysisPrescription.dialysis_irrigation"
                                       @focus="showInnerDialog('8')"></el-input>
                         </el-form-item>
                     </el-col>
 
-                    <el-col :span="8" v-if="isShows('灌流器') && this.$store.getters.xt_user.template_info.org_id == 10164">
+                    <el-col :span="8" v-if="isShows('灌流器') && (this.$store.getters.xt_user.template_info.org_id == 10164 || this.$store.getters.xt_user.template_info.org_id == 10751)">
                         <el-form-item label="灌流器:" prop="dialysis_irrigation" :rules="isCheckmust('灌流器')">
                             <el-input v-model="dialysisPrescription.dialysis_irrigation"
                                       @focus="showInnerDialog('21')"></el-input>
@@ -3350,7 +3350,7 @@ mu
         this.pre = pre
         // console.log("pre1", pre);
         this.getPermission()
-        if(this.$store.getters.xt_user.template_info.org_id==10164 || this.$store.getters.xt_user.template_info.org_id==10721 || this.$store.getters.xt_user.template_info.org_id==10635 || this.$store.getters.xt_user.template_info.org_id==0 || this.$store.getters.xt_user.template_info.org_id == 10726 || this.$store.getters.xt_user.template_info.org_id == 10727  || this.$store.getters.xt_user.template_info.org_id == 10735 || this.$store.getters.xt_user.template_info.org_id == 10740 || this.$store.getters.xt_user.template_info.org_id == 10742|| this.$store.getters.xt_user.template_info.org_id == 10745|| this.$store.getters.xt_user.template_info.org_id == 10751|| this.$store.getters.xt_user.template_info.org_id == 10752|| this.$store.getters.xt_user.template_info.org_id == 10697|| this.$store.getters.xt_user.template_info.org_id == 10757|| this.$store.getters.xt_user.template_info.org_id == 9478){
+        if(this.$store.getters.xt_user.template_info.org_id==10164 || this.$store.getters.xt_user.template_info.org_id==10721 || this.$store.getters.xt_user.template_info.org_id==10635 || this.$store.getters.xt_user.template_info.org_id==0 || this.$store.getters.xt_user.template_info.org_id == 10726 || this.$store.getters.xt_user.template_info.org_id == 10727  || this.$store.getters.xt_user.template_info.org_id == 10735 || this.$store.getters.xt_user.template_info.org_id == 10740 || this.$store.getters.xt_user.template_info.org_id == 10742|| this.$store.getters.xt_user.template_info.org_id == 10745|| this.$store.getters.xt_user.template_info.org_id == 10751|| this.$store.getters.xt_user.template_info.org_id == 10752|| this.$store.getters.xt_user.template_info.org_id == 10697|| this.$store.getters.xt_user.template_info.org_id == 10757 || this.$store.getters.xt_user.template_info.org_id == 9478 || this.$store.getters.xt_user.template_info.org_id == 10766){
           this.getPatientBefor()
         }
 

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

@@ -387,19 +387,19 @@
                 org_id == 10599 || 
                 org_id == 10612 ||
                 org_id == 10617 ||
-                org_id ==10580 || org_id ==10629 || org_id==10677 || org_id ==10667 || org_id ==10697 || org_id ==10635 || org_id ==10702 || org_id ==10090 || org_id ==10723 || org_id == 10721 || org_id ==10727 || org_id == 10206 || org_id == 10740 || org_id == 10742|| org_id == 10745 || org_id == 10751 || org_id == 10752 || org_id == 10757 ) &&
+                org_id ==10580 || org_id ==10629 || org_id==10677 || org_id ==10667 || org_id ==10697 || org_id ==10635 || org_id ==10702 || org_id ==10090 || org_id ==10723 || org_id == 10721 || org_id ==10727 || org_id == 10206 || org_id == 10740 || org_id == 10742|| org_id == 10745 || org_id == 10751 || org_id == 10752 || org_id == 10757 || org_id == 10766) &&
                 org_id!=10387
             "
           >
             <template slot-scope="scope">
-             <span v-if="org_id == 10440 || org_id == 9671 || org_id ==10206 || org_id ==10612 || org_id ==10617 || org_id ==10702 || org_id == 10644 || org_id == 10744">
+             <span v-if="org_id == 10440 || org_id == 9671 || org_id ==10206 || org_id ==10612 || org_id ==10617 || org_id ==10702 || org_id == 10644 || org_id == 10744 || org_id== 10766">
               {{
                 scope.row.ultrafiltration_volume
                   ? scope.row.ultrafiltration_volume
                   : "0"
               }}
               </span>
-               <span v-if="org_id != 10440 && org_id!=9671 && org_id!=10206 && org_id!=10612 && org_id!=10617 && org_id!=10702 && org_id!=10644&& org_id!=10744">
+               <span v-if="org_id != 10440 && org_id!=9671 && org_id!=10206 && org_id!=10612 && org_id!=10617 && org_id!=10702 && org_id!=10644&& org_id!=10744 && org_id!=10766">
               {{
                 scope.row.ultrafiltration_volume
                   ? scope.row.ultrafiltration_volume
@@ -458,7 +458,7 @@
               && org_id!=10432 && org_id!=10445
               && org_id!=10410 && org_id!=10495 &&
                org_id!=10485 && org_id!=10395 && org_id!=10375
-               && org_id!=10480  && org_id!=10551 && org_id!=10597 && org_id!=10599 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10697 && org_id!=10635  && org_id!=10702  && org_id!=10090 && org_id!=10723 && org_id!=10721 && org_id!=10727  && org_id!=10206 && org_id!=10740 && org_id!=10742 && org_id!=10745 && org_id!=10751 && org_id!=10752 && org_id!=10757)
+               && org_id!=10480  && org_id!=10551 && org_id!=10597 && org_id!=10599 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10697 && org_id!=10635  && org_id!=10702  && org_id!=10090 && org_id!=10723 && org_id!=10721 && org_id!=10727  && org_id!=10206 && org_id!=10740 && org_id!=10742 && org_id!=10745 && org_id!=10751 && org_id!=10752 && org_id!=10757 && org_id!=10766)
               || org_id == 10387
             "
           >
@@ -529,7 +529,7 @@
                 org_id == 10410 ||
                 org_id == 10495  ||
                 org_id == 10395
-                || org_id == 10485 || org_id == 10375 || org_id ==10480 || org_id ==10551 || org_id ==10597 || org_id ==10599 || org_id ==10612 || org_id==10617 || org_id ==10580 || org_id ==10629 || org_id ==10677 || org_id == 10667 || org_id == 10693 || org_id == 10697 || org_id ==10635 || org_id ==10702 || org_id == 10090 || org_id == 10723 || org_id == 10721 || org_id ==10727 || org_id == 10206 || org_id ==10702 || org_id ==10740 || org_id == 10742 || org_id == 10745||org_id ==10751 || org_id == 10752 || org_id == 10757)
+                || org_id == 10485 || org_id == 10375 || org_id ==10480 || org_id ==10551 || org_id ==10597 || org_id ==10599 || org_id ==10612 || org_id==10617 || org_id ==10580 || org_id ==10629 || org_id ==10677 || org_id == 10667 || org_id == 10693 || org_id == 10697 || org_id ==10635 || org_id ==10702 || org_id == 10090 || org_id == 10723 || org_id == 10721 || org_id ==10727 || org_id == 10206 || org_id ==10702 || org_id ==10740 || org_id == 10742 || org_id == 10745||org_id ==10751 || org_id == 10752 || org_id == 10757 || org_id == 10766)
                 && org_id!=10387
             "
           >
@@ -584,7 +584,7 @@
               org_id!=10432 &&
               org_id!=10445 &&
               org_id!=10410 && org_id!=10495
-              && org_id!=10485 && org_id!=10395 && org_id!=10375 && org_id!=10480 && org_id!=10551 && org_id!=10597 && org_id!=10599&& org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10693  && org_id!=10697  && org_id!=10635  && org_id!=10702 && org_id!=10090 && org_id!=10723 && org_id!=10721 && org_id!=10727 && org_id!=10206 && org_id!=10740&& org_id!=10742&& org_id!=10745 && org_id!=10751 && org_id!=10752 && org_id!=10757) ||
+              && org_id!=10485 && org_id!=10395 && org_id!=10375 && org_id!=10480 && org_id!=10551 && org_id!=10597 && org_id!=10599&& org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10693  && org_id!=10697  && org_id!=10635  && org_id!=10702 && org_id!=10090 && org_id!=10723 && org_id!=10721 && org_id!=10727 && org_id!=10206 && org_id!=10740&& org_id!=10742&& org_id!=10745 && org_id!=10751 && org_id!=10752 && org_id!=10757 && org_id!=10766) ||
               org_id == 10387
             "
           >
@@ -700,7 +700,7 @@
                 org_id == 10395||
                 org_id == 10617 ||
                 org_id ==10677 ||
-                org_id == 10721 || org_id ==10727 || org_id == 10751 || org_id == 10752
+                org_id == 10721 || org_id ==10727 || org_id == 10751 || org_id == 10752 || org_id== 10766
 
                )&& org_id!=10598 && org_id!=10414
             "
@@ -731,7 +731,7 @@
               org_id !=10445 &&
               org_id!=10395 &&
               org_id !=10410 &&
-              org_id!=10617 && org_id!=10677  && org_id!=10721  && org_id!=10727 && org_id!=10751 && org_id!=10752)|| org_id==10598 || org_id ==10414
+              org_id!=10617 && org_id!=10677  && org_id!=10721  && org_id!=10727 && org_id!=10751 && org_id!=10752&& org_id!=10766)|| org_id==10598 || org_id ==10414
             "
           >
             <template slot-scope="scope">
@@ -1689,7 +1689,7 @@
                 org_id== 10432 ||
                 org_id== 10445 ||
                 org_id== 10410 ||
-                org_id == 10485 || org_id == 10375 || org_id == 10480 || org_id == 10551 || org_id ==10612 || org_id ==10580 || org_id ==10617 || org_id ==10667 || org_id == 10693 || org_id ==10697 || org_id ==10635 || org_id ==10702 || org_id == 10090 || org_id == 10723 || org_id == 10721 || org_id == 10727 || org_id == 10206 || org_id ==10740 || org_id ==10742 || org_id == 10745 || org_id == 10751 || org_id == 10752 || org_id == 10757) &&
+                org_id == 10485 || org_id == 10375 || org_id == 10480 || org_id == 10551 || org_id ==10612 || org_id ==10580 || org_id ==10617 || org_id ==10667 || org_id == 10693 || org_id ==10697 || org_id ==10635 || org_id ==10702 || org_id == 10090 || org_id == 10723 || org_id == 10721 || org_id == 10727 || org_id == 10206 || org_id ==10740 || org_id ==10742 || org_id == 10745 || org_id == 10751 || org_id == 10752 || org_id == 10757 || org_id == 10766) &&
                 org_id!=10387
             "
           >
@@ -1737,7 +1737,7 @@
               org_id!=10445 &&
               org_id!=10410 &&
               org_id!=10485 &&
-              org_id!=10375 &&  org_id!=10480 &&  org_id!=10551 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10667 && org_id!=10693 && org_id!=10697 && org_id!=10635 && org_id!=10702 && org_id!=10090 && org_id!=10723 && org_id!=10721 && org_id!=10727 && org_id!=10206 && org_id!=10740 && org_id!=10742 && org_id!=10745 && org_id!=10751 && org_id!=10752 && org_id!=10757)
+              org_id!=10375 &&  org_id!=10480 &&  org_id!=10551 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10667 && org_id!=10693 && org_id!=10697 && org_id!=10635 && org_id!=10702 && org_id!=10090 && org_id!=10723 && org_id!=10721 && org_id!=10727 && org_id!=10206 && org_id!=10740 && org_id!=10742 && org_id!=10745 && org_id!=10751 && org_id!=10752 && org_id!=10757 && org_id!=10766)
               || org_id == 10387
             "
           >
@@ -1810,7 +1810,7 @@
                 org_id == 10599 ||
                 org_id ==10612 || 
                 org_id ==10617 || 
-                org_id==10580 || org_id ==10629 || org_id == 10677 || org_id == 10667 || org_id == 10693 || org_id == 10697 || org_id == 10635 || org_id == 10702 || org_id == 10090 || org_id ==10723 || org_id == 10721 || org_id == 10727 || org_id ==10206 || org_id == 10740 || org_id == 10742 || org_id == 10745 || org_id == 10751 || org_id == 10752 || org_id == 10757)
+                org_id==10580 || org_id ==10629 || org_id == 10677 || org_id == 10667 || org_id == 10693 || org_id == 10697 || org_id == 10635 || org_id == 10702 || org_id == 10090 || org_id ==10723 || org_id == 10721 || org_id == 10727 || org_id ==10206 || org_id == 10740 || org_id == 10742 || org_id == 10745 || org_id == 10751 || org_id == 10752 || org_id == 10757 || org_id == 10766)
                 && org_id!=10387 && org_id!=10694
             "
           >
@@ -1894,7 +1894,8 @@
               org_id!=10745 &&
               org_id!=10751 &&
               org_id!=10752 &&
-              org_id!=10757
+              org_id!=10757 &&
+              org_id!=10766
               )
               || org_id == 10387 || org_id == 10694
             "
@@ -1960,7 +1961,7 @@
               org_id!=10395 &&
               org_id!=10617 &&
               org_id!=10677 &&
-              org_id!=10721 && org_id!=10727 && org_id!=10206 && org_id!=10751 && org_id!=10752)
+              org_id!=10721 && org_id!=10727 && org_id!=10206 && org_id!=10751 && org_id!=10752 && org_id!=10766)
               || org_id ==10558 || org_id==10598
             "
           >
@@ -1988,7 +1989,7 @@
                 org_id==10445 ||
                 org_id==10410 ||
                 org_id==10395 || 
-                org_id==10617 || org_id==10677 || org_id == 10721 || org_id==10727 || org_id==10206 || org_id == 10751 || org_id == 10752) && org_id !=10558 && org_id!=10598 && org_id!=10414 
+                org_id==10617 || org_id==10677 || org_id == 10721 || org_id==10727 || org_id==10206 || org_id == 10751 || org_id == 10752 || org_id == 10766) && org_id !=10558 && org_id!=10598 && org_id!=10414 
             "
           >
             <el-form-item label="置换率(ml/min)：" :prop="isName('置换率')"

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -20,18 +20,18 @@
           <th v-if="isShow('血流量1')" 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('跨膜压1')" 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 || template_id == 65 || this.$store.getters.xt_user.template_info.org_id == 10340  || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10599 || this.$store.getters.xt_user.template_info.org_id == 10597  || this.$store.getters.xt_user.template_info.org_id == 10612  || this.$store.getters.xt_user.template_info.org_id == 10617  || this.$store.getters.xt_user.template_info.org_id == 10580  || this.$store.getters.xt_user.template_info.org_id == 10629 || this.$store.getters.xt_user.template_info.org_id == 10677  || this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10697 || this.$store.getters.xt_user.template_info.org_id == 10635  || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10721 || this.$store.getters.xt_user.template_info.org_id == 10727 || this.$store.getters.xt_user.template_info.org_id == 10206 || this.$store.getters.xt_user.template_info.org_id == 10751|| this.$store.getters.xt_user.template_info.org_id == 10752) &&this.$store.getters.xt_user.template_info.org_id!=10387 &&this.$store.getters.xt_user.template_info.org_id!=10471 &&this.$store.getters.xt_user.template_info.org_id!=10742 &&this.$store.getters.xt_user.template_info.org_id!=10740 &&this.$store.getters.xt_user.template_info.org_id!=10745 || this.$store.getters.xt_user.template_info.org_id == 10757" 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 && template_id != 65 && 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!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 && this.$store.getters.xt_user.template_info.org_id!=10485  && this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10599  && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10612 && this.$store.getters.xt_user.template_info.org_id!=10617 && this.$store.getters.xt_user.template_info.org_id!=10580 && this.$store.getters.xt_user.template_info.org_id!=10629 && this.$store.getters.xt_user.template_info.org_id!=10679 && this.$store.getters.xt_user.template_info.org_id!=10667 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10697 && this.$store.getters.xt_user.template_info.org_id!=10635 && this.$store.getters.xt_user.template_info.org_id!=10702 &&  this.$store.getters.xt_user.template_info.org_id!=10721 && this.$store.getters.xt_user.template_info.org_id!=10727 && this.$store.getters.xt_user.template_info.org_id!=10206&& this.$store.getters.xt_user.template_info.org_id!=10751&& this.$store.getters.xt_user.template_info.org_id!=10752) || this.$store.getters.xt_user.template_info.org_id == 10387 ||  this.$store.getters.xt_user.template_info.org_id == 10471 ||   this.$store.getters.xt_user.template_info.org_id == 10740 || this.$store.getters.xt_user.template_info.org_id == 10742 || this.$store.getters.xt_user.template_info.org_id == 10745|| this.$store.getters.xt_user.template_info.org_id == 10757"  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 || template_id == 65 || this.$store.getters.xt_user.template_info.org_id == 10340  || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10599 || this.$store.getters.xt_user.template_info.org_id == 10597  || this.$store.getters.xt_user.template_info.org_id == 10612  || this.$store.getters.xt_user.template_info.org_id == 10617  || this.$store.getters.xt_user.template_info.org_id == 10580  || this.$store.getters.xt_user.template_info.org_id == 10629 || this.$store.getters.xt_user.template_info.org_id == 10677  || this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10697 || this.$store.getters.xt_user.template_info.org_id == 10635  || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10721 || this.$store.getters.xt_user.template_info.org_id == 10727 || this.$store.getters.xt_user.template_info.org_id == 10206 || this.$store.getters.xt_user.template_info.org_id == 10751|| this.$store.getters.xt_user.template_info.org_id == 10752 || this.$store.getters.xt_user.template_info.org_id == 10766) &&this.$store.getters.xt_user.template_info.org_id!=10387 &&this.$store.getters.xt_user.template_info.org_id!=10471 &&this.$store.getters.xt_user.template_info.org_id!=10742 &&this.$store.getters.xt_user.template_info.org_id!=10740 &&this.$store.getters.xt_user.template_info.org_id!=10745 || this.$store.getters.xt_user.template_info.org_id == 10757" 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 && template_id != 65 && 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!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 && this.$store.getters.xt_user.template_info.org_id!=10485  && this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10599  && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10612 && this.$store.getters.xt_user.template_info.org_id!=10617 && this.$store.getters.xt_user.template_info.org_id!=10580 && this.$store.getters.xt_user.template_info.org_id!=10629 && this.$store.getters.xt_user.template_info.org_id!=10679 && this.$store.getters.xt_user.template_info.org_id!=10667 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10697 && this.$store.getters.xt_user.template_info.org_id!=10635 && this.$store.getters.xt_user.template_info.org_id!=10702 &&  this.$store.getters.xt_user.template_info.org_id!=10721 && this.$store.getters.xt_user.template_info.org_id!=10727 && this.$store.getters.xt_user.template_info.org_id!=10206&& this.$store.getters.xt_user.template_info.org_id!=10751&& this.$store.getters.xt_user.template_info.org_id!=10752&& this.$store.getters.xt_user.template_info.org_id!=10766) || this.$store.getters.xt_user.template_info.org_id == 10387 ||  this.$store.getters.xt_user.template_info.org_id == 10471 ||   this.$store.getters.xt_user.template_info.org_id == 10740 || this.$store.getters.xt_user.template_info.org_id == 10742 || this.$store.getters.xt_user.template_info.org_id == 10745|| this.$store.getters.xt_user.template_info.org_id == 10757"  width="76px"> 超滤量(L) </th>
           <th v-if=" isShow('超滤量1')"  width="76px"> 超滤量(ml) </th>
-          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 65 || 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 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id == 10599  || this.$store.getters.xt_user.template_info.org_id == 10612 || this.$store.getters.xt_user.template_info.org_id == 10617 || this.$store.getters.xt_user.template_info.org_id == 10580 || this.$store.getters.xt_user.template_info.org_id == 10629 || this.$store.getters.xt_user.template_info.org_id == 10677 || this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10693 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10697 || this.$store.getters.xt_user.template_info.org_id == 10635 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10721 || this.$store.getters.xt_user.template_info.org_id == 10727 || this.$store.getters.xt_user.template_info.org_id == 10206 || this.$store.getters.xt_user.template_info.org_id == 10740 || this.$store.getters.xt_user.template_info.org_id == 10742 || this.$store.getters.xt_user.template_info.org_id == 10751|| this.$store.getters.xt_user.template_info.org_id == 10752|| this.$store.getters.xt_user.template_info.org_id == 10757) && this.$store.getters.xt_user.template_info.org_id!=10387" width="50px"> 超滤率 <br />(ml/h) </th>
-          <th v-if="isShow('超滤率') && (template_id !=6 && template_id !=65 && 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 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 &&this.$store.getters.xt_user.template_info.org_id!=10485 &&this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10599 && this.$store.getters.xt_user.template_info.org_id!=10612 && this.$store.getters.xt_user.template_info.org_id!=10617 && this.$store.getters.xt_user.template_info.org_id!=10580 && this.$store.getters.xt_user.template_info.org_id!=10629 && this.$store.getters.xt_user.template_info.org_id!=10679 && this.$store.getters.xt_user.template_info.org_id!=10667 && this.$store.getters.xt_user.template_info.org_id!=10693 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10697 && this.$store.getters.xt_user.template_info.org_id!=10635 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10721  && this.$store.getters.xt_user.template_info.org_id!=10727  && this.$store.getters.xt_user.template_info.org_id!=10206 && this.$store.getters.xt_user.template_info.org_id!=10740 && this.$store.getters.xt_user.template_info.org_id!=10742&& this.$store.getters.xt_user.template_info.org_id!=10751&& this.$store.getters.xt_user.template_info.org_id!=10752&& this.$store.getters.xt_user.template_info.org_id!=10757 ) || this.$store.getters.xt_user.template_info.org_id==10387" width="50px"> 超滤率 <br />(L/h) </th>
+          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 65 || 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 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id == 10599  || this.$store.getters.xt_user.template_info.org_id == 10612 || this.$store.getters.xt_user.template_info.org_id == 10617 || this.$store.getters.xt_user.template_info.org_id == 10580 || this.$store.getters.xt_user.template_info.org_id == 10629 || this.$store.getters.xt_user.template_info.org_id == 10677 || this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10693 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10697 || this.$store.getters.xt_user.template_info.org_id == 10635 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10721 || this.$store.getters.xt_user.template_info.org_id == 10727 || this.$store.getters.xt_user.template_info.org_id == 10206 || this.$store.getters.xt_user.template_info.org_id == 10740 || this.$store.getters.xt_user.template_info.org_id == 10742 || this.$store.getters.xt_user.template_info.org_id == 10751|| this.$store.getters.xt_user.template_info.org_id == 10752|| this.$store.getters.xt_user.template_info.org_id == 10757|| this.$store.getters.xt_user.template_info.org_id == 10766) && this.$store.getters.xt_user.template_info.org_id!=10387" width="50px"> 超滤率 <br />(ml/h) </th>
+          <th v-if="isShow('超滤率') && (template_id !=6 && template_id !=65 && 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 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 &&this.$store.getters.xt_user.template_info.org_id!=10485 &&this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10599 && this.$store.getters.xt_user.template_info.org_id!=10612 && this.$store.getters.xt_user.template_info.org_id!=10617 && this.$store.getters.xt_user.template_info.org_id!=10580 && this.$store.getters.xt_user.template_info.org_id!=10629 && this.$store.getters.xt_user.template_info.org_id!=10679 && this.$store.getters.xt_user.template_info.org_id!=10667 && this.$store.getters.xt_user.template_info.org_id!=10693 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10697 && this.$store.getters.xt_user.template_info.org_id!=10635 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10721  && this.$store.getters.xt_user.template_info.org_id!=10727  && this.$store.getters.xt_user.template_info.org_id!=10206 && this.$store.getters.xt_user.template_info.org_id!=10740 && this.$store.getters.xt_user.template_info.org_id!=10742&& this.$store.getters.xt_user.template_info.org_id!=10751&& this.$store.getters.xt_user.template_info.org_id!=10752&& this.$store.getters.xt_user.template_info.org_id!=10766&& this.$store.getters.xt_user.template_info.org_id!=10757 ) || this.$store.getters.xt_user.template_info.org_id==10387" width="50px"> 超滤率 <br />(L/h) </th>
           <th v-if="isShow('超滤率2')" width="92px">超滤率(ml/h)</th>
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
           <th v-if="isShow('钠浓度1')" width="92px">钠浓度(mmol/L)</th>
           <th v-if="isShow('透析液温度')" width="92px">透析液温度(℃)</th>
           <th v-if="isShow('透析液温度1')" width="92px">透析液温度(℃)</th>
-          <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46  || template_id == 48 || template_id == 53  || template_id == 54 || template_id == 56 || org_id == 10432 || org_id == 10445 || org_id == 10410 || org_id ==10617 || org_id==10677 || org_id==10702 || org_id==10721 || org_id ==10727 || org_id == 10206 || org_id == 10751 || org_id == 10752) && org_id!=10558 && org_id!=10598 && org_id!=10414  " width="92px" > 置换率(ml/min) </th>
-          <th v-if=" isShow('置换率') && (template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && org_id!=10432 && org_id!=10445 && org_id!=10410 && org_id!=10617  && org_id!=10677 && org_id !=10702 && org_id !=10721 && org_id !=10727 && org_id !=10206 && org_id!=10751&& org_id!=10752) || org_id == 10558 || org_id ==10598 || org_id ==10414 " width="92px" > 置换率(L/h)  </th>
+          <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46  || template_id == 48 || template_id == 53  || template_id == 54 || template_id == 56 || org_id == 10432 || org_id == 10445 || org_id == 10410 || org_id ==10617 || org_id==10677 || org_id==10702 || org_id==10721 || org_id ==10727 || org_id == 10206 || org_id == 10751 || org_id == 10752 || org_id == 10766) && org_id!=10558 && org_id!=10598 && org_id!=10414  " width="92px" > 置换率(ml/min) </th>
+          <th v-if=" isShow('置换率') && (template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && org_id!=10432 && org_id!=10445 && org_id!=10410 && org_id!=10617  && org_id!=10677 && org_id !=10702 && org_id !=10721 && org_id !=10727 && org_id !=10206 && org_id!=10751&& org_id!=10752 && org_id!=10766) || org_id == 10558 || org_id ==10598 || org_id ==10414 " width="92px" > 置换率(L/h)  </th>
           <th v-if=" isShow('置换率1')" width="92px" > 置换率(ml/min) </th>
           <th v-if=" isShow('置换量') && (template_id == 43)" width="92px"> 置换量(ml/h)  </th>
           <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191 && org_id!=10478 && org_id!=10346 && org_id!=10517) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 48 || template_id == 53 || template_id == 54 || template_id == 56 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10432  || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10751|| this.$store.getters.xt_user.template_info.org_id == 10752 ) && org_id!=10558 && org_id!=10598  && org_id!=10414 && org_id!=10694 && org_id!=10697 && org_id!=10567 && org_id!=10644 && org_id!=10731 && org_id!=10744" width="92px"  > 置换量(ml)  </th>

src/xt_pages/dialysis/details/index.vue

@@ -2182,7 +2182,22 @@ export default {
 
           var his_doctor_advices = resp.data.his_advices
 
-          this.his_doctor_advices = his_doctor_advices
+          var newArr = []
+          if(his_doctor_advices!=null && his_doctor_advices.length>0){
+            
+            for(let i=0;i<his_doctor_advices.length>0;i++){
+              if(this.org_id == 0 || this.org_id == 10744){
+                if(his_doctor_advices[i].delivery_way != '口服'){
+                   newArr.push(his_doctor_advices[i])
+                }  
+              }else{
+                  newArr.push(his_doctor_advices[i])
+              }     
+            }
+          }
+          console.log("newArr=---------------------------",newArr)
+          this.his_doctor_advices = []
+          this.his_doctor_advices = newArr
           this.his_is_open = resp.data.is_open_config.is_open
 
           this.is_advice_open = resp.data.is_advice_open.is_advice_open
@@ -3120,7 +3135,7 @@ export default {
         name ="IUF"
       }
       if(val == 8){
-        name ="IUF"
+        name ="HFHD"
       }
       if(val == 9){
         name ="HFHD+HP"

src/xt_pages/dialysis/details/indexs.vue

@@ -1023,8 +1023,21 @@ export default {
           this.device_numbers = resp.data.device_numbers
 
           var his_doctor_advices = resp.data.his_advices
-
-          this.his_doctor_advices = his_doctor_advices
+          var newArr = []
+          if(his_doctor_advices!=null && his_doctor_advices.length>0){
+            
+            for(let i=0;i<his_doctor_advices.length>0;i++){
+              if(this.org_id == 0 || this.org_id == 10744){
+                if(his_doctor_advices[i].delivery_way != '口服'){
+                   newArr.push(his_doctor_advices[i])
+                }  
+              }else{
+                  newArr.push(his_doctor_advices[i])
+              }     
+            }
+          }
+          this.his_doctor_advices = newArr
+         
           this.his_is_open = resp.data.is_open_config.is_open
 
           this.is_advice_open = resp.data.is_advice_open.is_advice_open

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -1995,12 +1995,12 @@
                               <span v-if="it.single_dose != 0">{{ it.single_dose }}{{ it.single_dose_unit }}</span>
                               <span v-if="it && it.delivery_way">{{ it.delivery_way }}</span>
                               <span v-if="it && it.execution_frequency">{{ it.execution_frequency }}</span>
-                              <span v-if="it && it.remark">{{ it.remark }}</span>&nbsp;&nbsp;&nbsp;
-
+                              <span v-if="org_id!=0 && org_id!=10744"> &nbsp;&nbsp;&nbsp;</span>
+                              <span v-if="it && it.remark">({{ it.remark }})</span>
+                              <span v-if="advice.child.length>1 && (org_id == 0 || org_id==10744) && i!= (advice.child.length-1)">+</span>
+                             
                             </span>
-
-
-
+                          
                           </td>
 
                           <td height="32px">
@@ -4287,10 +4287,10 @@ export default {
           this.advices.push(item);
         }
         this.loading = false;
-        this.doctor_advices =
-          response.data.data.advices == null ? [] : response.data.data.advices;
+        this.doctor_advices =response.data.data.advices == null ? [] : response.data.data.advices;
         for (let index = 0; index < this.doctor_advices.length; index++) {
           this.doctor_advices[index]["isShow"] = 2;
+          this.doctor_advices[index].orgin = 2
         }
 
 
@@ -4334,18 +4334,17 @@ export default {
         }
 
         //HIS客户显示临时医嘱的地方
-        if (this.org_id == 10510 || this.org_id == 10567 || this.org_id == 10489 || this.org_id == 10644|| this.org_id == 10724) {
+        if (this.org_id == 10510 || this.org_id == 10567 || this.org_id == 10489 || this.org_id == 10644|| this.org_id == 10724  || this.org_id ==10751 || this.org_id == 0 || this.org_id ==10744) {
           if (response.data.data.doctorAdevieInfo != null && response.data.data.doctorAdevieInfo.length > 0) {
 
             for (let i = 0; i < response.data.data.doctorAdevieInfo.length; i++) {
-              this.doctor_advices.push(response.data.data.doctorAdevieInfo[i])
-              console.log("寄哪里 222")
-
+               response.data.data.doctorAdevieInfo[i].orgin = 1
+               response.data.data.doctorAdevieInfo[i].prescription_id = 99999999
+               this.doctor_advices.push(response.data.data.doctorAdevieInfo[i])
+              
             }
           }
 
-
-
           let projects = [];
           response.data.data.projects.map((item) => {
             if (item.type == 2) {
@@ -4354,11 +4353,6 @@ export default {
           });
           this.projects = projects;
 
-
-          // console.log("this.projects=========================================", this.projects);
-
-
-
           if (this.org_id != 10510 && this.org_id != 10206 && this.org_id != 10478 && this.org_id != 10489) {
             console.log("列表===================================", this.projects)
             var newHisArr = []
@@ -4429,8 +4423,9 @@ export default {
 
 
         }
-
-
+        
+        console.log("this.doctor_advices--------------",this.doctor_advices)
+      
 
         //针对内蒙古阿拉善
         if (this.org_id == 10206 || this.org_id == 0 || this.org_id == 10744) {
@@ -4468,6 +4463,7 @@ export default {
                     single_dose_unit: item.single_dose_unit,
                     parent_id: item.parent_id,
                     remark: item.remark,
+                    orgin:item.orgin,
 
                   }
                 }
@@ -4496,16 +4492,24 @@ export default {
           }
         }
 
-        console.log("新时间我哦我哦", this.doctor_advices)
+        console.log("ma新时间我哦我哦", this.new_doctor_advice_list)
 
           //过滤口服药
           if (this.org_id == 0 || this.org_id ==10744) {
           var docArr = []
           if (this.new_doctor_advice_list != null && this.new_doctor_advice_list.length > 0) {
             for (let i = 0; i < this.new_doctor_advice_list.length; i++) {
-              if (this.new_doctor_advice_list[i].delivery_way != '口服' && this.new_doctor_advice_list[i].delivery_way != '中药口服') {
+              console.log("hhahahhahahah",this.new_doctor_advice_list[i].orgin)
+              if(this.new_doctor_advice_list[i].orgin == 1){
                 docArr.push(this.new_doctor_advice_list[i])
               }
+              if(this.new_doctor_advice_list[i].orgin == 2){
+                if (this.new_doctor_advice_list[i].delivery_way != '口服' && this.new_doctor_advice_list[i].delivery_way != '中药口服') {
+                  docArr.push(this.new_doctor_advice_list[i])
+                }
+              }
+             
+             
             }
           }
           this.new_doctor_advice_list = []
@@ -4514,9 +4518,13 @@ export default {
 
        
 
+         console.log("金来福安抚啊FDD安抚安抚",this.new_doctor_advice_list)
+        
+       
+
 
         //过滤口服药
-        if (this.org_id == 10265 || this.org_id == 0 || this.org_id ==10744) {
+        if (this.org_id == 10265) {
           var docArr = []
           if (this.doctor_advices != null && this.doctor_advices.length > 0) {
             for (let i = 0; i < this.doctor_advices.length; i++) {
@@ -4529,6 +4537,8 @@ export default {
           this.doctor_advices = docArr
         }
 
+   
+
 
         if (this.doctor_advices.length + this.projectsOne.length <= 6) {
           var nl = 6 - (this.doctor_advices.length + this.projectsOne.length);

src/xt_pages/user/dialysisSolution.vue

@@ -522,7 +522,7 @@
 
 
 
-          <el-col :span="8" v-if="isShows('透析器')&& this.$store.getters.xt_user.template_info.org_id != 10164">
+          <el-col :span="8" v-if="isShows('透析器')&& this.$store.getters.xt_user.template_info.org_id != 10164&& this.$store.getters.xt_user.template_info.org_id != 10727&& this.$store.getters.xt_user.template_info.org_id != 10751">
             <el-form-item label="透析器:">
               <el-input v-model="dialysis_dialyszers" @focus="showInnerDialog('6')"></el-input>
             </el-form-item>
@@ -535,13 +535,13 @@
               </el-form-item>
          </el-col>
 
-          <el-col :span="8" v-if="isShows('灌流器')&& this.$store.getters.xt_user.template_info.org_id != 10164 && this.$store.getters.xt_user.template_info.org_id != 10727" >
+          <el-col :span="8" v-if="isShows('灌流器')&& this.$store.getters.xt_user.template_info.org_id != 10164 && this.$store.getters.xt_user.template_info.org_id != 10727 && this.$store.getters.xt_user.template_info.org_id != 10751" >
             <el-form-item label="灌流器:">
               <el-input v-model="dialysis_irrigation" @focus="showInnerDialog('7')"></el-input>
             </el-form-item>
           </el-col>
 
-          <el-col :span="8" v-if="isShows('灌流器')&& (this.$store.getters.xt_user.template_info.org_id == 10164 || this.$store.getters.xt_user.template_info.org_id == 10727)" >
+          <el-col :span="8" v-if="isShows('灌流器')&& (this.$store.getters.xt_user.template_info.org_id == 10164 || this.$store.getters.xt_user.template_info.org_id == 10727 || this.$store.getters.xt_user.template_info.org_id == 10751)" >
             <el-form-item label="灌流器:">
               <el-input v-model="dialysis_irrigation" @focus="showInnerDialog('21')"></el-input>
             </el-form-item>