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

src/xt_pages/outpatientCharges/newStatementPrintTwo.vue

@@ -109,16 +109,19 @@
                   that.info['patient_name'] = response.data.data.patient_name
                   that.info['doctor_code'] = response.data.data.doctor_code
                   that.info['doctor_name'] = response.data.data.doctor_name
-                  that.info['health_card_no'] = response.data.data.health_card_no_two
+                  if(response.data.data.health_card_no_two.length == 0){
+                    that.info['health_card_no'] = response.data.data.health_card_no
+                  }else{
+                    that.info['health_card_no'] = response.data.data.health_card_no_two
+                  }
+
                   that.info['order_number'] = response.data.data.order_number
 
                   that.info['department'] =  response.data.data.department
                   that.info['yiliao_leibie'] =  response.data.data.yiliao_leibie
 
                   that.info['before_money'] =  response.data.data.before_money
-                  that.info['after_money'] =  response.data.data.after_money
-
-
+                  that.info['after_money'] =   response.data.data.after_money
 
                   that.info['org_name'] = that.$store.getters.xt_user.org.org_name
                   console.log("～～～～" + that.info)

src/xt_pages/outpatientCharges/newTreatTemplate/printOne.vue

@@ -77,9 +77,9 @@
                 </div>
                 <div class="moneyBox">
                     <p>实收金：{{info.transBody.akc264}}元</p>
-                    <p>记账前金额：{{0.00}}元</p>
+                    <p>记账前金额：{{info.before_money}}元</p>
                     <p>扣款金额：{{0.00}}元</p>
-                    <p>记账后金额：{{0.00}}元</p>
+                    <p>记账后金额：{{info.after_money}}元</p>
                     <p>找赎金：{{0.00}}元</p>
                 </div>
                 <div class="actionBar">