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

src/xt_pages/dialysis/batch_print/batch_print_order_seventynine.vue

@@ -60,7 +60,7 @@
                           }}
                         </div>
                         <div style="flex: 1;">
-                          透析次数:{{ record.patient.total_dialysis +
+                          透析次数：  {{ record.patient.total_dialysis +
                             record.patient.user_sys_before_count
                               ? record.patient.total_dialysis +
                                 record.patient.user_sys_before_count

src/xt_pages/dialysis/batch_print/batch_print_order_thirtyTwo.vue

@@ -580,7 +580,7 @@
                                 <span v-if="item.prescribing_number">&nbsp;&nbsp; {{ item.prescribing_number }}{{ item.prescribing_number_unit }}</span>
                                 <span v-if="item.single_dose != 0">{{ item.single_dose }}{{ item.single_dose_unit }}</span>
                                 <span v-if="item.parent_id == 0">{{ item.delivery_way }}</span>
-                                <span v-if="item.parent_id == 0">{{ item.execution_frequency }}</span>
+                                <!-- <span v-if="item.parent_id == 0">{{ item.execution_frequency }}</span> -->
                                 <span v-if="item.parent_id == 0 && item.remark.length > 0">({{ advice.remark }})</span>
                                 <span v-if="item.children && !Array.isArray(item)" style="display:block;border-top: 1px solid #000;" v-for="(child, childindex) in item.children" :key="childindex" class="advice-children">
                                     <span style="padding-left: 20px !important;">---></span>

src/xt_pages/dialysis/details/index.vue

@@ -297,7 +297,7 @@
                   <span>{{main_collection.patient.name}} </span>
                   （{{ main_collection.patient.dialysis_no }}，{{getNewAge(main_collection.patient.id_card_no)  }}岁<span v-if="main_collection.patient.height>0">,{{ main_collection.patient.height }}cm</span>）
                 </div>
-                <div class="printCell" style="display:flex;" v-if="org_id ==10598 || org_id == 0">
+                <div class="printCell" style="display:flex;" v-if="org_id ==10598 ">
                   <div style="">透析模式:
                    <span>{{getModeName(main_collection.prescription.mode_id)  }}</span>
                   </div>
@@ -545,7 +545,7 @@
                   </span>
                   </span>
                 </div>
-                <div class="printCell" style="display:flex;"  v-if="org_id==10598 || org_id == 0">
+                <div class="printCell" style="display:flex;"  v-if="org_id==10598">
                   <span style="display: block;width: 45%;">处方脱水量：{{main_collection.prescription.prescription_water}}
                     <span v-if="$store.getters.xt_user.org.id == 10278 || $store.getters.xt_user.org.id == 10460">ml</span>
                      <span v-else>L</span>
@@ -554,7 +554,7 @@
                     血流量：{{ main_collection.prescription.blood_flow_volume }} ml/min
                   </span>
                 </div>
-                <div class="printCell" style="display:flex;" v-if="org_id ==10598 || org_id == 0">
+                <div class="printCell" style="display:flex;" v-if="org_id ==10598">
                   <div style="">透析时长:
                    <span>{{main_collection.prescription.dialysis_duration_hour }}小时 <span v-if="main_collection.prescription.dialysis_duration_minute>0">{{main_collection.prescription.dialysis_duration_minute }}分 </span></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                   </div>
@@ -562,6 +562,12 @@
                     {{ getDisplaceLiquiPart(main_collection.prescription.displace_liqui_part) }}
                   </div>
                 </div>
+                <div class="printCell" style="display:flex;" v-if="org_id ==10635 || org_id == 0">
+                  <div>
+                    处方脱水量：{{main_collection.prescription.prescription_water}} L
+                  </div>
+                  <div></div>
+                </div>
               </div>
             </div>
 

src/xt_pages/dialysis/template/DialysisPrintOrderSeventynine.vue

@@ -36,7 +36,7 @@
                     {{ dialysisOrder && dialysisOrder.DeviceNumber && dialysisOrder.DeviceNumber.number.length > 0 ? dialysisOrder.DeviceNumber.number : patientInfo.DialysisSchedule.device_number.number }}
                   </div>
                   <div style="flex: 1;">
-                    透析次数:{{ patientInfo.total_dialysis + patientInfo.user_sys_before_count ? 
+                    透析次数：  {{ patientInfo.total_dialysis + patientInfo.user_sys_before_count ? 
                                 patientInfo.total_dialysis + patientInfo.user_sys_before_count : "/" }}
                   </div>
                 </div>

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyTwo.vue

@@ -666,7 +666,7 @@
               <span v-if="advice.prescribing_number"> &nbsp;&nbsp; {{ advice.prescribing_number }}{{ advice.prescribing_number_unit }}</span>
               <span v-if="advice.single_dose != 0">{{ advice.single_dose }}{{ advice.single_dose_unit }}</span>
               <span v-if="advice.parent_id == 0">{{ advice.delivery_way }}</span>
-              <span v-if="advice.parent_id == 0">{{ advice.execution_frequency }}</span>
+              <!-- <span v-if="advice.parent_id == 0">{{ advice.execution_frequency }}</span> -->
               <span v-if="advice.parent_id == 0 && advice.remark.length > 0">({{ advice.remark }})</span>
             </td>
             <td height="40px">
@@ -1649,6 +1649,8 @@ export default {
               response.data.data.advices == null
                 ? []
                 : response.data.data.advices
+                console.log('this.doctor_advices',this.doctor_advices);
+                
             for (let index = 0; index < this.doctor_advices.length; index++) {
               this.doctor_advices[index]['isShow'] = 2
             }