新分支

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

                 org_id!=10478 &&
                 org_id!=10551 &&
                 template_id != 43 &&
-                template_id != 47) ||
+                template_id != 47 &&
+                org_id!=10558) ||
                 org_id == 9779 ||
                 template_id == 11 ||
                 template_id == 20 ||
             width="100"
             v-if="
               isShow('置换量') &&
-              (template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478 || org_id == 10551) &&
+              (template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478 || org_id == 10551 || org_id ==10558) &&
               template_id != 9779 &&
               template_id != 11 &&
               template_id != 20 &&
           <el-col
             :span="8"
             v-if="
-              isShow('置换率') &&
+              (isShow('置换率') &&
               template_id != 6 &&
               template_id != 10 &&
               template_id != 11 &&
               org_id!=10432 &&
               org_id!=10445 &&
               org_id!=10410 &&
-              org_id!=10395
+              org_id!=10395)
+              || org_id ==10558 
             "
           >
             <el-form-item label="置换率(L/h)：" :prop="isName('置换率')"
                 org_id==10432 ||
                 org_id!=10445 ||
                 org_id!=10410 ||
-                org_id!=10395)
+                org_id!=10395) && org_id !=10558
             "
           >
             <el-form-item label="置换率(ml/min)：" :prop="isName('置换率')"
             :span="8"
             v-if="
               isShow('置换量') &&
-              (template_id != 6 || org_id == 9919 || org_id == 10191 || org_id ==10551) &&
+              (template_id != 6 || org_id == 9919 || org_id == 10191 || org_id ==10551 || org_id ==10558) &&
               org_id != 9779 &&
               template_id != 11 &&
               template_id != 20 &&
                 org_id != 9919 &&
                 org_id != 10191 &&
                 org_id != 10551 &&
-                template_id != 43) ||
+                template_id != 43 && org_id!=10558) ||
                 org_id == 9779 ||
                 template_id == 11 ||
                 template_id == 20 ||

src/xt_pages/dialysis/details/dialysisMonitoring.vue

           <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('钠浓度')" 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) " 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" 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!=10558" 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 == 10558" width="92px" > 置换率(L/h)  </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 == 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 )" width="92px"  > 置换量(ml)  </th>
-          <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478) && 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)" width="92px" > 置换量(L) </th>
+          <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191 && org_id!=10478) || 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 ) && org_id!=10558" width="92px"  > 置换量(ml)  </th>
+          <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478) && 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) || org_id == 10558" width="92px" > 置换量(L) </th>
           <th v-if=" isShow('SpO₂') && template_id != 6 && template_id != 10 && template_id != 11  " width="92px" > SpO₂(%) </th>
           <th v-if="isShow('电导度')" width="92px">电导度(mS/m)</th>
           <th v-if="isShow('置换液流量') && template_id != 27" width="92px">置换液流量(ml/h)</th>

src/xt_pages/dialysis/details/index.vue

           console.log("list2332322332",list)
           this.printList = list
           this.assessmentAfterDislysis = assessmentAfterDislysis
-          // this.startVisibility = true
-          this.centerDialogVisible =true
+          this.startVisibility = true
+          // this.centerDialogVisible =true
           loading.close()
         }
       })

src/xt_pages/dialysis/newDoctorAdvice.vue

           sortable
         >
           <template slot-scope="scope">
-            <span v-if="scope.row.check_time != 0">
+            <span v-if="scope.row.check_time != 0  && org_id!=10460">
               {{scope.row.check_time | parseTime('{m}-{d} {h}:{i}')}}
             </span>
             <span v-else>
           sortable
         >
           <template slot-scope="scope">
-            <span v-if="scope.row.created_time != 0">
+            <span v-if="scope.row.created_time != 0 && org_id!=10460">
               {{scope.row.created_time | parseTime('{m}-{d} {h}:{i}')}}
             </span>
             <span v-else></span>

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyFour.vue

                           </div>
                           分钟
                       </div>
-                      <div class="inline_block" style="margin-left:20px;flex:1;">
+                      <!-- <div class="inline_block" style="margin-left:20px;flex:1;">
                           血流量：
                           <div class="under_line" style="width: 50px;text-align: center">
                           {{ prescription.blood_flow_volume ? prescription.blood_flow_volume : "/" }}
                           </div>
                           ml/min
