Merge branch 'superman' of http://git.shengws.com/zhangbj/xt_vue into superman

src/xt_pages/dialysis/batch_print/batch_print_order.vue

@@ -105,7 +105,7 @@
                   </div>
                   <div class="row" style="padding: 2px 0;">
                     <div class="inline_block">
-                      出血：
+                      活动性出血：
                       <check-box text="无"
                                  :checked="isCheckBoxChecked(record.assessment_before_dislysis, 'is_hemorrhage', 2)"></check-box>
                       <check-box text="有"

src/xt_pages/dialysis/batch_print/batch_print_order_other.vue

@@ -89,7 +89,7 @@
                       <check-box text="昏迷" :checked="isCheckBoxChecked(record.receive_assessment, 'consciousness', 3)"></check-box>
                     </div>
                     <div class="inline_block"  style="margin-left: 30px;">
-                      出血：
+                     活动性出血：
                       <check-box text="无"  :checked="isCheckBoxChecked(record.assessment_before_dislysis, 'is_hemorrhage', 2)"></check-box>
                       <check-box text="异常" :checked="isCheckBoxChecked(record.assessment_before_dislysis, 'is_hemorrhage', 1)"></check-box>
                       （&nbsp;

src/xt_pages/dialysis/batch_print/batch_print_order_other_one.vue

@@ -86,7 +86,7 @@
                       <check-box text="昏迷" :checked="isCheckBoxChecked(record.receive_assessment, 'consciousness', 3)"></check-box>
                     </div>
                     <div class="inline_block"  style="margin-left: 30px;">
-                      出血：
+                      活动性出血：
                       <check-box text="无"  :checked="isCheckBoxChecked(record.assessment_before_dislysis, 'is_hemorrhage', 2)"></check-box>
                       <check-box text="异常" :checked="isCheckBoxChecked(record.assessment_before_dislysis, 'is_hemorrhage', 1)"></check-box>
                       （&nbsp;