新分支

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -928,13 +928,13 @@
                       style="padding: 2px 0; line-height: 23px; display: flex"
                     >
                       <div class="inline_block" style="flex: 1"
-                        v-if="org_id!=10440 && org_id!=0  && org_id!=10469 && org_id!=10490 && org_id!=10478 && org_id!=10495 && org_id!=10510 && org_id!=10460 && org_id!=10585">
+                        v-if="org_id!=10440 && org_id!=0  && org_id!=10469 && org_id!=10490 && org_id!=10478 && org_id!=10495 && org_id!=10510 && org_id!=10460 && org_id!=10585 && org_id!=10567">
                         上次透后体重：
                         <div
                           class="under_line"
                           style="width: 100px; text-align: center"
                         >
-                          <span v-if="org_id == 10290 || org_id ==10585">{{
+                          <span v-if="org_id == 10290 || org_id ==10585 || org_id ==10567">{{
                             record.lastafterweight.weight_after
                           }}</span>
                           <span v-else>{{

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyeight.vue

@@ -853,7 +853,7 @@
                       style="padding: 2px 0; line-height: 23px; display: flex"
                     >
                       <div class="inline_block" style="flex: 1"
-                        v-if="org_id!=10440 && org_id!=0  && org_id!=10469 && org_id!=10490 && org_id!=10478 && org_id!=10495 && org_id!=10510 && org_id!=10460&&org_id!=10551">
+                        v-if="org_id!=10440 && org_id!=0  && org_id!=10469 && org_id!=10490 && org_id!=10478 && org_id!=10495 && org_id!=10510 && org_id!=10460&&org_id!=10551 && org_id!=10598">
                         上次透后体重：
                         <div
                           class="under_line"
@@ -870,7 +870,7 @@
                       </div>
 
                       <div class="inline_block" style="flex: 1"
-                        v-if="(org_id==10440 ||  org_id ==0 || org_id==10469 || org_id==10490 || org_id==10478  || org_id==10495 || org_id == 10460 || org_id ==10551)&& org_id!=10510">
+                        v-if="(org_id==10440 ||  org_id ==0 || org_id==10469 || org_id==10490 || org_id==10478  || org_id==10495 || org_id == 10460 || org_id ==10551 || org_id == 10598)&& org_id!=10510">
                         上次透后体重：
                         <div
                           class="under_line"

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

@@ -203,15 +203,10 @@
         >删除医嘱
         </el-button>
         <el-button v-else disabled round @click="openDeleteGroupAdvice" :loading="deleLoading">删除医嘱</el-button>
-<!--        <el-button @click="lili">调试</el-button>-->
-<!--        <el-button @click="lili" >调试</el-button>-->
 
-        <!--<el-button round @click="openNewChild" :loading="deleLoading">新增子药</el-button>-->
       </div>
-      <!-- 医嘱列表 -->
-      <!--   @row-click="cellMouseEnter" -->
-      <!--&lt;!&ndash;:header-cell-style="{ backgroundColor: 'rgb(64, 158, 255)', color: 'white'}"&ndash;&gt;@current-change="selectRow"-->
-      <el-table
+     
+      <!-- <el-table
         v-if="his_is_open !=1 && is_advice_open!=1"
         :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
         :data="doctor_advices"
@@ -227,8 +222,7 @@
         highlight-current-row
 
       >
-      <!-- @selection-change="handleSelectionChange" -->
-        <!-- <el-table-column type="selection"  width="55"></el-table-column> -->
+    
        <el-table-column prop="date" label="开嘱医生" align="center" min-width="26px">
           <template slot-scope="scope">
             <span>{{ getXuserName(scope.row.advice_doctor) }}</span>
@@ -284,7 +278,7 @@
             <span v-else></span>
           </template>
         </el-table-column>
-        <el-table-column prop="execution_staff" align="center" min-width="30px" label="执行护士"><!--bug642-->
+        <el-table-column prop="execution_staff" align="center" min-width="30px" label="执行护士">
           <template slot-scope="scope">
             <span>
               {{getXuserName(scope.row.execution_staff)}}
@@ -305,9 +299,103 @@
             </span>
           </template>
         </el-table-column>
-      </el-table>
+      </el-table> -->
+
+
+
+      <el-table
+        v-if="his_is_open !=1 && is_advice_open!=1"
+        :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
+        :data="doctor_advices_one"
+        border
+        style="width: 100%"
+        v-show="showAdvicePanel"
+        ref="advices_list"
+        @row-click="cellMouseEnter"
+        :row-class-name="tableRowClassName"
+        
+        :cell-class-name="adviceNameShow"
+        :modal-append-to-body="false"
+        highlight-current-row
+
+      >
+    
+       <el-table-column prop="date" label="开嘱医生" align="center" min-width="26px">
+          <template slot-scope="scope">
+            <span>{{ getXuserName(scope.row.advice_doctor) }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column prop="start_time" label="开始时间" align="center" min-width="35px">
+          <template slot-scope="scope">
+            <span>
+              {{scope.row.start_time | parseTime('{y}-{m}-{d} {h}:{i}')}}
+            </span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="advice_name" min-width="50px" label="医嘱内容" align="center">
+          <template slot-scope="scope">
+            <el-dropdown trigger="click" v-if="scope.row.parent_id == 0">
+              <span class="el-dropdown-link">
+                {{ getAdviceContent(scope.row, 1)}}
+                <i class="el-icon-arrow-down el-icon--right"></i>
+              </span>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item v-if=" his_is_open != 1" @click.native="openEdit(scope.$index, scope.row)">修改医嘱</el-dropdown-item>
+                <el-dropdown-item v-if=" his_is_open != 1 " @click.native="openDelete(scope.$index, scope.row)">删除医嘱</el-dropdown-item>
+                <el-dropdown-item v-if=" his_is_open != 1 " @click.native="openNewChildTwo(scope.$index, scope.row)">新增子药</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+
+            <el-dropdown trigger="click">
+              <span class="el-dropdown-link" v-for="(it,index) in scope.row.children" :key="index">
+                &emsp;{{ getAdviceContentOne(it, 2)}}
+                <i class="el-icon-arrow-down el-icon--right"></i>
+              </span>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item v-if=" his_is_open != 1" @click.native="openEdit(scope.$index, scope.row)">修改子药</el-dropdown-item>
+                <el-dropdown-item v-if=" his_is_open != 1" @click.native="openDelete(scope.$index, scope.row)">删除子药</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+          </template>
+        </el-table-column>
 
+        <el-table-column
+          prop="execution_time"
+          align="center"
+          min-width="30px"
+          label="执行时间"
+          sortable
+        >
+          <template slot-scope="scope">
+            <span v-if="scope.row.execution_time != 0">
+              {{scope.row.execution_time | parseTime('{m}-{d} {h}:{i}')}}
+            </span>
+            <span v-else></span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="execution_staff" align="center" min-width="30px" label="执行护士"><!--bug642-->
+          <template slot-scope="scope">
+            <span>
+              {{getXuserName(scope.row.execution_staff)}}
+            </span>
 
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-if="(template_id != 6 && org_id!=10223 && org_id!=10445)  || org_id == 10460"
+          prop="checker"
+          min-width="30px"
+          align="center"
+          label="核对人员"
+        >
+          <template slot-scope="scope">
+            <span>
+              {{getXuserName(scope.row.checker)}}
+            </span>
+          </template>
+        </el-table-column>
+      </el-table>
 
       <el-table
         v-if="his_is_open  == 1 || is_advice_open == 1"
@@ -330,14 +418,6 @@
           </template>
         </el-table-column>
 
-
-        <!--===================================-->
-<!--        <el-table-column prop="date" label="调试" align="center" min-width="26px">-->
-<!--          <template slot-scope="scope">-->
-<!--            <span @click="lili(scope.$index,scope.row)">{{ scope.row.parent_id }}</span>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-
         <el-table-column prop="start_time" label="开始时间" align="center" min-width="35px">
           <template slot-scope="scope">
             <span>
@@ -361,8 +441,9 @@
 
             <el-dropdown trigger="click" v-if="scope.row.parent_id > 0">
               <span class="el-dropdown-link">
-                &emsp;{{ getAdviceContent(scope.row, 2)}}
-
+                <span>
+                  &emsp;{{getAdviceContent(scope.row, 2)}}
+                </span>
                 <i class="el-icon-arrow-down el-icon--right"></i>
               </span>
               <el-dropdown-menu slot="dropdown">
@@ -786,6 +867,7 @@
         org_id:0,
         schedulePatient:{},
         tempArrOne:[],
+        doctor_advices_one:[]
       }
     },
     watch: {
@@ -2078,12 +2160,43 @@
       }
       ,
       show(his_is_open,is_advice_open) {
-        console.log("his_is_open233232323232323322323",his_is_open)
-        console.log("is_advice_open233232323232323322323",is_advice_open)
+         
+      var childMap = {}
+      for (const index in this.doctor_advices) {
+        if (this.doctor_advices[index].parent_id == 0) {
+          continue
+        }
+        if (!(this.doctor_advices[index].parent_id in childMap)) {
+          childMap[this.doctor_advices[index].parent_id] = []
+        }
+        childMap[this.doctor_advices[index].parent_id].push(this.doctor_advices[index])
+      }
+
+      var advices = [];
+        for (const index in this.doctor_advices) {
+          if (this.doctor_advices[index].parent_id > 0) {
+            continue;
+          }
+          var item = this.doctor_advices[index];
+          if (item.id in childMap) {
+            item.children = childMap[item.id];
+          } else {
+            item.children = [];
+          }
+          advices.push(item);
+        }
+
+     
+      console.log("我的世纪东方",advices)
+      this.doctor_advices_one = []
+      this.doctor_advices_one = advices
+
         this.his_is_open = his_is_open
         this.is_advice_open = is_advice_open
         this.isVisibility = true
         this.getPermission()
+
+
       }
       ,
       hide() {
@@ -2239,8 +2352,7 @@
 
         if (row.single_dose) {
           if (this.template_id != 6) {
-            tempSingleDoseDesc =
-              ' 单次用量 ' + '  ' + row.single_dose + '' + row.single_dose_unit
+            tempSingleDoseDesc =' 单次用量 ' + '  ' + row.single_dose + '' + row.single_dose_unit
           } else {
             tempSingleDoseDesc = row.single_dose + '' + row.single_dose_unit
           }
@@ -2264,16 +2376,40 @@
           )
         } else {
           // 是子药
-          return (
-            row.advice_name +
-            tempDrugSpecDesc +
-            ' ' +
-            tempPrescribingNumberDesc +
-            tempSingleDoseDesc
+          return (row.advice_name +tempDrugSpecDesc +' ' +tempPrescribingNumberDesc + tempSingleDoseDesc
           )
         }
-      }
-      ,
+      },
+
+      getAdviceContentOne(row, isChild) {
+        // alert("来")
+        console.log("row",row)
+        let tempSingleDoseDesc = ''
+        let tempDrugSpecDesc = ''
+        let tempPrescribingNumberDesc = ''
+
+        if (row.prescribing_number) {
+           tempPrescribingNumberDesc = row.prescribing_number + '' + row.prescribing_number_unit
+        }
+
+        if(this.org_id == 10188 ){
+            tempPrescribingNumberDesc = ""
+        }
+
+        if (row.single_dose) {
+          if (this.template_id != 6) {
+            tempSingleDoseDesc =' 单次用量 ' + '  ' + row.single_dose + '' + row.single_dose_unit
+          } else {
+            tempSingleDoseDesc = row.single_dose + '' + row.single_dose_unit
+          }
+        }
+
+        if (row.advice_desc) {
+          tempDrugSpecDesc = '(' + row.advice_desc + row.drug_spec_unit + ')' + " " + row.remark
+        }
+ 
+        return row.advice_name +tempDrugSpecDesc +' ' +tempPrescribingNumberDesc + tempSingleDoseDesc
+      },
       getPermission() {
         request
           .get('/api/func_per/get', {
@@ -2675,7 +2811,7 @@
 
     },
     created() {
-
+     
       var date = this.$route.query && this.$route.query.date
       this.record_date = uParseTime(date, '{y}-{m}-{d}')
       this.form.advice_date = this.record_date

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

@@ -262,7 +262,10 @@
                 org_id == 10485 ||
                 org_id == 10375 ||
                 org_id == 10480 ||
-                org_id == 10551) &&
+                org_id == 10551 ||
+                org_id == 10599 ||
+                org_id == 10597 ||
+                org_id == 10599) &&
                 org_id!=10387
             "
           >
@@ -333,7 +336,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!=10480  && org_id!=10551 && org_id!=10597 && org_id!=10599)
               || org_id == 10387
             "
           >
@@ -389,7 +392,7 @@
                 org_id == 10410 ||
                 org_id == 10495  ||
                 org_id == 10395
-                || org_id == 10485 || org_id == 10375 || org_id ==10480 || org_id ==10551)
+                || org_id == 10485 || org_id == 10375 || org_id ==10480 || org_id ==10551 || org_id ==10597 || org_id ==10599)
                 && org_id!=10387
             "
           >
