Merge branch 'master' of http://git.shengws.com/csx/Vue_New

src/xt_pages/dialysis/batch_print/batch_print_order_twelve.vue

@@ -1255,9 +1255,7 @@
                         <span style="width:70px;display:inline-block">{{
                           record.assessment_after_dislysis.weight_after
                             ? parseFloat(
-                                record.assessment_after_dislysis.weight_after -
-                                    record.assessment_before_dislysis
-                                      .additional_weight
+                                record.assessment_after_dislysis.weight_after
                               ).toFixed(1)
                             : ""
                         }}</span

src/xt_pages/dialysis/template/dialysisPrintOrderTwelve.vue

@@ -1076,10 +1076,7 @@
               <div>
                 <span style="width:70px;display:inline-block">{{
                   afterdialysis.weight_after
-                    ? parseFloat(
-                        afterdialysis.weight_after -
-                          afterdialysis.additional_weight
-                      ).toFixed(1)
+                    ? parseFloat(afterdialysis.weight_after).toFixed(1)
                     : ""
                 }}</span
                 >Kg