Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/xt_pages/outpatientCharges/statementTemplate/printthirteen.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="statement-print" class="statement-print">
-    
+
     <div class="statementTitle" >湖北省基本医疗保险门诊费用结算单</div>
 
     <!-- <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id != 10375 && this.$store.getters.xt_user.org_id != 10387 && this.$store.getters.xt_user.org_id != 10191 && this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217 &&this.$store.getters.xt_user.org_id != 10088 &&this.$store.getters.xt_user.org_id != 10510 &&this.$store.getters.xt_user.org_id != 0">广东省社会医疗保险医疗费用结算单</div> -->
@@ -81,7 +81,7 @@
       </tr>
       <tr>
         <td>地址</td>
-        <td colspan="5">{{  }}</td>
+        <td colspan="5">{{info.patient.home_address}}</td>
         <td width="80">联系电话</td>
         <td width="110">{{info.patient.phone}}</td>
         <td width="80">身份证号</td>
@@ -89,9 +89,9 @@
       </tr>
       <tr>
         <td>门诊号</td>
-        <td colspan="5">{{ }}</td>
+        <td colspan="5">{{info.mdtrt_id}}</td>
         <td>门诊日期</td>
-        <td colspan="5">{{ }}</td>
+        <td colspan="5">{{getTime(info.date)}}</td>
       </tr>
       <tr>
         <td>险种</td>
@@ -103,7 +103,7 @@
         <td colspan="5" v-if="info.insutype == '392'">城乡居民大病医疗保险</td>
         <td colspan="5" v-if="info.insutype == '510'">生育保险</td>
         <td>诊断</td>
-        <td colspan="5">{{  }}</td>
+        <td colspan="5">{{info.diagnosis}}</td>
       </tr>
       <tr>
         <td>业务类别</td>
@@ -309,6 +309,7 @@
   </div>
 </template>
 <script>
+import { uParseTime } from '@/utils/tools'
   export default {
     props: {
       info: {
@@ -328,6 +329,16 @@
         }
       }
     },methods:{
+      getTime(val) {
+        if (val < 0) {
+          return ""
+        }
+        if (val == "") {
+          return ""
+        } else {
+          return uParseTime(val, '{y}-{m}-{d}')
+        }
+      },
       getBirth(idNo){
         var year = idNo.substring(6, 10);
         var month = idNo.substring(10, 12);

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -497,12 +497,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;