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/statementPrint.vue

@@ -743,7 +743,7 @@ export default {
         }
         if (
           this.org_id == 10138 ||
-          this.org_id == 10278 ||  this.org_id == 10610 || this.org_id == 10537 || this.org_id == 0
+          this.org_id == 10278 ||  this.org_id == 10610 || this.org_id == 10537
         ) {
           getPrivateExpenses(params).then((response) => {
             if (response.data.state == 0) {
@@ -893,6 +893,9 @@ export default {
               // that.info["department"] = response.data.data.department;
               // that.info["health_card_no"] = response.data.data.health_card_no;
 
+
+
+
               that.info['bed_cost_total'] = response.data.data.bedCostTotal
               that.info['bed_cost_self_total'] =
                 response.data.data.bedCostSelfTotal
@@ -1201,6 +1204,9 @@ export default {
               that.info['material_cost_part_self_total'] =
                 response.data.data.materialCostPartSelfTotal
 
+
+
+
               that.info['western_medicine_cost_total'] =
                 response.data.data.westernMedicineCostTotal
               that.info['western_medicine_cost_self_total'] =
@@ -1590,6 +1596,30 @@ export default {
                   that.info['department'] = response.data.data.department
                   that.info['health_card_no'] = response.data.data.health_card_no
 
+
+                  if(response.data.data.zcCostTotal){
+                    that.info['zc_cost_total'] =
+                      response.data.data.zcCostTotal
+                  }else{
+                    that.info['zc_cost_total'] = 0
+                  }
+
+                  if(response.data.data.zcCostSelfTotal){
+                    that.info['zc_cost_self_total'] =
+                      response.data.data.zcCostSelfTotal
+                  }else{
+                    that.info['zc_cost_self_total'] = 0
+                  }
+
+
+                  if(response.data.data.zcCostPartSelfTotal){
+                    that.info['zc_cost_part_self_total'] =
+                      response.data.data.zcCostPartSelfTotal
+                  }else{
+                    that.info['zc_cost_part_self_total'] = 0
+                  }
+
+
                   that.info['bed_cost_total'] = response.data.data.bedCostTotal
                   that.info['bed_cost_self_total'] =
                     response.data.data.bedCostSelfTotal
@@ -1648,6 +1678,27 @@ export default {
                     response.data.data.treatCostSelfTotal
                   that.info['treat_cost_part_self_total'] =
                     response.data.data.treatCostPartSelfTotal
+
+                  if(response.data.data.zcCostTotal){
+                    that.info['zc_cost_total'] =
+                      response.data.data.zcCostTotal
+                  }else{
+                    that.info['zc_cost_total'] = 0
+                  }
+                  if(response.data.data.zcCostSelfTotal){
+                    that.info['zc_cost_self_total'] =
+                      response.data.data.zcCostSelfTotal
+                  }else{
+                    that.info['zc_cost_self_total'] = 0
+                  }
+                  if(response.data.data.zcCostPartSelfTotal){
+                    that.info['zc_cost_part_self_total'] =
+                      response.data.data.zcCostPartSelfTotal
+                  }else{
+                    that.info['zc_cost_part_self_total'] = 0
+                  }
+
+
                   that.info['date'] = response.data.data.date
                   that.info['number'] = response.data.data.number
                   that.info['order_infos'] = response.data.data.order_infos
@@ -1698,6 +1749,8 @@ export default {
                     response.data.data.otherSelfTotal
                   that.info['dia_config'] = response.data.data.dia_config
 
+
+
                   //org_id 10485,此代码为阳春恒健血液透析中心结算单模版数据处理逻辑
                   var list = []
                   //获取所有项目类型进行去重
@@ -1855,12 +1908,7 @@ export default {
                   }
                   that.info['funds'] = funds
 
-                  that.info['zc_cost_total'] =
-                    response.data.data.zcCostTotal
-                  that.info['zc_cost_self_total'] =
-                    response.data.data.zcCostSelfTotal
-                  that.info['zc_cost_part_self_total'] =
-                    response.data.data.zcCostPartSelfTotal
+
 
                 }
               })

src/xt_pages/outpatientCharges/statementTemplate/printOne.vue

@@ -260,7 +260,7 @@
           parseFloat(info.operation_cost_self_total) + parseFloat(info.other_cost_self_total) +
           parseFloat(info.material_cost_self_total) + parseFloat(info.western_medicine_cost_self_total) +
           parseFloat(info.chinese_traditional_medicine_cost_self_total) + parseFloat(info.check_cost_self_total) +
-          parseFloat(info.laboratory_cost_self_total) + parseFloat(info.treat_cost_self_total) + parseFloat(info.zc_cost_total)).toFixed(2)}}
+          parseFloat(info.laboratory_cost_self_total) + parseFloat(info.treat_cost_self_total) + parseFloat(info.zc_cost_self_total)).toFixed(2)}}
         </td>
         <td colspan="2" style="text-align:right;padding-right:10px;">{{(parseFloat(info.bed_cost_part_self_total) +
           parseFloat(info.operation_cost_part_self_total) + parseFloat(info.other_cost_part_self_total) +