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

src/xt_pages/hospitalStation/statementPrint.vue

@@ -17,13 +17,13 @@
       <private-charge-print :info="info" v-if="this.paramsObj.balance_accounts_type == 2"></private-charge-print>
       <printOne :info="info" v-else></printOne>
     </div>
-    <div class='dialysisPage' style="padding-top:40px;" v-if="this.$store.getters.xt_user.org_id == 10265">
+    <div class='dialysisPage' style="padding-top:40px;" v-if="this.$store.getters.xt_user.org_id == 0">
 <!--      <private-charge-print :info="info" v-if="this.paramsObj.balance_accounts_type == 2"></private-charge-print>-->
 <!--      <printOne :info="info" v-else></printOne>-->
 <!--      <print-one :info="info" ></print-one>-->
       <hospital-settle-print :info="info" :list="list"></hospital-settle-print>
     </div>
-    <div class='dialysisPage' style="padding-top:40px;" v-if="this.$store.getters.xt_user.org_id != 10215 && this.paramsObj.balance_accounts_type == 2 && this.$store.getters.xt_user.org_id != 10265">
+    <div class='dialysisPage' style="padding-top:40px;" v-if="this.$store.getters.xt_user.org_id != 10215 && this.paramsObj.balance_accounts_type == 2 && this.$store.getters.xt_user.org_id != 10265 && this.$store.getters.xt_user.org_id != 0">
     <private-charge-print :info="info" ></private-charge-print>
     </div>
 

src/xt_pages/hospitalStation/summary.vue

@@ -1049,7 +1049,7 @@ export default {
         this.statementVisible = true;
         let obj = {
           order_id: row.id,
-          balance_accounts_type: row.his_hospital_patient.balance_accounts_type,
+          balance_accounts_type: 2,
           start_time: row.settle_start_time,
           end_time: row.settle_end_time,
         };
@@ -1341,7 +1341,7 @@ export default {
       //     row.id
       //   );
       // }
-      
+
     },
     getTime(value, temp) {
       if (value != undefined) {

src/xt_pages/outpatientCharges/components/chargeDialog.vue

@@ -447,6 +447,10 @@
           this.$message.error('折扣金额不能超过费用总额')
           return
         }
+        console.log(parseInt(this.form.total))
+        console.log(parseInt(val))
+        console.log(parseInt(this.form.discount_price))
+
         this.form.reality_price = parseInt(this.form.total) - parseInt(val) - parseInt(this.form.preferential_price)
       },
       changePreferentialPrice(val){
@@ -454,6 +458,10 @@
           this.$message.error('优惠金额不能超过费用总额')
           return
         }
+        console.log(parseInt(this.form.total))
+        console.log(parseInt(val))
+        console.log(parseInt(this.form.discount_price))
+
         this.form.reality_price = parseInt(this.form.total) - parseInt(val) - parseInt(this.form.discount_price)
       }
     },

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -77,13 +77,14 @@
             org_id != 10610 && org_id !=10537 && org_id !=10697 &&
             org_id != 10278 && org_id != 10387 && org_id != 10191 &&
             org_id != 10210 &&org_id != 10485 &&org_id != 10480 &&
-            org_id != 10510 &&org_id != 10088 && org_id != 10721 &&org_id != 10633 &&org_id != 10731 &&org_id != 0 && this.paramsObj.balance_accounts_type == 1">
+            org_id != 10510 &&org_id != 10088 && org_id != 10721 &&
+            org_id != 10633 &&org_id != 10731 && org_id != 10726 && org_id != 0 && this.paramsObj.balance_accounts_type == 1">
       </printOne>
       <privateChargePrint :info="info" v-if="org_id != 9990 &&
             org_id != 10138 && org_id != 9504 &&  org_id != 10028 && org_id !=10697 &&
             org_id != 10278 && org_id != 10610 && org_id !=10537 && org_id != 10387 &&
             org_id != 10191 &&org_id != 10210 &&org_id != 10485  &&org_id != 10480 &&
