Browse Source

提交代码

陈少旭 1 year ago
parent
commit
884bc4084e

+ 2 - 2
src/xt_pages/outpatientCharges/listPrint.vue View File

@@ -14,11 +14,11 @@
14 14
     </template>
15 15
 
16 16
     <div class='dialysisPage' style="padding-top:40px;">
17
-      <printOne v-if=" org_id != 10106&&org_id != 10215&&org_id != 10265 && org_id!=9675 && org_id!=10485 && org_id!=0 " :list="list" :patient="patient" :order="order" :admin="admin"></printOne>
17
+      <printOne v-if=" org_id != 10106&&org_id != 10215&&org_id != 10265 && org_id!=9675 && org_id!=10485  " :list="list" :patient="patient" :order="order" :admin="admin"></printOne>
18 18
       <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>
19 19
       <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>
20 20
 <!--      <list-print-two v-if="org_id == 10215 || org_id==9675" :list="list" :patient="patient" :order="order" :admin="admin"></list-print-two>-->
21
-     <list-print-three v-if="org_id == 10215 || org_id==9675 || org_id == 0 || org_id ==10485" :list="list" :patient="patient" :order="order" :admin="admin"></list-print-three>
21
+     <list-print-three v-if="org_id == 10215 || org_id==9675  || org_id ==10485" :list="list" :patient="patient" :order="order" :admin="admin"></list-print-three>
22 22
       <print-two10265  v-if="org_id == 10265  " :list="list" :patient="patient" :order="order" :admin="admin" :hospital_record="hospital_record"></print-two10265>
23 23
     </div>
24 24
   </div>

+ 1 - 1
src/xt_pages/outpatientCharges/listTemplate/printOne.vue View File

@@ -26,7 +26,7 @@
26 26
                 <td style="width:6%">数量</td>
27 27
                 <td style="width:10%">金额(元)</td>
28 28
             </tr>
29
-            <tr v-for="item in list.slice(index * 13,(index * 13) + pageArr[index])">
29
+            <tr v-for="item in list.slice(index * 15,(index * 15) + pageArr[index])">
30 30
                 <td style="width:15%">{{item.p_time}}</td>
31 31
                 <td style="width:10%">{{item.med_chrgitm_type}}</td>
32 32
                 <td style="width:10%">{{item.code}}</td>

File diff suppressed because it is too large
+ 510 - 592
src/xt_pages/outpatientCharges/outpatientChargesManagement.vue


+ 1 - 1
src/xt_pages/outpatientCharges/settlementTemplate/printOne.vue View File

@@ -1,6 +1,6 @@
1 1
 <template>
2 2
     <div id="prescription-print" class="print_page_main_content">
3
-        <div class="title">广东省社会医疗保障基金结算清单</div>
3
+        <div class="title" v-if="">广东省社会医疗保障基金结算清单</div>
4 4
         <div style="text-align:right;">清单流水号 <div style="width:120px;" class="under_line">{{ info.mdtrt_id }}</div></div>
5 5
         <div class="row">
6 6
             <div>定点医疗机构名称<div style="width:120px;" class="under_line">{{info.fixmedins_name}}</div></div>

+ 4 - 0
src/xt_pages/outpatientCharges/statementPrint.vue View File

@@ -486,6 +486,8 @@ export default {
486 486
           obj['count'] = details[a].cnt
487 487
           obj['price'] = parseFloat(details[a].pric)
488 488
           obj['total_price'] = parseFloat(details[a].det_item_fee_sumamt)
489
+          obj['psn_pay'] = (details[a].selfpay_prop * details[a].det_item_fee_sumamt).toFixed(2)
490
+
489 491
           list.push(obj)
490 492
         }
491 493
 
@@ -497,6 +499,7 @@ export default {
497 499
           obj['spec'] = ""
498 500
           obj['count'] = details[a].cnt
499 501
           obj['price'] = parseFloat(details[a].pric)
502
+          obj['psn_pay'] = (details[a].selfpay_prop * details[a].det_item_fee_sumamt).toFixed(2)
500 503
           obj['total_price'] = parseFloat(details[a].det_item_fee_sumamt)
501 504
           list.push(obj)
502 505
         }