-                      </div>
+                      </div> -->
                       <div class="inline_block" style="flex:1;margin-left:20px;">
                           血管通路：
                           <div class="under_line" style="width: 200px;text-align: center;">

src/xt_pages/workforce/scheduleTablePrintTwo.vue

                   <span v-if="item.Mon_M.patient_id">
                     <span>{{ item.Mon_M.patient }} </span><br/>
                     <span >{{ item.Mon_M.mode_name }}</span><br/>
-                    <span v-if="org_id==10469 || org_id ==0">{{getAnticoagulant(item.Mon_M.anticoagulant)}}</span><br/>
+                    <span v-if="org_id ==0">{{getAnticoagulant(item.Mon_M.anticoagulant)}}</span><br/>
                     <span v-show="showflag">{{item.Mon_M.dialysis_machine_name}}
                    
                     </span>
                   <span v-if="item.Mon_A.patient_id">
                     <span>{{ item.Mon_A.patient }} </span><br/>
                     <span >{{ item.Mon_A.mode_name }}</span><br/>
-                     <span v-if="org_id==10469 || org_id == 0">{{getAnticoagulant(item.Mon_A.anticoagulant)  }}</span>
+                     <span v-if="org_id == 0">{{getAnticoagulant(item.Mon_A.anticoagulant)  }}</span>
                     <span v-show="showflag">{{item.Mon_A.dialysis_machine_name}}
                      
                     </span>
                     <span v-if="item.Mon_N.patient_id">
                         <span>{{ item.Mon_N.patient }} </span><br/>
                         <span >{{ item.Mon_N.mode_name }}</span><br/>
-                        <span v-if="org_id ==10469 || org_id == 0">{{getAnticoagulant(item.Mon_N.anticoagulant)  }}</span>
+                        <span v-if="org_id == 0">{{getAnticoagulant(item.Mon_N.anticoagulant)  }}</span>
                         <span v-show="showflag">{{item.Mon_N.dialysis_machine_name}}
                          
                         </span>
                     <span v-if="item.Tue_M.patient_id">
                         <span>{{ item.Tue_M.patient }} </span><br/>
                         <span >{{ item.Tue_M.mode_name }}</span><br/>
-                        <span v-if="org_id==0||org_id==10469">{{getAnticoagulant(item.Tue_M.anticoagulant )  }}</span><br/>
+                        <span v-if="org_id==0">{{getAnticoagulant(item.Tue_M.anticoagulant )  }}</span><br/>
                         <span v-show="showflag">{{item.Tue_M.dialysis_machine_name}}
                          
                         </span>
                     <span v-if="item.Tue_A.patient_id">
                       <span>{{ item.Tue_A.patient }} </span><br/>
                         <span >{{ item.Tue_A.mode_name }}</span><br/>
-                        <span v-if="org_id ==0||org_id == 10469">{{ getAnticoagulant(item.Tue_A.anticoagulant)}}</span>
+                        <span v-if="org_id ==0">{{ getAnticoagulant(item.Tue_A.anticoagulant)}}</span>
                         <span v-show="showflag">{{item.Tue_A.dialysis_machine_name}}
                          
                         </span>
                     <span v-if="item.Tue_N.patient_id">
                       <span>{{ item.Tue_N.patient }} </span><br/>
                         <span >{{ item.Tue_N.mode_name }}</span><br/>
-                        <span v-if="org_id==0||org_id ==10469">{{getAnticoagulant(item.Tue_N.anticoagulant)  }}</span>
+                        <span v-if="org_id==0">{{getAnticoagulant(item.Tue_N.anticoagulant)  }}</span>
                         <span v-show="showflag">{{item.Tue_N.dialysis_machine_name}}
                           
                         </span>
                     <span v-if="item.Wed_M.patient_id">
                       <span>{{ item.Wed_M.patient }} </span><br/>
                         <span >{{ item.Wed_M.mode_name }}</span><br/>