-            org_id != 10510 &&org_id != 10633 && org_id != 10721   &&org_id != 0  && this.paramsObj.balance_accounts_type == 2">
+            org_id != 10510 &&org_id != 10633 && org_id != 10721 && org_id != 10726 &&org_id != 0  && this.paramsObj.balance_accounts_type == 2">
       </privateChargePrint>
     </div>
   </div>
@@ -1026,6 +1027,11 @@ export default {
                   R_list.push(listarr[i])
                 }
               }
+
+
+
+
+              that.info['Z_list'] = listarr
               console.log('L_list111',L_list)
               console.log('R_list222',R_list)
 

src/xt_pages/outpatientCharges/statementTemplate/printeighteen.vue

@@ -10,66 +10,55 @@
         <table class="statementTable" border="1">
           <tr>
             <td width="100">机构编码</td>
-            <td width="150">{{info.fixmedins_code}}</td>
+            <td width="150">{{"H36102502336"}}</td>
             <td width="120">医保结算级别</td>
             <td width="150" colspan="2">
-              <span  v-if="info.hosp_lv == '1'">三级特等</span>
-              <span  v-else-if="info.hosp_lv == '2'">三级甲等</span>
-              <span v-else-if="info.hosp_lv == '3'">三级乙等</span>
-              <span v-else-if="info.hosp_lv == '4'">三级丙等</span>
-              <span v-else-if="info.hosp_lv == '5'">二级甲等</span>
-              <span v-else-if="info.hosp_lv == '6'">二级乙等</span>
-              <span v-else-if="info.hosp_lv == '7'">二级丙等</span>
-              <span  v-else-if="info.hosp_lv == '8'">一级甲等</span>
-              <span v-else-if="info.hosp_lv == '9'">一级乙等</span>
-              <span v-else-if="info.hosp_lv == '10'">一级丙等</span>
-              <span  v-else-if="info.hosp_lv == '11'">无等级</span>
-              <span  v-else></span>
+              <span>二级</span>
             </td>
             <td width="100">机构名称</td>
-            <td colspan="4">{{info.fixmedins_name}}</td>
+            <td colspan="4">{{'乐安祥康血液透析中心'}}</td>
           </tr>
           <tr>
             <td width="100">姓名</td>
-            <td width="150">{{info.psn_name}}</td>
+            <td width="150">{{info.new_order.psn_name}}</td>
             <td width="120">性别</td>
-            <td width="50" v-if="info.gend == '1'">男</td>
-            <td width="50" v-if="info.gend == '2'">女</td>
+            <td width="50" v-if="info.new_order.gend == '1'">男</td>
+            <td width="50" v-if="info.new_order.gend == '2'">女</td>
             <td width="100">出生日期</td>
-            <td width="100">{{getBirth(info.certno)}}</td>
+            <td width="100">{{getBirth(info.new_order.certno)}}</td>
             <td width="100">人员类别</td>
