6.27

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -611,7 +611,7 @@
                     </el-col>
 
                     <el-col :span="8"
-                            v-if="isShows('置换液总量') && (this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id ==24 || this.$store.getters.xt_user.template_info.template_id ==53)"
+                            v-if="isShows('置换液总量') && ((this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id ==24 || this.$store.getters.xt_user.template_info.template_id ==53) && this.$store.getters.xt_user.template_info.org_id != 10345)"
                             v-show="totalShow">
                         <el-form-item label="置换液总量(ml)">
                             <el-input
@@ -620,7 +620,7 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="8"
-                            v-if="isShows('置换液总量') && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id !=24 && this.$store.getters.xt_user.template_info.template_id !=53"
+                            v-if="isShows('置换液总量') && (this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id !=24 && this.$store.getters.xt_user.template_info.template_id !=53) || this.$store.getters.xt_user.template_info.org_id  == 10345"
                             v-show="totalShow">
                         <el-form-item label="置换液总量(L)">
                             <el-input

src/xt_pages/outpatientTool/components/detailStatistics.vue

@@ -168,6 +168,7 @@
       <div>总费用:{{ getAllPice() }}</div>
       <div>
         个人支付: 
+       
         <span v-if="his_patient.balance_accounts_type == 2">{{ getAllPice() }}</span>  
         <span v-if="his_patient.balance_accounts_type != 2">{{ getActPay() }}</span>
       
@@ -446,7 +447,7 @@ export default {
       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 += this.list[i].orders[j].acct_pay;
+          act_pay += this.list[i].orders[j].psn_cash_pay;
         }
       }
       return act_pay.toFixed(2);

src/xt_pages/outpatientTool/gatherPrint.vue

@@ -10,12 +10,12 @@
         </div>
         <div class="listInfo">
             <div>科别：
-              <!-- {{getDepartment(his_patient.departments)}} -->
+              <span v-if="org_id!=10215"> {{getDepartment(his_patient.departments)}}</span> 
               {{getDepartment(his_record_patient.departments)}}
             </div>
             <div>床号：<span v-if="schedule.length > 0">{{getBedName(schedule[0].bed_id)}}</span></div>
             <div>门诊号：
-               <!-- {{his_patient.number}} -->
+               <span v-if="org_id!=10215">{{his_patient.number}}</span> 
                {{his_record_patient.ipt_otp_no}}
             </div>
             <div>姓名：{{patient.name}}</div>
@@ -50,6 +50,11 @@
             <div>材料费：{{getMaterialCostTotal()}}</div>
             <div>其他：{{getOtherCostTotal()}}</div>
         </div>
+        <div class="listInfo" style="margin-bottom: 20px;">
+            <div>记账支付：{{getFundPaySumamt()}}</div>
+            <div>个人账号：{{getAcctPay()}}</div>
+            <div>现金支付：{{getPsnCashPay()}}</div>
+        </div>
         <table class="listTable" border="1">
             <tr>
                 <td style="text-align:center" >序号</td>
@@ -129,7 +134,6 @@
           medicalInsuranceLevelList:[],
           schedule:[],
           bedNumber:[],
-          tableList:[],
           order_info_list:[],
           balanceAccountsType:0,
           medicalInsuranceLevelList:[],
@@ -139,6 +143,8 @@
           start_time:"",
           end_time:"",
           his_record_patient:{},
+          orderList:[],
+          org_id:0,
         }
     },
     methods:{
@@ -189,7 +195,7 @@
           this.drugTypeList =response.data.data.drugTypeList
           this.costClassifyList = response.data.data.costClassifyList 
           var list = response.data.data.list
-          
+          this.orderList = response.data.data.orderList
 
           var new_arr = []
 
@@ -1059,10 +1065,58 @@
         }
       }
       return number
+    },
+    getTotalCountPrice(){
+      var total_price = 0
+      for(let i=0;i<this.tableList.length;i++){
+         if(this.tableList[i].is_total == 2){
+           total_price += this.tableList[i].pric * this.tableList[i].count_number
+         }
+      }
+      if(total_price > 0){
+        return total_price.toFixed(2)
+      }else{
+        return ""
+      }
+    },
+    getPsnCashPay(){
+      var psn_cash_pay = 0
+      for(let i=0;i<this.orderList.length;i++){
+        psn_cash_pay += this.orderList[i].psn_cash_pay
+      }
+      if(psn_cash_pay > 0){
+         return psn_cash_pay.toFixed(2)
+      }else{
+        return 0.00
+      }
+    },
+    getAcctPay(){
+      var acct_pay = 0
+      for(let i=0;i<this.orderList.length;i++){
+         acct_pay +=this.orderList[i].acct_pay
+      }
+      if(acct_pay > 0){
+        return acct_pay.toFixed(2)
+      }else{
+        return 0.00
+      }
+    },
+    getFundPaySumamt(){
+      var fund_pay_sumamt = 0
+      for(let i=0;i<this.orderList.length;i++){
+        fund_pay_sumamt +=this.orderList[i].fund_pay_sumamt
+      }
+      if(fund_pay_sumamt >0){
+        return fund_pay_sumamt.toFixed(2)
+      }else{
+        return 0.00
+      }
     }
 
     },
     created(){
+      this.org_id = this.$store.getters.xt_user.org.id;
+      console.log("org_id3223232332",org_id)
       this.getGatherDetailList()   
     }