@@ -442,7 +445,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!=10485 && org_id!=10395 && org_id!=10375 && org_id!=10480 && org_id!=10551 && org_id!=10597 && org_id!=10599 ) ||
               org_id == 10387
             "
           >
@@ -1564,6 +1567,20 @@
             </el-form-item>
           </el-col>
 
+          
+          <el-col :span="24" v-if="isShow('拒测血压')">
+            <el-form-item label="拒测血压：" :prop="isName('拒测血压')">
+              <el-select v-model="form.is_pressure" placeholder="请选择">
+                <el-option
+                  v-for="item in pressureList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.name">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
           <el-col :span="8" v-if="isShow('血压监测部位')">
             <el-form-item label="血压监测部位：" :prop="isName('血压监测部位')"
               :rules="isCheckmust('血压监测部位')">
@@ -1681,18 +1698,6 @@
           </el-col>
 
 
-          <el-col :span="24" v-if="isShow('拒测血压')">
-            <el-form-item label="拒测血压：" :prop="isName('拒测血压')">
-              <el-select v-model="form.is_pressure" placeholder="请选择">
-                <el-option
-                  v-for="item in pressureList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.name">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
 
           <!-- </el-row>
 

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -15,10 +15,10 @@
           <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 || 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!=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 && 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 == 10387"  width="76px"> 超滤量(L) </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!=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==10387" width="50px"> 超滤率 <br />(L/h) </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!=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 && 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 == 10387"  width="76px"> 超滤量(L) </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!=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==10387" width="50px"> 超滤率 <br />(L/h) </th>
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
           <th v-if="isShow('透析液温度')" 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!=10558" width="92px" > 置换率(ml/min) </th>

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -968,10 +968,10 @@
                         class="under_line"
                         style="width: 100px; text-align: center"
                       >