-            <td  width="150" v-if="info.psn_type == '11'">在职</td>
-            <td  width="150" v-else-if="info.psn_type == '1101'">职工在职</td>
-            <td  width="150" v-else-if="info.psn_type == '1102'">公务员在职</td>
-            <td  width="150" v-else-if="info.psn_type == '1103'">灵活就业人员在职</td>
-            <td  width="150" v-else-if="info.psn_type == '1160'">地方其他扩展人员</td>
-
-            <td  width="150" v-else-if="info.psn_type == '12'">退休人员</td>
-            <td  width="150" v-else-if="info.psn_type == '1201'">职工退休</td>
-            <td  width="150" v-else-if="info.psn_type == '1202'">公务员退休</td>
-            <td  width="150" v-else-if="info.psn_type == '1203'">灵活就业人员退休</td>
-            <td  width="150" v-else-if="info.psn_type == '1260'">地方其他扩展人员</td>
-
-            <td  width="150" v-else-if="info.psn_type == '13'">离休</td>
-            <td  width="150" v-else-if="info.psn_type == '1300'">离休人员</td>
-            <td  width="150" v-else-if="info.psn_type == '1360'">地方其他扩展人员</td>
-
-            <td  width="150" v-else-if="info.psn_type == '14'">居民(未成年)</td>
-            <td  width="150" v-else-if="info.psn_type == '1401'">新生儿</td>
-            <td  width="150" v-else-if="info.psn_type == '1402'">学龄前儿童</td>
-            <td  width="150" v-else-if="info.psn_type == '1403'">中小学生</td>
-            <td  width="150" v-else-if="info.psn_type == '1404'">大学生</td>
-            <td  width="150" v-else-if="info.psn_type == '1405'">未成年(未入学)</td>
-
-            <td  width="150" v-else-if="info.psn_type == '15'">居民(成年)</td>
-            <td  width="150" v-else-if="info.psn_type == '1501'">普通居民(成年)</td>
-            <td  width="150" v-else-if="info.psn_type == '1560'">地方其他扩展身份</td>
-
-            <td  width="150" v-else-if="info.psn_type == '16'">居民(老年)</td>
+            <td  width="150" v-if="info.new_order.psn_type == '11'">在职</td>
+            <td  width="150" v-else-if="info.new_order.psn_type == '1101'">职工在职</td>
+            <td  width="150" v-else-if="info.new_order.psn_type == '1102'">公务员在职</td>
+            <td  width="150" v-else-if="info.new_order.psn_type == '1103'">灵活就业人员在职</td>
+            <td  width="150" v-else-if="info.new_order.psn_type == '1160'">地方其他扩展人员</td>
+
+            <td  width="150" v-else-if="info.new_order.psn_type == '12'">退休人员</td>
+            <td  width="150" v-else-if="info.new_order.psn_type == '1201'">职工退休</td>
+            <td  width="150" v-else-if="info.new_order.psn_type == '1202'">公务员退休</td>
+            <td  width="150" v-else-if="info.new_order.psn_type == '1203'">灵活就业人员退休</td>
+            <td  width="150" v-else-if="info.new_order.psn_type == '1260'">地方其他扩展人员</td>
+
+            <td  width="150" v-else-if="info.new_order.psn_type == '13'">离休</td>
+            <td  width="150" v-else-if="info.new_order.psn_type == '1300'">离休人员</td>
+            <td  width="150" v-else-if="info.new_order.psn_type == '1360'">地方其他扩展人员</td>
+
+            <td  width="150" v-else-if="info.new_order.psn_type == '14'">居民(未成年)</td>
+            <td  width="150" v-else-if="info.new_order.psn_type == '1401'">新生儿</td>
+            <td  width="150" v-else-if="info.new_order.psn_type == '1402'">学龄前儿童</td>
+            <td  width="150" v-else-if="info.new_order.psn_type == '1403'">中小学生</td>
+            <td  width="150" v-else-if="info.new_order.psn_type == '1404'">大学生</td>
+            <td  width="150" v-else-if="info.new_order.psn_type == '1405'">未成年(未入学)</td>
+
+            <td  width="150" v-else-if="info.new_order.psn_type == '15'">居民(成年)</td>
+            <td  width="150" v-else-if="info.new_order.psn_type == '1501'">普通居民(成年)</td>
+            <td  width="150" v-else-if="info.new_order.psn_type == '1560'">地方其他扩展身份</td>
+
+            <td  width="150" v-else-if="info.new_order.psn_type == '16'">居民(老年)</td>
             <td width="150" v-else></td>
             <td width="120">公务员标志</td>
             <td width="80">否</td>
-            
+
           </tr>
           <tr>
             <td>单位名称</td>
@@ -77,41 +66,50 @@
             <td width="100">联系电话</td>
             <td width="100">{{info.patient.phone}}</td>
             <td width="150">人员身份类别</td>
-            <td colspan="2"></td>
+            <td colspan="2" v-if="info.psn_idet_type == '5'">公务员</td>
+            <td colspan="2" v-if="info.psn_idet_type == '21'">优抚人员</td>
+            <td colspan="2" v-if="info.psn_idet_type == '22'">医疗照顾人员</td>
+            <td colspan="2" v-if="info.psn_idet_type == '23'">医疗救助人员</td>
+            <td colspan="2" v-if="info.psn_idet_type == '2303'">低保救助对象</td>
+            <td colspan="2" v-else></td>
+
+
           </tr>
           <tr>
             <td width="100">结算ID</td>
