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

src/xt_pages/outpatientCharges/listPrint.vue

     </template>
 
     <div class='dialysisPage' style="padding-top:40px;">
-      <printOne v-if="org_id != 0 && org_id != 10106&&org_id != 10215&&org_id != 10265 && org_id!=9675" :list="list" :patient="patient" :order="order" :admin="admin"></printOne>
+      <printOne v-if=" org_id != 10106&&org_id != 10215&&org_id != 10265 && org_id!=9675" :list="list" :patient="patient" :order="order" :admin="admin"></printOne>
       <printTwo v-if="org_id == 10106 && this.paramsObj.balance_accounts_type != 2" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></printTwo>
       <print-three v-if="org_id == 10106 && this.paramsObj.balance_accounts_type == 2" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></print-three>
 <!--      <list-print-two v-if="org_id == 10215 || org_id==9675" :list="list" :patient="patient" :order="order" :admin="admin"></list-print-two>-->
-     <list-print-three v-if="org_id == 0 || org_id == 10215 || org_id==9675" :list="list" :patient="patient" :order="order" :admin="admin"></list-print-three>
+     <list-print-three v-if="org_id == 10215 || org_id==9675" :list="list" :patient="patient" :order="order" :admin="admin"></list-print-three>
       <print-two10265  v-if="org_id == 10265  " :list="list" :patient="patient" :order="order" :admin="admin" :hospital_record="hospital_record"></print-two10265>
     </div>
   </div>
 
       printThisPage() {
         if(this.org_id != 10106){
-          if(this.org_id == 10215 || this.org_id == 0|| this.org_id == 9675){
+          if(this.org_id == 10215 || this.org_id == 9675){
             const style =
               '@media print {.allListTitle{font-size: 24px;text-align: center;font-weight: bold;margin-bottom: 10px;}.allListInfo{display: flex;font-size: 16px;justify-content: space-between;margin: 10px 0;} .listTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 20px;font-size: 14px;border-color: #000;text-align:left;}  .listTable tr td {padding: 0 5px;}.tableBottom{font-size: 16px;display: flex;margin-top: 10px;}.tableBottomOne{margin-right: 40px;} .allListTable{border: none;width: 100%;text-align: center;border-collapse: collapse;line-height: 20px;font-size: 14px;border-color: #000;text-align:left;} .allListTable tr{page-break-inside:avoid;} .allListTable tr td {padding: 0 5px;border: 1px solid #000;}.tableBottom{font-size: 16px;display: flex;margin-top: 20px;}.tableBottomOne{margin-right: 40px;}}'
             printJS({
 
           }else {
             const style =
-              '@media print {.listTitle{font-size: 24px;text-align: center;font-weight: bold;margin-bottom: 10px;}.listInfo{display: flex;font-size: 16px;justify-content: space-between;margin: 10px 0;} .listTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 20px;font-size: 14px;border-color: #000;text-align:left;}.listTable tr td {padding: 0 5px;}.tableBottom{font-size: 16px;display: flex;margin-top: 10px;}.tableBottomOne{margin-right: 40px;}}'
+              '@media print {.listTitle{font-size: 24px;text-align: center;font-weight: bold;margin-bottom: 10px;}.listInfo{display: flex;font-size: 16px;justify-content: space-between;margin: 10px 0;} .listTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 20px;font-size: 14px;border-color: #000;text-align:left;}.listTable tr td {padding: 0 5px;}.tableBottom{font-size: 12px;display: flex;margin-top: 10px;}.tableBottomOne{margin-right: 20px;}}'
             printJS({
               printable: 'list-print',
               type: 'html',

src/xt_pages/outpatientCharges/listTemplate/printOne.vue

         <div class="listInfo">
 
             <div>患者姓名：{{patient.name}}</div>
-            <div>透析号：{{patient.dialysis_no}}</div>
-            <div>性别：{{patient.gender == 1 ? '男': '女'}}</div>
+            <div v-if="$store.getters.xt_user.org.id != 10191">透析号：{{patient.dialysis_no}}</div>
+          <div v-if="$store.getters.xt_user.org.id == 10191">身份证号：{{patient.id_card_no}}</div>
+
+          <div>性别：{{patient.gender == 1 ? '男': '女'}}</div>
             <div>年龄：{{patient.age}}  岁</div>
             <div v-if="order.settle_type == 1">收费日期：{{getTimes(order.settle_accounts_date)}}</div>
             <div v-if="order.settle_type == 2">收费日期：{{getTimes(order.settle_start_time)}} 至 {{getTimes(order.settle_end_time)}}</div>
             <div class="tableBottomOne">制表人：{{admin.user_name}}</div>
             <div class="tableBottomOne">制表日期：{{ getNowTime()}}</div>
             <div class="tableBottomOne">总费用：{{order.medfee_sumamt}}元</div>
+          <div class="tableBottomOne">基金总额：{{order.fund_pay_sumamt}}元</div>
+          <div class="tableBottomOne">统筹支付：{{order.hifp_pay}}元</div>
+          <div class="tableBottomOne">医疗救助：{{order.maf_pay}}元</div>
+          <div class="tableBottomOne">医保报销：{{order.fund_pay_sumamt}}元</div>
+          <div class="tableBottomOne">个人支付：{{order.psn_cash_pay}}元</div>
+
         </div>
         </div>
     </div>
         let ss = new Date().getSeconds() < 10 ? '0' + new Date().getSeconds()
           :
           new Date().getSeconds()
-        dateTime = yy + '-' + mm + '-' + dd + ' ' + hh + ':' + mf + ':' + ss
+        dateTime = yy + '-' + mm + '-' + dd
         return dateTime
       },
       getTimes(time) {
         return uParseTime(time, '{y}-{m}-{d}')
       },
       getPage(){
-        if(this.list.length <= 13){
+        if(this.list.length <= 15){
             this.page = 1
             this.pageArr.push(this.list.length)
-        }else if(this.list.length > 13){
-            this.page = parseInt(this.list.length / 13)
-            let num = this.list.length % 13
+        }else if(this.list.length > 15){
+            this.page = parseInt(this.list.length / 15)
+            let num = this.list.length % 15
             for (var i=0;i<this.page;i++){
-                this.pageArr.push(13)
+                this.pageArr.push(15)
             }
             if(num != 0){
                 this.pageArr.push(num)
     padding: 0 5px;
 }
 .tableBottom{
-    font-size: 16px;
+    font-size: 12px;
     display: flex;
     margin-top: 20px;
 }
 .tableBottomOne{
-    margin-right: 40px;
+    margin-right: 20px;
 }
 </style>

src/xt_pages/outpatientCharges/statementTemplate/printFive.vue

             <div>费用总计：{{info.medfee_sumamt}}</div>
             <div>统筹支付：{{info.fund_pay_sumamt}}</div>
             <div>账户支付：{{info.acct_pay}}</div>
-            <div>个人现金支付：{{info.cash_payamt}}</div>
+            <div>个人现金支付：{{info.new_order.psn_cash_pay}}</div>
             <div>其他支付：{{info.oth_pay}}</div>
             <div>减免金额：</div>
           </td>