@@ -509,6 +512,7 @@ export default {
509 512
           obj['spec'] = details[a].project.good_info.specification_name
510 513
           obj['count'] = details[a].cnt
511 514
           obj['price'] = parseFloat(details[a].pric)
515
+          obj['psn_pay'] = (details[a].selfpay_prop * details[a].det_item_fee_sumamt).toFixed(2)
512 516
           obj['total_price'] = parseFloat(details[a].det_item_fee_sumamt)
513 517
           list.push(obj)
514 518
         }

+ 3 - 0
src/xt_pages/outpatientCharges/statementTemplate/printeEleven.vue View File

@@ -65,6 +65,8 @@
65 65
           <td width="8.1%">单价</td>
66 66
           <td width="8.1%">金额</td>
67 67
           <td width="10.1%">医保标识</td>
68
+          <td width="10.1%">自付金额</td>
69
+
68 70
         </tr>
69 71
         <!-- width="72.6%"  16.82%  16.1-->
70 72
         <tr>
@@ -85,6 +87,7 @@
85 87
                 <div style="width: 8.1%;padding: 5px;text-align: center;">{{subItem.price}}</div>
86 88
                 <div style="width: 8.1%;padding: 5px;text-align: center;">{{subItem.total_price}}</div>
87 89
                 <div style="width: 10.1%;padding: 5px;"></div>
90
+                <div style="width: 8.1%;padding: 5px;text-align: center;">{{subItem.psn_pay}}</div>
88 91
               </div>
89 92
             </div>
90 93
           </td>

+ 2 - 2
src/xt_pages/outpatientCharges/summary.vue View File

@@ -124,7 +124,7 @@
124 124
           <!--          </el-button-->
125 125
           <!--          >-->
126 126
 
127
-<!--           <el-button size="small" type="primary" @click="export_detail_three">报表下载12</el-button>-->
127
+           <el-button size="small" type="primary" @click="export_detail_three">报表下载12</el-button>
128 128
           <!-- <el-button size="small" type="primary" @click="export_detail_four">报表下载3</el-button>-->
129 129
           <!-- <el-button size="small" type="primary" @click="export_detail_five">报表下载3</el-button>-->
130 130
            <el-button size="small" type="primary" @click="export_detail_six">报表下载9</el-button>