-            <td width="150"></td>
+            <td width="150">{{info.new_order.setl_id}}</td>
             <td width="120">住院号</td>
-            <td width="150" colspan="2">{{info.number}}</td>
+            <td width="150" colspan="2">{{info.new_order.mdtrt_id}}</td>
             <td width="100">医疗类别</td>
             <td width="150">
-              <span v-if="info.med_type == '11'">普通门诊</span>
-              <span v-if="info.med_type == '12'">门诊挂号</span>
-              <span v-if="info.med_type == '13'">急诊</span>
-              <span v-if="info.med_type == '14'">门诊特殊病</span>
-              <span v-if="info.med_type == '15'">门诊统筹</span>
-              <span v-if="info.med_type == '16'">门诊慢性病</span>
-              <span v-if="info.med_type == '21'">普通住院</span>
+              <span v-if="info.new_order.med_type == '11'">普通门诊</span>
+              <span v-if="info.new_order.med_type == '12'">门诊挂号</span>
+              <span v-if="info.new_order.med_type == '13'">急诊</span>
+              <span v-if="info.new_order.med_type == '14'">门诊特殊病</span>
+              <span v-if="info.new_order.med_type == '15'">门诊统筹</span>
+              <span v-if="info.new_order.med_type == '16'">门诊慢性病</span>
+              <span v-if="info.new_order.med_type == '21'">普通住院</span>
+              <span v-if="info.new_order.med_type == '990101'">单病种门诊</span>
+
             </td>
             <td width="150">住院天数</td>
-            <td colspan="2">{{getDay(info.begndate,info.enddate)}}</td>
+            <td colspan="2">{{1}}</td>
           </tr>
           <tr>
             <td>身份证号</td>
-            <td colspan="4">{{info.certno}}</td>
+            <td colspan="4">{{info.new_order.certno}}</td>
             <td width="100">险种</td>
             <td width="100">
-              <span v-if="info.insutype == '310'">职工基本医疗保险</span>
-              <span v-if="info.insutype == '320'">公务员医疗补助</span>
-              <span v-if="info.insutype == '330'">大额医疗费用补助</span>
-              <span v-if="info.insutype == '340'">离休人员医疗保障</span>
-              <span v-if="info.insutype == '390'">城乡居民基本医疗保险</span>
-              <span v-if="info.insutype == '392'">城乡居民大病医疗保险</span>
-              <span v-if="info.insutype == '510'">生育保险</span>
+              <span v-if="info.new_order.insutype == '310'">职工基本医疗保险</span>
+              <span v-if="info.new_order.insutype == '320'">公务员医疗补助</span>
+              <span v-if="info.new_order.insutype == '330'">大额医疗费用补助</span>
+              <span v-if="info.new_order.insutype == '340'">离休人员医疗保障</span>
+              <span v-if="info.new_order.insutype == '390'">城乡居民基本医疗保险</span>
+              <span v-if="info.new_order.insutype == '392'">城乡居民大病医疗保险</span>
+              <span v-if="info.new_order.insutype == '510'">生育保险</span>
             </td>
             <td width="150">参保医保区划</td>
-            <td colspan="2"></td>
+            <td colspan="2">{{info.his.insuplc_admdvs}}</td>
           </tr>
           <tr>
             <td width="100">科别</td>
@@ -119,17 +117,20 @@
             <td width="120">床号</td>
             <td width="150" colspan="2"></td>
             <td width="100">入院日期</td>
-            <td width="150">{{info.begndate ? info.begndate.split(' ')[0] : ''}}</td>
+            <td width="150">{{info.new_order.setl_time ? info.new_order.setl_time.split(' ')[0] : ''}}</td>
             <td width="150">出院日期</td>
-            <td colspan="2">{{info.enddate ? info.enddate.split(' ')[0] : ''}}</td>
+            <td colspan="2">{{info.new_order.setl_time ? info.new_order.setl_time.split(' ')[0] : ''}}</td>
           </tr>
           <tr>
             <td width="100">入院主要诊断</td>
