Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/xt_pages/dialysis/details/DialysisPrescription.vue

         </li> -->
 
 
-        <li v-if="isShow('处方脱水量') && this.$store.getters.xt_user.template_info.org_id != 10597 && this.$store.getters.xt_user.template_info.org_id != 10571  && this.$store.getters.xt_user.template_info.org_id != 10612">
+        <li v-if="isShow('处方脱水量') && this.$store.getters.xt_user.template_info.org_id != 10597 && this.$store.getters.xt_user.template_info.org_id != 10571  && this.$store.getters.xt_user.template_info.org_id != 10612 && this.$store.getters.xt_user.template_info.org_id != 10598">
           <label>处方脱水量 : </label>
           <span class="content">{{ prescription_water != "0" ? prescription_water : "" }}</span>
           <span class="unit">{{ prescription_water != "0" ? "ml" : "" }}</span>
         </li>
 
-        <li v-if="isShow('处方脱水量') && this.$store.getters.xt_user.template_info.org_id == 10597 ||  this.$store.getters.xt_user.template_info.org_id == 10571 || this.$store.getters.xt_user.template_info.org_id == 10612  ">
+        <li v-if="isShow('处方脱水量') && this.$store.getters.xt_user.template_info.org_id == 10597 ||  this.$store.getters.xt_user.template_info.org_id == 10571 || this.$store.getters.xt_user.template_info.org_id == 10612  || this.$store.getters.xt_user.template_info.org_id == 10598 ">
           <label>处方脱水量 : </label>
           <span class="content">{{ prescription_water != "0" ? prescription_water : "" }}</span>
           <span class="unit">{{ prescription_water != "0" ? "L" : "" }}</span>

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

                     </el-col>
 
                     <el-col :span="8"
-                            v-if="isShows('处方脱水量') && this.$store.getters.xt_user.template_info.org_id != 10597&& this.$store.getters.xt_user.template_info.org_id != 10571 && this.$store.getters.xt_user.template_info.org_id != 10612">
+                            v-if="isShows('处方脱水量') && this.$store.getters.xt_user.template_info.org_id != 10597&& this.$store.getters.xt_user.template_info.org_id != 10571 && this.$store.getters.xt_user.template_info.org_id != 10612 && this.$store.getters.xt_user.template_info.org_id != 10598">
                         <el-form-item label="处方脱水量(ml)：" prop="prescription_water" :rules="isCheckmust('处方脱水量')">
                             <el-input
                                     type="number"
                     </el-col>
 
                     <el-col :span="8"
-                            v-if="isShows('处方脱水量') && this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id ==10571 || this.$store.getters.xt_user.template_info.org_id ==10612 ">
+                            v-if="isShows('处方脱水量') && this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id ==10571 || this.$store.getters.xt_user.template_info.org_id ==10612 || this.$store.getters.xt_user.template_info.org_id ==10598">
                         <el-form-item label="处方脱水量(L)：" prop="prescription_water" :rules="isCheckmust('处方脱水量')">
                             <el-input
                                     type="number"

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

 
                 </div>
                 <div class="printCell" style="display:flex;justify-content: space-around;">
-                  <span style="display: block;width: 50%;">处方脱水量：{{
-                      main_collection.prescription.target_ultrafiltration
-                    }}
+                   <span style="display: block;width: 50%;">
+                     目标脱水量：{{main_collection.prescription.target_ultrafiltration}}
                     <span
                       v-if="$store.getters.xt_user.org.id == 10278 || $store.getters.xt_user.org.id == 10460">ml</span>
                     <span v-else>L</span>
                     </span>
+                 
                   <span style="display: block;width: 50%;"  v-if="org_id!=10598">
                     总量：{{ main_collection.dialysissolution.anticoagulant_zongliang }}
                   <span v-if="main_collection.dialysissolution.anticoagulant == 1">
                    iu
                    </span>
                   </span>
+                 
+                </div>
+                <div class="printCell" style="display:flex;justify-content: space-around;"  v-if="org_id==10598 || org_id == 0">
+                  <span style="display: block;width: 50%;">处方脱水量：{{main_collection.prescription.target_ultrafiltration}}
+                    <span v-if="$store.getters.xt_user.org.id == 10278 || $store.getters.xt_user.org.id == 10460 ||  $store.getters.xt_user.org.id == 10598">ml</span>
+                     <span v-else>L</span>
+                  </span> 
+                  <span>
+                    血流量：{{ main_collection.prescription.blood_flow_volume }} ml/min
+                  </span>
                 </div>
               </div>
             </div>