@@ -1280,7 +1280,7 @@ export default {
1280 1280
                 name: order.patient.name,
1281 1281
                 id_card_no: order.patient.id_card_no,
1282 1282
                 year: "2023",
1283
-                month: "07",
1283
+                month: "08",
1284 1284
                 code: data[b].code,
1285 1285
                 pric: data[b].total ,
1286 1286
                 item_name: data[b].name,

+ 8 - 8
src/xt_pages/outpatientDoctorStation/doctorDesk.vue View File

@@ -1774,7 +1774,7 @@ export default {
1774 1774
               // }
1775 1775
 
1776 1776
               var preTime = nowTime
1777
-              if ( this.org_id != 0 && this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485 && this.$store.getters.xt_user.org.id != 10191){
1777
+              if ( this.org_id != 0 && this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485 && this.$store.getters.xt_user.org.id != 10191  && this.$store.getters.xt_user.org.id != 10375){
1778 1778
                 if (prescription.pre_time == 0) {
1779 1779
                   if (this.schedule.schedule_type == 1) {
1780 1780
                     if(this.org_id == 10028){
@@ -1936,7 +1936,7 @@ export default {
1936 1936
                   tempProject.push(obj)
1937 1937
                 }
1938 1938
                 var preTime = nowTime
1939
-                if (this.org_id != 0 && this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485 && this.$store.getters.xt_user.org.id != 10191) {
1939
+                if (this.org_id != 0 && this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485 && this.$store.getters.xt_user.org.id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
1940 1940
                   if (this.schedule.schedule_type == 1) {
1941 1941
                     if(this.org_id == 10028){
1942 1942
                       preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '6:30'
@@ -2252,7 +2252,7 @@ export default {
2252 2252
                     // }
2253 2253
 
2254 2254
                     var preTime = nowTime
2255
-                    if (this.org_id != 0 && this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485 && this.$store.getters.xt_user.org.id != 10191 ) {
2255
+                    if (this.org_id != 0 && this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485 && this.$store.getters.xt_user.org.id != 10191 && this.$store.getters.xt_user.org.id != 10375 ) {
2256 2256
                       if (prescription.pre_time == 0) {
2257 2257
                         if (this.schedule.schedule_type == 1) {
2258 2258
                           if(this.org_id == 10028){
@@ -2416,7 +2416,7 @@ export default {
2416 2416
 
2417 2417
                       var preTime = nowTime
2418 2418
                       // var preTime = ''
2419
-                      if(this.org_id != 0 && this.org_id !=  9919 && this.org_id !=  10485 && this.org_id !=  10191) {
2419
+                      if(this.org_id != 0 && this.org_id !=  9919 && this.org_id !=  10485 && this.org_id !=  10191 && this.$store.getters.xt_user.org.id != 10375) {
2420 2420
                         if (this.schedule.schedule_type == 1) {
2421 2421
                           if(this.org_id == 10028){
2422 2422
                             preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '6:30'
@@ -3928,7 +3928,7 @@ export default {
3928 3928
 
3929 3929
                     var preTime = nowTime
3930 3930
 
3931
-                    if(this.org_id != 0 && this.org_id != 9919 && this.org_id  != 10485 && this.org_id  != 10191 ) {
3931
+                    if(this.org_id != 0 && this.org_id != 9919 && this.org_id  != 10485 && this.org_id  != 10191 && this.$store.getters.xt_user.org.id != 10375 ) {
3932 3932
                       if (prescription.pre_time == 0) {
3933 3933
                         if (this.schedule.schedule_type == 1) {
3934 3934
                           if(this.org_id == 10028){
@@ -4088,7 +4088,7 @@ export default {
4088 4088
 
4089 4089
                       // var preTime = nowTime
4090 4090
                       var preTime = nowTime
4091
-                      if( this.org_id != 0 && this.org_id != 9919 &&  this.org_id != 10485 &&  this.org_id != 10191) {
4091
+                      if( this.org_id != 0 && this.org_id != 9919 &&  this.org_id != 10485 &&  this.org_id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
4092 4092
                         if (this.schedule.schedule_type == 1) {
4093 4093
                           if(this.org_id == 10028){
4094 4094
                             preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '6:30'
@@ -4577,7 +4577,7 @@ export default {
4577 4577
 
4578 4578
                     var preTime = nowTime
4579 4579
 
4580
-                    if(this.org_id != 0 && this.org_id != 9919 && this.org_id != 10485 && this.org_id != 10191) {
4580
+                    if(this.org_id != 0 && this.org_id != 9919 && this.org_id != 10485 && this.org_id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
4581 4581
                       if (prescription.pre_time == 0) {
4582 4582
                         // preTime = nowTime
4583 4583
                         if (this.schedule.schedule_type == 1) {
@@ -4740,7 +4740,7 @@ export default {
4740 4740
 
4741 4741
                       var preTime = nowTime
4742 4742
                       // var preTime = ''
4743
-                      if(this.org_id != 0 && this.org_id != 9919  && this.org_id != 10485 && this.org_id != 10191 ) {
4743
+                      if(this.org_id != 0 && this.org_id != 9919  && this.org_id != 10485 && this.org_id != 10191  && this.$store.getters.xt_user.org.id != 10375) {
4744 4744
                         if (this.schedule.schedule_type == 1) {
4745 4745
                           if(this.org_id == 10028){
4746 4746
                             preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '6:30'