-            <td colspan="2">{{info.dise_name}}</td>
+            <td colspan="2" v-if="info.new_order.med_type == '990101'">{{"尿毒症(免费透析)"}}</td>
+            <td colspan="2" v-if="info.new_order.med_type == '14'">{{"慢性肾脏病5期"}}</td>
+
             <td width="150" colspan="2">出院主要诊断</td>
-            <td colspan="2">{{info.dise_name}}</td>
+            <td colspan="2" v-if="info.new_order.med_type == '990101'">{{"尿毒症(免费透析)"}}</td>
+            <td colspan="2" v-if="info.new_order.med_type == '14'">{{"慢性肾脏病5期"}}</td>
             <td width="150">结算时间</td>
-            <td colspan="2">{{info.setl_time ? info.setl_time.split(' ')[0] : ''}}</td>
+            <td colspan="2">{{info.new_order.setl_time}}</td>
           </tr>
           <tr>
             <td width="100">项目名称</td>
@@ -137,65 +138,102 @@
             <td width="200" colspan="2">符合政策范围</td>
             <td width="250" colspan="2">先行自付 </td>
             <td width="150">全自费</td>
-            <td colspan="2">超限价</td> 
+            <td colspan="2">超限价</td>
           </tr>
-          <tr v-if="info.treat_cost_total > 0">
+          <tr v-if="info.new_order.treat_cost_total > 0">
             <td width="100">治疗费</td>
-            <td width="200" colspan="2">{{info.treat_cost_total}}</td>
-            <td width="200" colspan="2">{{info.treatInscpTotal}}</td>
-            <td width="250" colspan="2">{{info.treat_cost_part_self_total}}</td>
-            <td width="150">{{info.treatSelfTotal}}</td>
-            <td colspan="2">{{info.treat_cost_self_total}}</td>
-          </tr>
-          <tr>
-            <td width="100">护理费</td>
-            <td width="200" colspan="2"></td>
-            <td width="200" colspan="2"></td>
-            <td width="250" colspan="2"></td>
-            <td width="150"></td>
-            <td colspan="2"></td>
+            <td width="200" colspan="2">{{info.new_order.treat_cost_total}}</td>
+            <td width="200" colspan="2">{{info.new_order.treatInscpTotal}}</td>
+            <td width="250" colspan="2">{{info.new_order.treat_cost_part_self_total}}</td>
+            <td width="150">{{info.new_order.treatSelfTotal}}</td>
+            <td colspan="2">{{info.new_order.treat_cost_self_total}}</td>
           </tr>
-          <tr v-if="info.material_cost_total > 0">
+          <tr v-if="info.new_order.material_cost_total > 0">
             <td width="100">卫生材料费</td>
-            <td width="200" colspan="2">{{info.material_cost_total}}</td>
-            <td width="200" colspan="2">{{info.materialInscpTotal}}</td>
-            <td width="250" colspan="2">{{info.material_cost_part_self_total}}</td>
-            <td width="150">{{info.materialSelfTotal}}</td>
-            <td colspan="2">{{info.material_cost_self_total}}</td>
+            <td width="200" colspan="2">{{info.new_order.material_cost_total}}</td>
+            <td width="200" colspan="2">{{info.new_order.materialInscpTotal}}</td>
+            <td width="250" colspan="2">{{info.new_order.material_cost_part_self_total}}</td>
+            <td width="150">{{info.new_order.materialSelfTotal}}</td>
+            <td colspan="2">{{info.new_order.material_cost_self_total}}</td>
           </tr>
-          <tr v-if="info.western_medicine_cost_total > 0">
+          <tr v-if="info.new_order.western_medicine_cost_total > 0">
             <td width="100">西药费</td>