-                        <span v-if="org_id == 0 || org_id ==10469">{{getAnticoagulant(item.Wed_M.anticoagulant)  }}</span><br/>
+                        <span v-if="org_id == 0">{{getAnticoagulant(item.Wed_M.anticoagulant)  }}</span><br/>
                         <span v-show="showflag">{{item.Wed_M.dialysis_machine_name}}
                           
                         </span>
                     <span v-if="item.Wed_A.patient_id">
                       <span>{{ item.Wed_A.patient }} </span><br/>
                         <span >{{ item.Wed_A.mode_name }}</span><br/>
-                        <span v-if="org_id ==0||org_id ==10469">{{getAnticoagulant(item.Wed_A.anticoagulant)}}</span>
+                        <span v-if="org_id ==0">{{getAnticoagulant(item.Wed_A.anticoagulant)}}</span>
                         <span v-show="showflag">{{item.Wed_A.dialysis_machine_name}}
                          
                         </span>
                     <span v-if="item.Wed_N.patient_id">
                       <span>{{ item.Wed_N.patient }} </span><br/>
                         <span >{{ item.Wed_N.mode_name }}</span><br/>
-                        <span v-if="org_id ==0 || org_id ==10469">{{ getAnticoagulant(item.Wed_N.anticoagulant) }}</span>
+                        <span v-if="org_id ==0">{{ getAnticoagulant(item.Wed_N.anticoagulant) }}</span>
                         <span v-show="showflag">{{item.Wed_N.dialysis_machine_name}}
                          
                         </span>
                     <span v-if="item.Thurs_M.patient_id">
                       <span>{{ item.Thurs_M.patient }} </span><br/>
                         <span >{{ item.Thurs_M.mode_name }}</span><br/>
-                        <span v-if="org_id == 0||org_id ==10469">{{ getAnticoagulant(item.Thurs_M.anticoagulant) }}</span>
+                        <span v-if="org_id == 0">{{ getAnticoagulant(item.Thurs_M.anticoagulant) }}</span>
                         <span v-show="showflag">{{item.Thurs_M.dialysis_machine_name}}
                          
                         </span>
                     <span v-if="item.Thurs_A.patient_id">
                       <span>{{ item.Thurs_A.patient }} </span><br/>
                         <span >{{ item.Thurs_A.mode_name }}</span><br/>
-                        <span v-if="org_id ==0||org_id ==10469">{{getAnticoagulant(item.Thurs_A.anticoagulant) }}</span> 
+                        <span v-if="org_id ==0">{{getAnticoagulant(item.Thurs_A.anticoagulant) }}</span> 
 
                         <span v-show="showflag">{{item.Thurs_A.dialysis_machine_name}}
                         
                     <span v-if="item.Thurs_N.patient_id">
                       <span>{{ item.Thurs_N.patient }} </span><br/>
                         <span >{{ item.Thurs_N.mode_name }}</span><br/>
-                        <span v-if="org_id ==0 || org_id ==10469" >{{ getAnticoagulant(item.Thurs_N.anticoagulant) }}</span> 
+                        <span v-if="org_id ==0" >{{ getAnticoagulant(item.Thurs_N.anticoagulant) }}</span> 
                         <span v-show="showflag">{{item.Thurs_N.dialysis_machine_name}}
                          
                         </span>
                     <span v-if="item.Fri_M.patient_id">
                       <span>{{ item.Fri_M.patient }} </span><br/>
                         <span >{{ item.Fri_M.mode_name }}</span><br/>
-                        <span v-if="org_id ==0||org_id ==10469">{{ getAnticoagulant(item.Fri_M.anticoagulant) }} </span><br/>
+                        <span v-if="org_id ==0">{{ getAnticoagulant(item.Fri_M.anticoagulant) }} </span><br/>
                         <span v-show="showflag">{{item.Fri_M.dialysis_machine_name}}
                           
                         </span>
                     <span v-if="item.Fri_A.patient_id">
                       <span>{{ item.Fri_A.patient }} </span><br/>
                         <span >{{ item.Fri_A.mode_name }}</span><br/>
