1111

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

@@ -70,20 +70,20 @@
       <printSixtheen :info="info" v-if="org_id == 10697"></printSixtheen>
       <!-- 杏康 -->
       <printSeventheen  :info="info" v-if=" org_id == 10721 || org_id == 0"></printSeventheen>
-      <printeighteen :info="info" v-if=" org_id == 10726 || org_id == 0"></printeighteen>
+      <printeighteen :info="info" v-if=" org_id == 10726 "></printeighteen>
 
       <printOne :info="info" v-if=" org_id != 9990 &&
             org_id != 10138 && org_id != 9504 && org_id != 10028 &&
             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 != 0 && org_id != 10726 && 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   && this.paramsObj.balance_accounts_type == 2">
+            org_id != 10510 &&org_id != 10633 && org_id != 10721 && org_id != 10726  && this.paramsObj.balance_accounts_type == 2">
       </privateChargePrint>
     </div>
   </div>
@@ -1026,6 +1026,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)
 
@@ -1149,7 +1154,7 @@ export default {
         }
       } else {
         console.log('1111111',this.org_id)
-        if (this.org_id == 0) {
+        if (this.org_id == 1000000) {
           let params = {
             order_id: obj.order_id,
             admin_user_id: this.$store.getters.xt_user.user.id
@@ -1304,7 +1309,11 @@ export default {
 
               that.info['L_list'] = L_list
               that.info['R_list'] = R_list
-              console.log('that.info10721',this.info);
+
+              console.log(" that.info")
+              console.log(that.info.Z_list)
+              console.log(" that.info")
+              console.log('that.info10721',that.info);
 
             }
           })
@@ -1559,7 +1568,300 @@ export default {
 
 
 
-          } if(this.org_id == 10721){
+          }else if(this.org_id == 10721){
+            let params = {
+              order_id: obj.order_id,
+              admin_user_id: this.$store.getters.xt_user.user.id
+            }
+            getPrivateExpensesOrder(params).then((response) => {
+              if (response.data.state == 0) {
+                // this.$message.error(response.data.msg)
+
+                return false
+              } else {
+                var that = this
+                that.info = response.data.data.info
+                that.p_admin = response.data.data.printor_admin
+                that.charge_admin = response.data.data.charge_admin
+                that.info['new_order'] = response.data.data.info
+                that.info['p_admin'] = that.p_admin
+                that.info['charge_admin'] = that.charge_admin
+                that.info['order_number'] = response.data.data.order_number
+                that.info['patient'] = response.data.data.patient
+                that.info['date'] = response.data.data.date
+                that.info['number'] = response.data.data.number
+                that.info['order_infos'] = response.data.data.order_infos
+                that.info['diagnosis'] = response.data.data.diagnosis
+                that.info['fixmedins_name'] = response.data.data.org_name
+                that.info['fixmedins_code'] = response.data.data.org_code
+                // that.info["doctor_code"] = response.data.data.doctor_code;
+                // 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
+                that.info['bed_cost_part_self_total'] =
+                  response.data.data.bedCostPartSelfTotal
+
+                that.info['operation_cost_total'] =
+                  response.data.data.operationCostTotal
+                that.info['operation_cost_self_total'] =
+                  response.data.data.operationCostSelfTotal
+                that.info['operation_cost_part_self_total'] =
+                  response.data.data.operationCostPartSelfTotal
+
+                that.info['other_cost_total'] = response.data.data.otherCostTotal
+                that.info['other_cost_self_total'] =
+                  response.data.data.otherCostSelfTotal
+                that.info['other_cost_part_self_total'] =
+                  response.data.data.otherCostPartSelfTotal
+
+                that.info['material_cost_total'] =
+                  response.data.data.materialCostTotal
+                that.info['material_cost_self_total'] =
+                  response.data.data.materialCostSelfTotal
+                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'] =
+                  response.data.data.westernMedicineCostSelfTotal
+                that.info['western_medicine_cost_part_self_total'] =
+                  response.data.data.westernMedicineCostPartSelfTotal
+
+                that.info['chinese_traditional_medicine_cost_total'] =
+                  response.data.data.chineseTraditionalMedicineCostTotal
+                that.info['chinese_traditional_medicine_cost_self_total'] =
+                  response.data.data.chineseTraditionalMedicineCostSelfTotal
+                that.info['chinese_traditional_medicine_cost_part_self_total'] =
+                  response.data.data.chineseTraditionalMedicineCostPartSelfTotal
+
+                that.info['check_cost_total'] = response.data.data.checkCostTotal
+                that.info['check_cost_self_total'] =
+                  response.data.data.checkCostSelfTotal
+                that.info['check_cost_part_self_total'] =
+                  response.data.data.checkCostPartSelfTotal
+
+                that.info['laboratory_cost_total'] =
+                  response.data.data.laboratoryCostTotal
+                that.info['laboratory_cost_self_total'] =
+                  response.data.data.laboratoryCostSelfTotal
+                that.info['laboratory_cost_part_self_total'] =
+                  response.data.data.laboratoryCostPartSelfTotal
+
+                that.info['treat_cost_total'] = response.data.data.treatCostTotal
+                that.info['treat_cost_self_total'] =
+                  response.data.data.treatCostSelfTotal
+                that.info['treat_cost_part_self_total'] =
+                  response.data.data.treatCostPartSelfTotal
+
+
+
+                that.info['date'] = response.data.data.date
+                that.info['number'] = response.data.data.number
+                that.info['order_infos'] = response.data.data.order_infos
+                that.info['diagnosis'] = response.data.data.diagnosis
+                that.info['his'] = response.data.data.his
+                that.info['dia_config'] = response.data.data.dia_config
+
+
+                for (let i = 0; i < response.data.data.order_infos.length; i++) {
+                  if (response.data.data.order_infos[i].advice_id > 0 && response.data.data.order_infos[i].project_id == 0) {
+                    response.data.data.order_infos[i].med_chrgitm_type = '09'
+                  }
+                  if (response.data.data.order_infos[i].advice_id == 0 && response.data.data.order_infos[i].project_id > 0) {
+                    if (response.data.data.order_infos[i].project.type == 2) { //项目
+                      if (response.data.data.order_infos[i].project.project.cost_classify == 2) {
+                        response.data.data.order_infos[i].med_chrgitm_type = '05'
+                      } else if (response.data.data.order_infos[i].project.project.cost_classify == 3) {
+                        response.data.data.order_infos[i].med_chrgitm_type = '04'
+                      } else {
+                        response.data.data.order_infos[i].med_chrgitm_type = '14'
+                      }
+                    } else if (response.data.data.order_infos[i].project.type == 3) { //耗材
+                      response.data.data.order_infos[i].med_chrgitm_type = '08'
+                    }
+                  }
+                }
+                console.log(response.data.data.order_infos)
+                console.log(that.info)
+
+                let list = []
+                for (let i = 0; i < response.data.data.order_infos.length; i++) {
+                  let order = response.data.data.order_infos[i]
+                  let obj = {
+                    name: '',
+                    spec: '',
+                    cnt: '',
+                    det_item_fee_sumamt: '',
+                    price:'',
+                  }
+
+                  if (order.advice_id > 0 && order.project_id == 0) {
+                    obj.name = order.advice.advice_name
+                    let spec = order.advice.drug.dose + order.advice.drug.dose_unit + '*' + order.advice.drug.min_number + order.advice.drug.min_unit + '/' + order.advice.drug.max_unit
+                    obj.spec = spec
+                    obj.cnt = order.cnt
+                    obj.det_item_fee_sumamt = order.det_item_fee_sumamt
+                    obj.price = order.pric
+                    list.push(obj)
+
+                  } else if (order.advice_id == 0 && order.project_id > 0) {
+                    if (order.project.type == 2) {
+                      obj.name = order.project.project.project_name
+                      obj.spec = ''
+                      obj.cnt = order.cnt
+                      obj.det_item_fee_sumamt = order.det_item_fee_sumamt
+                      obj.price = order.pric
+                    } else {
+                      obj.name = order.project.good_info.good_name
+                      obj.spec = order.project.good_info.specification_name
+                      obj.cnt = order.cnt
+                      obj.det_item_fee_sumamt = order.det_item_fee_sumamt
+                      obj.price = order.pric
+                    }
+                    list.push(obj)
+                  }
+
+                }
+                that.info['Z_list'] = list
+                console.log(" that.info")
+                console.log(that.info.Z_list)
+                console.log(" that.info")
+
+
+                //获取所有项目类型进行去重
+                let med_chrgitm_types = []
+                for (let i = 0; i < response.data.data.order_infos.length; i++) {
+                  med_chrgitm_types.push(response.data.data.order_infos[i].med_chrgitm_type)
+                }
+                const obj10 = {}
+                med_chrgitm_types = med_chrgitm_types.reduce((cur, next) => {
+                  obj10[next] ? '' : obj10[next] = true && cur.push(next)
+                  return cur
+                }, []) // 设置cur默认类型为数组，并且初始值为空的数组
+                let tempOrderInfo = []
+                for (let i = 0; i < med_chrgitm_types.length; i++) {
+
+                  let obj9 = {
+                    details: [],
+                    med_chrgitm_name: that.getType(med_chrgitm_types[i]),
+                    total:0,
+                  }
+
+                  // if(med_chrgitm_types[i] == '09'){
+                  //   obj.sort = 99
+                  // } else if(med_chrgitm_types[i] == '05'){
+                  //   obj.sort = 98
+                  // } else if(med_chrgitm_types[i] == '08'){
+                  //   obj.sort = 97
+                  // }else if(med_chrgitm_types[i] == '03'){
+                  //   obj.sort = 96
+                  // }
+
+                  let tempDetails = []
+                  for (let b = 0; b < response.data.data.order_infos.length; b++) {
+                    if (med_chrgitm_types[i] == response.data.data.order_infos[b].med_chrgitm_type) {
+                      tempDetails.push(response.data.data.order_infos[b])
+                    }
+                  }
+                  console.log(med_chrgitm_types[i])
+                  console.log(tempDetails)
+                  obj9.total = that.getTotal(tempDetails)
+                  obj9.details = that.set10265NewData(tempDetails)
+                  list.push(obj9)
+                }
+                that.info['new_list'] = list
+                // list.sort((a,b) => a.sort < b.sort ? 1 : a.sort > b.sort ? -1 : 0)
+
+                let obj = {
+                  type: 1,
+                  details: [],
+                  total: 0
+                }
+                let obj2 = {
+                  type: 2,
+                  details: [],
+                  total: 0
+                }
+                let obj3 = {
+                  type: 3,
+                  details: [],
+                  total: 0
+                }
+
+                let obj4 = {
+                  type: 4,
+                  details: [],
+                  total: 0
+                }
+                let num = 0
+                that.info.order_infos.map((item) => {
+                  if (item.advice_id > 0) {
+                    obj.details.push(item)
+                    obj.total += item.pric * item.advice.prescribing_number
+                    num++
+                  } else {
+                    if (item.project.type == 2) {
+                      obj2.details.push(item)
+                      obj2.total += item.pric * item.project.count
+                      num++
+                    } else {
+                      obj3.details.push(item)
+                      obj3.total += item.pric * item.project.count
+                      num++
+                    }
+                  }
+                })
+
+                // this.info.order_infos.map(item => {
+                //   obj4.total = item.Total
+                //   obj4.details.push(item)
+                //   num++
+                //
+                // })
+                var funds = []
+                for(let i = 0; i <  response.data.data.funds.length; i++){
+                  var objs = {}
+                  objs["number"] = i + 1
+                  objs["fund_pay"] = response.data.data.funds[i].fund_payamt
+                  objs["limit_pay"] = response.data.data.funds[i].inscp_scp_amt
+                  objs["insp_pay"] = response.data.data.funds[i].inscp_scp_amt
+                  for(let b = 0; b < that.fundsArray.length; b++){
+                    if(response.data.data.funds[i].fund_pay_type ==  that.fundsArray[b].code){
+                      objs["name"] =that.fundsArray[b].name
+                    }
+                  }
+                  funds.push(objs)
+                }
+                that.info['funds'] = funds
+                console.log(that.info)
+
+                that.info.new_detail_list = []
+                that.info.new_detail_list.push(obj)
+                that.info.new_detail_list.push(obj2)
+                that.info.new_detail_list.push(obj3)
+                // that.info.new_detail_list.push(obj4)
+
+                that.num = num
+
+                if (that.paramsObj.settle_type != 1) {
+                  that.info.begndate = that.getTimes(that.paramsObj.start_time)
+                  that.info.enddate = that.getTimes(that.paramsObj.end_time)
+                }
+
+                that.info.order_infos.map((item) => {
+
+                })
+
+              }
+            })
+
+
+
+          } else if(this.org_id == 10726){
             let params = {
               order_id: obj.order_id,
               admin_user_id: this.$store.getters.xt_user.user.id
@@ -1649,6 +1951,47 @@ export default {
                   response.data.data.treatCostPartSelfTotal
 
 
+                that.info['bedInscpTotal'] =
+                  response.data.data.bedInscpTotal
+                that.info['bedSelfTotal'] =
+                  response.data.data.bedSelfTotal
+
+                that.info['operationInscpTotal'] =
+                  response.data.data.operationInscpTotal
+                that.info['operationSelfTotal'] =
+                  response.data.data.operationSelfTotal
+
+                that.info['checkInscpTotal'] =
+                  response.data.data.checkInscpTotal
+                that.info['checkSelfTotal'] =
+                  response.data.data.checkSelfTotal
+
+                that.info['treatInscpTotal'] =
+                  response.data.data.treatInscpTotal
+                that.info['treatSelfTotal'] =
+                  response.data.data.treatSelfTotal
+
+                that.info['laboratoryInscpTotal'] =
+                  response.data.data.laboratoryInscpTotal
+                that.info['laboratorySelfTotal'] =
+                  response.data.data.laboratorySelfTotal
+
+                that.info['westernMedicineInscpTotal'] =
+                  response.data.data.westernMedicineInscpTotal
+                that.info['westernMedicineSelfTotal'] =
+                  response.data.data.westernMedicineSelfTotal
+
+                that.info['materialInscpTotal'] =
+                  response.data.data.materialInscpTotal
+                that.info['materialSelfTotal'] =
+                  response.data.data.materialSelfTotal
+
+                that.info['chineseTraditionalInscpTotal'] =
+                  response.data.data.chineseTraditionalInscpTotal
+                that.info['chineseTraditionalSelfTotal'] =
+                  response.data.data.chineseTraditionalSelfTotal
+
+
 
                 that.info['date'] = response.data.data.date
                 that.info['number'] = response.data.data.number
@@ -1657,6 +2000,16 @@ export default {
                 that.info['his'] = response.data.data.his
                 that.info['dia_config'] = response.data.data.dia_config
 
+                const jsonArr = JSON.parse(response.data.data.his.idetinfo);
+                that.info['psn_idet_type'] = jsonArr[0].psn_idet_type
+
+
+                const jsons = JSON.parse(response.data.data.his.iinfo);
+                that.info['emp_name'] = jsons[0].emp_name
+
+
+
+
 
                 for (let i = 0; i < response.data.data.order_infos.length; i++) {
                   if (response.data.data.order_infos[i].advice_id > 0 && response.data.data.order_infos[i].project_id == 0) {
@@ -1852,7 +2205,7 @@ export default {
 
 
 
-          }else{
+          }else {
             var that = this
             axios
               .get('http://127.0.0.1:9532/api/settle/query', {

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>