-            <td width="200" colspan="2">{{info.western_medicine_cost_total}}</td>
-            <td width="200" colspan="2">{{info.westernMedicineInscpTotal}}</td>
-            <td width="250" colspan="2">{{info.western_medicine_cost_part_self_total}}</td>
-            <td width="150">{{info.westernMedicineSelfTotal}}</td>
-            <td colspan="2">{{info.western_medicine_cost_self_total}}</td>
+            <td width="200" colspan="2">{{info.new_order.western_medicine_cost_total}}</td>
+            <td width="200" colspan="2">{{info.new_order.westernMedicineInscpTotal}}</td>
+            <td width="250" colspan="2">{{info.new_order.western_medicine_cost_part_self_total}}</td>
+            <td width="150">{{info.new_order.westernMedicineSelfTotal}}</td>
+            <td colspan="2">{{info.new_order.western_medicine_cost_self_total}}</td>
+          </tr>
+
+
+          <tr v-if="info.new_order.chinese_traditional_medicine_cost_total > 0">
+            <td width="100">中成药</td>
+            <td width="200" colspan="2">{{info.new_order.chinese_traditional_medicine_cost_total}}</td>
+            <td width="200" colspan="2">{{info.new_order.chineseTraditionalInscpTotal}}</td>
+            <td width="250" colspan="2">{{info.new_order.chinese_traditional_medicine_cost_part_self_total}}</td>
+            <td width="150">{{info.new_order.chineseTraditionalSelfTotal}}</td>
+            <td colspan="2">{{info.new_order.chinese_traditional_medicine_cost_self_total}}</td>
           </tr>
+
+
+          <tr v-if="info.new_order.check_cost_total > 0">
+            <td width="100">检查费</td>
+            <td width="200" colspan="2">{{info.new_order.check_cost_total}}</td>
+            <td width="200" colspan="2">{{info.new_order.checkInscpTotal}}</td>
+            <td width="250" colspan="2">{{info.new_order.check_cost_part_self_total}}</td>
+            <td width="150">{{info.new_order.checkSelfTotal}}</td>
+            <td colspan="2">{{info.new_order.check_cost_self_total}}</td>
+          </tr>
+
+          <tr v-if="info.new_order.laboratory_cost_total > 0">
+            <td width="100">化验费</td>
+            <td width="200" colspan="2">{{info.new_order.laboratory_cost_total}}</td>
+            <td width="200" colspan="2">{{info.new_order.laboratoryInscpTotal}}</td>
+            <td width="250" colspan="2">{{info.new_order.laboratory_cost_part_self_total}}</td>
+            <td width="150">{{info.new_order.laboratorySelfTotal}}</td>
+            <td colspan="2">{{info.new_order.laboratory_cost_self_total}}</td>
+          </tr>
+
+
+
+          <tr v-if="info.new_order.operation_cost_total > 0">
+            <td width="100">手术费</td>
+            <td width="200" colspan="2">{{info.new_order.operation_cost_total}}</td>
+            <td width="200" colspan="2">{{info.new_order.operationInscpTotal}}</td>
+            <td width="250" colspan="2">{{info.new_order.operation_cost_part_self_total}}</td>
+            <td width="150">{{info.new_order.operationSelfTotal}}</td>
+            <td colspan="2">{{info.new_order.operation_cost_self_total}}</td>
+          </tr>
+
+
+
+
+
           <tr>
             <td width="100">金额合计</td>
             <td width="200" colspan="2">
