提交代码

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -501,12 +501,8 @@
       <save-template ref='saveTemplate' v-on:save_template="saveTemplate"></save-template>
       <next-or-last-prescription ref='next_or_last_prescription' v-on:save="setValue"
                                  v-on:cancel="cancel"></next-or-last-prescription>
-
-
       <!--<next-or-last-prescription ref='next_or_last_prescription' v-on:save="setValue" v-on:cancel="cancel"></next-or-last-prescription>-->
       <call-prescription ref='call_prescription' v-on:call="call" v-on:call-cancel="callCancel"></call-prescription>
-
-
   </div>
 </template>
 

src/xt_pages/outpatientTool/detailPrint.vue

@@ -39,11 +39,17 @@
           </tr>
           <tr>
             <td>总费用：{{ getAllPice() }}</td>
-            <td>个人支付：
-             {{getActPay()}}
+            <td>个人支付金额：
+             {{getPsnCashPay()}}
             <!-- <span v-if="his_record_patient.balance_accounts_type == 2">{{ getAllPice() }}</span>
             <span v-if="his_record_patient.balance_accounts_type != 2">{{ getActPay() }}</span> -->
             </td>
+
+            <td>个人账户支付金额：
+              {{getActPay()}}
+              <!-- <span v-if="his_record_patient.balance_accounts_type == 2">{{ getAllPice() }}</span>
+              <span v-if="his_record_patient.balance_accounts_type != 2">{{ getActPay() }}</span> -->
+            </td>
             <td>基金支付记账：{{ getFundPaySumamt() }}</td>
             <td>补充医疗支付记账：{{ getHifesPay() }}</td>
           </tr>
@@ -414,7 +420,7 @@ export default {
       }
       return total_price;
     },
-    getActPay() {
+    getPsnCashPay() {
       var act_pay = 0;
       for (let i = 0; i < this.list.length; i++) {
         for (let j = 0; j < this.list[i].orders.length; j++) {
@@ -428,6 +434,14 @@ export default {
       }
 
       return act_pay.toFixed(2);
+    },getActPay() {
+      var act_pay = 0;
+      for (let i = 0; i < this.list.length; i++) {
+        for (let j = 0; j < this.list[i].orders.length; j++) {
+            act_pay = act_pay + this.list[i].orders[j].acct_pay
+          }
+        }
+      return act_pay.toFixed(2);
     },
     getFundPaySumamt() {
       var fund_pay_sumamt = 0;
@@ -436,7 +450,7 @@ export default {
           fund_pay_sumamt += this.list[i].orders[j].fund_pay_sumamt;
         }
       }
-      return fund_pay_sumamt;
+      return fund_pay_sumamt.toFixed(2);
     },
     getHifesPay() {
       var hifes_pay = 0;