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_eighty.vue

@@ -1203,12 +1203,15 @@
                         <div class="under_line"
                           style="width: 70px; text-align: center"
                         >
-                          <span v-if="record.monitor_records !='' && record.monitor_records[record.monitor_records.length - 1].ultrafiltration_volume !=''">
+                          <!-- <span v-if="record.monitor_records !='' && record.monitor_records[record.monitor_records.length - 1].ultrafiltration_volume !=''">
                             {{ (record.monitor_records[record.monitor_records.length - 1].ultrafiltration_volume/1000).toFixed(1) }}
+                          </span> -->
+                          <span v-if="record.assessment_after_dislysis.actual_ultrafiltration !=''">
+                            {{ record.assessment_after_dislysis.actual_ultrafiltration>100
+                              ? (record.assessment_after_dislysis.actual_ultrafiltration/1000).toFixed(1) : record.assessment_after_dislysis.actual_ultrafiltration }}
                           </span>
                           <span v-else>
-                            {{ record.assessment_after_dislysis.actual_ultrafiltration
-                              ? record.assessment_after_dislysis.actual_ultrafiltration : '' }}
+
                           </span>
                           <!-- {{
                             record.assessment_after_dislysis.actual_ultrafiltration

src/xt_pages/dialysis/template/DialysisPrintOrdereighty.vue

@@ -1070,13 +1070,20 @@
                       <div class="under_line"
                         style="width: 70px; text-align: center"
                       >
-                        <span v-if=" monitors.length !=0 &&monitors[monitors.length - 1].ultrafiltration_volume !=''">
+                        <!-- <span v-if=" monitors.length !=0 &&monitors[monitors.length - 1].ultrafiltration_volume !=''">
                           {{ (monitors[monitors.length - 1].ultrafiltration_volume/1000).toFixed(1) }}
+                        </span> -->
+                        <span v-if="afterdialysis.actual_ultrafiltration !=''">
+                          {{ afterdialysis.actual_ultrafiltration>100
+                            ? (afterdialysis.actual_ultrafiltration/1000).toFixed(1) : record.assessment_after_dislysis.actual_ultrafiltration }}
                         </span>
                         <span v-else>
+
+                        </span>
+                        <!-- <span>
                           {{ afterdialysis.actual_ultrafiltration
                             ? afterdialysis.actual_ultrafiltration : "" }}
-                        </span>
+                        </span> -->
                       </div>
                       L
                     </div>

src/xt_pages/user/text_content.vue

@@ -199,7 +199,6 @@ export default{
       var hdf1000total=0
       var hdf1000Arr =[]
 
-      
       var hdf80total=0
       var hdf80Arr =[]
 
@@ -1046,8 +1045,6 @@ export default{
           jiancDoc.appendChild(newList1)
         }
       }
-
-
       var newListArr =[]
       for(let j in this.longAdvice){
         const obj={
@@ -1093,8 +1090,6 @@ export default{
 
       
     })
-   
-   
   },
   methods: {
     getTime (time) {