-              {{(parseFloat(info.treat_cost_total) + parseFloat(info.material_cost_total) + 
-                  parseFloat(info.western_medicine_cost_total) ).toFixed(2) 
+              {{(parseFloat(info.new_order.treat_cost_total) + parseFloat(info.new_order.material_cost_total) +
+                  parseFloat(info.new_order.western_medicine_cost_total)+parseFloat(info.new_order.chinese_traditional_medicine_cost_total) + parseFloat(info.new_order.check_cost_total) +  parseFloat(info.new_order.laboratory_cost_total) + parseFloat(info.new_order.operation_cost_total)  ).toFixed(2)
               }}
             </td>
             <td width="200" colspan="2">
-              {{(parseFloat(info.treatInscpTotal) + parseFloat(info.materialInscpTotal) + 
-                  parseFloat(info.westernMedicineInscpTotal) ).toFixed(2) 
+              {{(parseFloat(info.new_order.treatInscpTotal) + parseFloat(info.new_order.materialInscpTotal) +
+                  parseFloat(info.new_order.westernMedicineInscpTotal) +  parseFloat(info.new_order.chineseTraditionalInscpTotal) + parseFloat(info.new_order.laboratoryInscpTotal) + parseFloat(info.new_order.checkInscpTotal) +  parseFloat(info.new_order.operationInscpTotal) ).toFixed(2)
               }}
             </td>
             <td width="250" colspan="2">
-              {{(parseFloat(info.treat_cost_part_self_total) + parseFloat(info.material_cost_part_self_total) + 
-                  parseFloat(info.western_medicine_cost_part_self_total) ).toFixed(2) 
+              {{(parseFloat(info.new_order.treat_cost_part_self_total) + parseFloat(info.new_order.material_cost_part_self_total) +
+                  parseFloat(info.new_order.western_medicine_cost_part_self_total) + parseFloat(info.new_order.chinese_traditional_medicine_cost_part_self_total) + parseFloat(info.new_order.check_cost_part_self_total) + parseFloat(info.new_order.laboratory_cost_part_self_total) +  parseFloat(info.new_order.operation_cost_part_self_total)  ).toFixed(2)
               }}
             </td>
             <td width="150">
-              {{(parseFloat(info.treatSelfTotal) + parseFloat(info.materialSelfTotal) + 
-                  parseFloat(info.westernMedicineSelfTotal) ).toFixed(2) 
+              {{(parseFloat(info.new_order.treatSelfTotal) + parseFloat(info.new_order.materialSelfTotal) +
+                  parseFloat(info.new_order.westernMedicineSelfTotal) + parseFloat(info.new_order.chineseTraditionalSelfTotal) + parseFloat(info.new_order.checkSelfTotal) +parseFloat(info.new_order.laboratorySelfTotal)  +  parseFloat(info.new_order.operationSelfTotal) ).toFixed(2)
               }}
             </td>
             <td colspan="2">
-              {{(parseFloat(info.treat_cost_self_total) + parseFloat(info.material_cost_self_total) + 
-                  parseFloat(info.western_medicine_cost_self_total) ).toFixed(2) 
+              {{(parseFloat(info.new_order.treat_cost_self_total) + parseFloat(info.new_order.material_cost_self_total) +
+                  parseFloat(info.new_order.western_medicine_cost_self_total) + parseFloat(info.new_order.chinese_traditional_medicine_cost_self_total) + parseFloat(info.new_order.check_cost_self_total) + parseFloat(info.new_order.laboratory_cost_self_total)  +  parseFloat(info.new_order.operation_cost_self_total)  ).toFixed(2)
               }}
             </td>
           </tr>
@@ -205,15 +243,15 @@
               {{info.new_order.act_pay_dedc}}
             </td>
             <td colspan="2">基本统筹基金支付</td>
-            <td colspan="3">{{info.hifp_pay}}</td>
+            <td colspan="3">{{info.new_order.hifp_pay}}</td>
           </tr>
           <tr>
             <td colspan="3">大病基金支付</td>
             <td colspan="2">
-              {{info.hifmi_pay}}
+              {{info.new_order.hifmi_pay}}
             </td>
             <td colspan="2">医疗救助基金支付</td>
-            <td colspan="3">{{info.maf_pay}}</td>
+            <td colspan="3">{{info.new_order.maf_pay}}</td>
           </tr>
           <tr>
             <td colspan="3">重大病疾病补充保险支付</td>
@@ -227,9 +265,9 @@
           </tr>
           <tr>
             <td colspan="3">其他基金支付</td>
-            <td colspan="2">{{info.oth_pay}}</td>
+            <td colspan="2">{{info.new_order.oth_pay}}</td>
             <td colspan="2">个人帐户支付</td>
-            <td colspan="3">{{info.acct_pay?info.acct_pay.toFixed(2):0}}</td>
+            <td colspan="3">{{info.new_order.acct_pay?info.new_order.acct_pay.toFixed(2):0}}</td>
           </tr>
           <tr>
             <td colspan="3">医院垫付金额</td>
@@ -243,8 +281,8 @@
           </tr>
           <tr>
             <td colspan="10" style="text-align: left;">
-              本次就医:总费用:{{info.medfee_sumamt}}元&nbsp; 基金支付:{{info.fund_pay_sumamt}}元 &nbsp;个人帐户:{{info.acct_pay?info.acct_pay.toFixed(2):0}}元 &nbsp;
-              共济帐户:0元 &nbsp;个人现金:{{info.new_order.psn_cash_pay}}元 &nbsp; 账户余额:0元
+              本次就医:总费用:{{info.new_order.medfee_sumamt}}元&nbsp; 基金支付:{{info.new_order.fund_pay_sumamt}}元 &nbsp;个人帐户:{{info.new_order.acct_pay?info.new_order.acct_pay.toFixed(2):0}}元 &nbsp;
+              共济帐户:0元 &nbsp;个人现金:{{info.new_order.psn_cash_pay}}元 &nbsp; 账户余额:{{info.new_order.blac}}元
             </td>
           </tr>
           <tr>

src/xt_pages/outpatientCharges/statementTemplate/privateChargePrint.vue

@@ -9,7 +9,7 @@
     <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10694">江西省社会医疗保险医疗费用结算单</div>
     <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10489">湖北省社会医疗保险医疗费用结算单</div>
     <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10731">医疗费用结算单</div>
-    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10635 || this.$store.getters.xt_user.org_id == 0">河北省社会医疗保险医疗费用结算单</div>
+    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10635 || this.$store.getters.xt_user.org_id == 0">江西省社会医疗保险医疗费用结算单</div>
 
     <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id != 10489 && this.$store.getters.xt_user.org_id != 10515 &&
                   this.$store.getters.xt_user.org_id != 10375 && this.$store.getters.xt_user.org_id != 10188 &&

src/xt_pages/outpatientCharges/summary.vue

@@ -588,31 +588,31 @@
                 </tr>
               </table>
             </div>
-            <div>
-              <table class="table" border="1" style="border-collapse: collapse;text-align: center;width: 100%;">
-                <tr>
-                  <td>单号</td>
-                  <td>卡号</td>
-                  <td>姓名</td>
-                  <td>年龄</td>
-                  <td>性别</td>
-                  <td>收费金额</td>
-                  <td>收费时间</td>
-                  <td>类型</td>
-                </tr>
-                <tr v-for="item in tableData2">
-                  <td>{{item.number}}</td>
-                  <td>{{item.certno}}</td>
-                  <td>{{item.psn_name}}</td>
-                  <td>{{item.patient.age}}</td>
-                  <td v-if="item.gend == 1">男</td>
-                  <td v-if="item.gend != 1">女</td>
-                  <td>{{item.medfee_sumamt}}</td>
-                  <td>{{item.setl_time}}</td>
-                  <td></td>
-                </tr>
-              </table>
-            </div>
+<!--            <div>-->
+<!--              <table class="table" border="1" style="border-collapse: collapse;text-align: center;width: 100%;">-->
+<!--                <tr>-->
+<!--                  <td>单号</td>-->
+<!--                  <td>卡号</td>-->
+<!--                  <td>姓名</td>-->
+<!--                  <td>年龄</td>-->
+<!--                  <td>性别</td>-->
+<!--                  <td>收费金额</td>-->
+<!--                  <td>收费时间</td>-->
+<!--                  <td>类型</td>-->
+<!--                </tr>-->
+<!--                <tr v-for="item in tableData2">-->
+<!--                  <td>{{item.number}}</td>-->
+<!--                  <td>{{item.certno}}</td>-->
+<!--                  <td>{{item.psn_name}}</td>-->
+<!--                  <td>{{item.patient.age}}</td>-->
+<!--                  <td v-if="item.gend == 1">男</td>-->
+<!--                  <td v-if="item.gend != 1">女</td>-->
+<!--                  <td>{{item.medfee_sumamt}}</td>-->
+<!--                  <td>{{item.setl_time}}</td>-->
+<!--                  <td></td>-->
+<!--                </tr>-->
+<!--              </table>-->
+<!--            </div>-->
           </div>
 
         </div>