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

src/xt_pages/dialysis/batch_print/batch_print_order_thirteen.vue

@@ -387,7 +387,7 @@
                   </div>
                   出血
                   <div class="inline_block under_line" style="width:150px;text-align: center;margin-right:30px;">
-                    {{ record.assessment_before_dislysis.is_hemorrhage == 1 && record.assessment_before_dislysis.hemorrhage ? record.assessment_before_dislysis.hemorrhage + " " + record.assessment_before_dislysis.hemorrhage_other : "" }}
+                    {{ record.assessment_before_dislysis.is_hemorrhage == 1 && (record.assessment_before_dislysis.hemorrhage || record.assessment_before_dislysis.hemorrhage_other)? record.assessment_before_dislysis.hemorrhage + " " + record.assessment_before_dislysis.hemorrhage_other : "" }}
                   </div>
                   跌倒风险预防措施
                   <div class="inline_block under_line" style="width:100px;text-align: center;">

src/xt_pages/dialysis/template/DialysisPrintOrderThirteen.vue

@@ -305,9 +305,7 @@
         </div>
         出血
         <div class="inline_block under_line" style="width:150px;text-align: center;margin-right:30px;">
-          <!-- {{ predialysis.is_hemorrhage == 1 && predialysis.hemorrhage ? predialysis.hemorrhage + " " + predialysis.hemorrhage_other : "" }} -->
-          <span v-if="predialysis.is_hemorrhage ==1">是</span>
-          <span v-if="predialysis.is_hemorrhage == 0">否</span>
+          {{ predialysis.is_hemorrhage == 1 && (predialysis.hemorrhage || predialysis.hemorrhage_other) ? predialysis.hemorrhage + " " + predialysis.hemorrhage_other : "" }}
         </div>
         跌倒风险预防措施
         <div class="inline_block under_line" style="width:100px;text-align: center;">