-                        <span v-if="org_id ==0||org_id ==10469">{{ getAnticoagulant(item.Fri_A.anticoagulant) }}</span> 
+                        <span v-if="org_id ==0">{{ getAnticoagulant(item.Fri_A.anticoagulant) }}</span> 
                         <span v-show="showflag">{{item.Fri_A.dialysis_machine_name}}
                           
                         </span>
                     <span v-if="item.Fri_N.patient_id">
                       <span>{{ item.Fri_N.patient }} </span><br/>
                         <span >{{ item.Fri_N.mode_name }}</span><br/>
-                        <span v-if="org_id == 0||org_id ==10469">{{getAnticoagulant(item.Fri_N.anticoagulant)  }}</span>
+                        <span v-if="org_id == 0">{{getAnticoagulant(item.Fri_N.anticoagulant)  }}</span>
                         <span v-show="showflag">{{item.Fri_N.dialysis_machine_name}}
                           
                         </span>
                     <span v-if="item.Sat_M.patient_id">
                       <span>{{ item.Sat_M.patient }} </span><br/>
                         <span >{{ item.Sat_M.mode_name }}</span><br/>
-                        <span v-if="org_id ==0 || org_id ==10469">{{ getAnticoagulant(item.Sat_M.anticoagulant) }}</span> 
+                        <span v-if="org_id ==0">{{ getAnticoagulant(item.Sat_M.anticoagulant) }}</span> 
                         <span v-show="showflag">{{item.Sat_M.dialysis_machine_name}}
                          
                         </span>
                     <span v-if="item.Sat_A.patient_id">
                       <span>{{ item.Sat_A.patient }} </span><br/>
                         <span >{{ item.Sat_A.mode_name }}</span><br/>
-                        <span v-if="org_id ==0||org_id ==10469">{{ getAnticoagulant(item.Sat_A.anticoagulant) }}</span> 
+                        <span v-if="org_id ==0">{{ getAnticoagulant(item.Sat_A.anticoagulant) }}</span> 
                         <span v-show="showflag">{{item.Sat_A.dialysis_machine_name}}
                           
                         </span>
                     <span v-if="item.Sat_N.patient_id">
                       <span>{{ item.Sat_N.patient }} </span><br/>
                         <span >{{ item.Sat_N.mode_name }}</span><br/>
-                        <span v-if="org_id ==0||org_id ==10469">{{ getAnticoagulant(item.Sat_N.anticoagulant) }}</span> 
+                        <span v-if="org_id ==0">{{ getAnticoagulant(item.Sat_N.anticoagulant) }}</span> 
                         <span v-show="showflag">{{item.Sat_N.dialysis_machine_name}}
                          
                         </span>
                     <span v-if="item.Sun_M.patient_id">
                       <span>{{ item.Sun_M.patient }} </span><br/>
                         <span >{{ item.Sun_M.mode_name }}</span><br/>
-                        <span v-if="org_id ==0||org_id ==10469">{{ getAnticoagulant(item.Sun_M.anticoagulant) }}</span>
+                        <span v-if="org_id ==0">{{ getAnticoagulant(item.Sun_M.anticoagulant) }}</span>
                         <span v-show="showflag">{{item.Sun_M.dialysis_machine_name}}
                          
                         </span>
                     <span v-if="item.Sun_A.patient_id">
                       <span>{{ item.Sun_A.patient }} </span><br/>
                         <span >{{ item.Sun_A.mode_name }}</span><br/>
-                        <span v-if="org_id ==0 || org_id ==10469">{{getAnticoagulant(item.Sun_A.anticoagulant)}}</span>
+                        <span v-if="org_id ==0">{{getAnticoagulant(item.Sun_A.anticoagulant)}}</span>
                         <span v-show="showflag">{{item.Sun_A.dialysis_machine_name}}
                          
                         </span>
                     <span v-if="item.Sun_N.patient_id">
                       <span>{{ item.Sun_N.patient }} </span><br/>
                         <span >{{ item.Sun_N.mode_name }}</span><br/>
-                        <span v-if="org_id ==0||org_id ==10469">{{ getAnticoagulant(item.Sun_N.anticoagulant ) }}</span>
+                        <span v-if="org_id ==0">{{ getAnticoagulant(item.Sun_N.anticoagulant ) }}</span>
                         <span v-show="showflag">{{item.Sun_N.dialysis_machine_name}}
                           
                         </span>