-                        <span v-if="org_id == 10290 || org_id == 10318 || org_id== 10217 || org_id== 10188 || org_id== 9956 || org_id == 10440 || org_id == 0 || org_id == 10469 || org_id == 10478 || org_id == 10490 || org_id ==10495 || org_id == 10460 || org_id==10585">{{
+                        <span v-if="org_id == 10290 || org_id == 10318 || org_id== 10217 || org_id== 10188 || org_id== 9956 || org_id == 10440 || org_id == 0 || org_id == 10469 || org_id == 10478 || org_id == 10490 || org_id ==10495 || org_id == 10460 || org_id==10585 || org_id ==10567 || org_id ==10598">{{
                           lastafterdialysis.weight_after
                         }}</span>
-                        <span v-if="org_id != 10290 && org_id != 10318  && org_id!= 10217 && org_id!=10188 && org_id!=9956 && org_id != 10440 && org_id!=0 && org_id!=10469 && org_id!=10478 && org_id!=10490 && org_id!=10495 && org_id!=10460 && org_id!=10585">{{
+                        <span v-if="org_id != 10290 && org_id != 10318  && org_id!= 10217 && org_id!=10188 && org_id!=9956 && org_id != 10440 && org_id!=0 && org_id!=10469 && org_id!=10478 && org_id!=10490 && org_id!=10495 && org_id!=10460 && org_id!=10585 && org_id!=10567 && org_id!=10598">{{
                           predialysis.weight_after_last_transparency
                             ? predialysis.weight_after_last_transparency
                             : "未称重"

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyeight.vue

@@ -1165,8 +1165,8 @@
                         style="width: 600px; text-align: center"
                       >
                         {{
-                          prescription.remark
-                            ? prescription.remark
+                          predialysis.remark
+                            ? predialysis.remark
                             : "/"
                         }}
                       </div>

src/xt_pages/management/components/UserForm.vue

@@ -1151,7 +1151,8 @@ export default {
         { id: 4, name: "东丽机细菌过滤器" },
         {id:5,name:"山外山细菌过滤器"},
         {id:6,name:"尼普洛细菌过滤器"},
-        {id:7,name:"威高细菌过滤器"}
+        {id:7,name:"威高细菌过滤器"},
+        {id:8,name:"宝莱特细菌过滤器"}
       ],
       autograph: [],
       selectCulture: [],

src/xt_pages/management/home.vue

@@ -2845,7 +2845,8 @@ export default {
           { id: 4, name: '东丽机细菌过滤器' },
           {id:5,name:"山外山细菌过滤器"},
           {id:6,name:"尼普洛细菌过滤器"},
-          {id:7,name:"威高细菌过滤器"}
+          {id:7,name:"威高细菌过滤器"},
+          {id:8,name:"宝莱特细菌过滤器"}
         ],
         DisinfectionMode: [
           { id: 0, name: '请选择' },

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -362,8 +362,10 @@
                     </span>
                     </span>
 
-                    <span v-if="org_id==0 || org_id ==10480 | org_id ==10210">
-                      {{(item.count * item.price).toFixed(2)}}
+                    <span v-if="org_id==0 || org_id ==10480 || org_id==10210">
+                      <!-- {{(item.count * item.price).toFixed(2)}} -->
+                     <span v-if="is_sys == 1 || is_sys == 5 || is_sys == 12">{{(getOutCountNightTen(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,scope.row.drug_id)*item.price).toFixed(2)}}</span>  
+                     <span v-if="is_sys==0"> {{(getOutCountNightTenOne(item.batch_number,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,scope.row.drug_id)*item.price).toFixed(2)}}</span>
                     </span>
                   
 
@@ -2245,6 +2247,79 @@ export default {
       }
       return max_str + min_str;
     },
+
+    getOutCountNightTen(warehouse_info_id,max_unit,min_unit,min_number,drug_id){
+      var arr = []
+      var total = 0
+      var max_str = ""
+      var min_str = ""
+
+      for(let j=0;j<this.outList.length;j++){
+        if(warehouse_info_id == this.outList[j].warehouse_info_id && drug_id == this.outList[j].drug_id){
+           arr.push(this.outList[j])
+        }
+      }
+      if(arr.length > 0){
+        for(let i=0;i<arr.length;i++){
+           total +=arr[i].count
+        }
+      }
+     
+      if (total < min_number) {
+        min_str = total 
+      }
+      if (total == 0) {
+        min_str = "";
+        max_str = "";
+      }
+      if (total >= min_number) {
+        if (parseInt(total / min_number) != 0) {
+          max_str = parseInt(total / min_number) 
+        }
+        if (total % min_number != 0) {
+          min_str = (total % min_number) 
+        }
+      }
+      return max_str + min_str;
+    },
+
+    getOutCountNightTenOne(batch_number,max_unit,min_unit,min_number,drug_id){
+    
+    var arr = []
+    var total = 0
+    var max_str = ""
+    var min_str = ""
+  
+    for(let j=0;j<this.tabList.length;j++){
+    
+      if(batch_number == this.tabList[j].batch_number && drug_id == this.tabList[j].drug_id){
+         arr.push(this.tabList[j])
+      }
+    }
+    
+    if(arr.length > 0){
+      for(let i=0;i<arr.length;i++){
+         total +=arr[i].count
+      }
+    }
+   
+    if (total < min_number) {
+      min_str = total
+    }
+    if (total == 0) {
+      min_str = "";
+      max_str = "";
+    }
+    if (total >= min_number) {
+      if (parseInt(total / min_number) != 0) {
+        max_str = parseInt(total / min_number)
+      }
+      if (total % min_number != 0) {
+        min_str = (total % min_number)
+      }
+    }
+    return max_str + min_str;
+  },
   },
 };
 </script>