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

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -1897,11 +1897,16 @@ export default {
       } else {
         this.curMonthPrescriptions = {}
       }
+      console.log("~~~~~~")
+      console.log(data[0])
 
       if (data && data.length > 0) {
+        console.log("c")
+
         this.curPrescriptions = data[0]
 
       } else {
+        console.log("b")
         this.curPrescriptions = {}
       }
 

src/xt_pages/hospitalStation/doctorDesk.vue

@@ -1000,7 +1000,7 @@
                  }
               }
             }
-            
+
             this.drugs = drugs
             console.log("所有药品信息",this.drugs)
             this.allDrugs = response.data.data.drugs
@@ -1157,15 +1157,15 @@
             } else {
               this.case_history.is_infect = false
             }
-            
+
             this.case_history.primary_disease = this.case_history.primary_disease
             this.case_history.confirm_failure_date = uParseTime(this.case_history.confirm_failure_date, '{y}-{m}-{d}')
             this.case_history.drug_allergy_history = this.case_history.drug_allergy_history
             this.case_history.physical_examination = this.case_history.physical_examination
             this.case_history.special_inspection = this.case_history.special_inspection
             this.case_history.lab_apparatus = this.case_history.lab_apparatus
-         
-          
+
+
             //处方相关
             this.prescriptionList = response.data.data.prescription
 
@@ -1427,6 +1427,7 @@
 
               }
             }
+            console.log("~~~~~~~~---------")
             this.$refs.prescriptions.setData(this.prescriptions, this.info, this.admin_info, this.doctors, this.department, this.hisPatientInfo, this.month_prescriptions, this.last_info, this.sick, this.diagnosis)
           }
         })
@@ -1572,7 +1573,7 @@
                   this.case_history.physical_examination = this.case_history.physical_examination
                   this.case_history.special_inspection = this.case_history.special_inspection
                   this.case_history.lab_apparatus = this.case_history.lab_apparatus
-                
+
                   this.prescriptionList = response.data.data.prescription
 
                   if (response.data.data.prescription.length > 0) {

src/xt_pages/hospitalStation/invoicePrint.vue

@@ -19,9 +19,9 @@
           "
           :paramsObj="invoiceParams"
         ></printOne>
-        <printTwo v-if="org_id == 10215" :paramsObj="invoiceParams"></printTwo>
+        <printTwo v-if="org_id == 10215  || org_id == 0 " :paramsObj="invoiceParams"></printTwo>
         <printThree
-          v-if="org_id == 10265 || org_id == 0 || org_id == 4 || org_id == 9675"
+          v-if="org_id == 10265|| org_id == 4 || org_id == 9675"
           :paramsObj="invoiceParams"
         ></printThree>
       </div>

src/xt_pages/hospitalStation/invoiceTemplate/printThree.vue

@@ -2,9 +2,9 @@
     <div id='invoice-print'>
 
         <div style="display:flex;justify-content: space-between;">
-            
+
             <div style="position: absolute;top:40px;left:40px"></div>
-            
+
             <div  style="position: absolute;top:40px;left:300px"></div>
 
             <div style="position: absolute;top:40px;left:560px"></div>
@@ -18,7 +18,7 @@
             <!-- <div></div> -->
             <!-- 发票序号 -->
             <!-- <div  style="position: absolute;left:560px;top:70px;">
-            
+
             </div> -->
              <div  style="position: absolute;left:650px;top:70px;">
             <!-- 类别 -->
@@ -98,7 +98,7 @@
 
         <div>
             <span>
-            <span style="position: absolute;top:280px;left:40px">合计金额（大写）：</span> 
+            <span style="position: absolute;top:280px;left:40px">合计金额（大写）：</span>
             <span  style="position: absolute;top:280px;left:180px">
                 <span v-if="zhongwen.indexOf('万') > -1 && zhongwen.indexOf('拾') > -1 && zhongwen.indexOf('拾') == 1">
                     {{ zhongwen.substring(0,1) }}十万
@@ -125,13 +125,15 @@
             </span>
             <span style="position: absolute;top:280px;left:350px">
                 <span v-if="zhongwen.indexOf('拾') > -1">
-                    {{ zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾')) }}拾
+<!--                    {{ // zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾')) }}拾-->
+                        {{zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾')) == '佰' ||  !zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾'))? '壹' : zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾')) }}
+
                 </span>
                 <span v-else>零拾</span>
             </span>
             <span  style="position: absolute;top:280px;left:390px">
-                <span v-if="zhongwen.indexOf('元') > -1">
-                    {{ zhongwen.substring(zhongwen.indexOf('元') - 1,zhongwen.indexOf('元')) }}元
+                <span v-if="zhongwen.indexOf('元') > -1 && zhongwen.substring(this.zhongwen.indexOf('元') - 1).substring(0,1)!= '拾'">
+                    {{ zhongwen.substring(zhongwen.indexOf('元') - 1,zhongwen.indexOf('元')) }}
                 </span>
                 <span v-else>零元</span>
             </span>

src/xt_pages/hospitalStation/settlementTemplate/hospitalSettlePrint.vue

@@ -555,8 +555,8 @@
               <tr>
                 <td>床位费</td>
                 <td>&nbsp;{{info.bed_cost_total?info.bed_cost_total:''}}</td>
-                <td>&nbsp;getJiaTotal('床位费')</td>
-                <td>&nbsp;getYiTotal('床位费')</td>
+                <td>&nbsp;{{getJiaTotal('床位费')}}</td>
+                <td>&nbsp;{{getYiTotal('床位费')}}</td>
                 <td>&nbsp;{{info.bed_cost_self_total?info.bed_cost_self_total:''}}</td>
                 <td>&nbsp;</td>
               </tr>
@@ -611,8 +611,8 @@
               <tr>
                 <td>卫生材料费</td>
                 <td>&nbsp;{{info.material_cost_total?info.material_cost_total:""}}</td>
-                <td>&nbsp;{{getJiaTotal('卫生材料费')}}</td>
-                <td>&nbsp;{{getYiTotal('卫生材料费')}}</td>
+                <td>&nbsp;{{getJiaTotal('材料费')}}</td>
+                <td>&nbsp;{{getYiTotal('材料费')}}</td>
                 <td>&nbsp;{{info.material_cost_self_total?info.material_cost_self_total:""}}</td>
                 <td>&nbsp;</td>
               </tr>
@@ -671,8 +671,8 @@
                     parseFloat(info.material_cost_total) + parseFloat(info.western_medicine_cost_total) +
                     parseFloat(info.chinese_traditional_medicine_cost_total) + parseFloat(info.check_cost_total) +
                     parseFloat(info.laboratory_cost_total) + parseFloat(info.treat_cost_total)).toFixed(2) }}</td>
-                <td>&nbsp;</td>
-                <td>&nbsp;</td>
+                <td>&nbsp;{{getAllJiaTotal()}}</td>
+                <td>&nbsp;{{getAllYiTotal()}}</td>
                 <td>
                 </td>
                 <td>&nbsp;</td>
@@ -834,6 +834,28 @@ export default {
     }
   },
   methods:{
+    getAllJiaTotal(){
+      let total = 0.00
+      for(let i = 0; i  < this.list.length; i++){
+          total = parseFloat(total) + parseFloat(this.list[i].jiaTotal)
+      }
+      if (total == 0){
+        return ""
+      }
+      return total.toFixed(2)
+
+    },getAllYiTotal(){
+      let total = 0.00
+      for(let i = 0; i  < this.list.length; i++){
+        total = parseFloat(total) + parseFloat(this.list[i].yiTotal)
+      }
+      if (total == 0){
+        return ""
+      }
+      return total.toFixed(2)
+
+    },
+
     getJiaTotal(name){
       let total = 0.00
       for(let i = 0; i  < this.list.length; i++){
@@ -842,6 +864,9 @@ export default {
 
         }
       }
+      if (total == 0){
+        return ""
+      }
       return total
     },
     getYiTotal(name){
@@ -852,8 +877,10 @@ export default {
 
         }
       }
+      if (total == 0){
+        return ""
+      }
       return total
-
     },
     getNaty(naty){
       switch (naty){

src/xt_pages/hospitalStation/statementPrint.vue

@@ -81,6 +81,68 @@ export default {
     }
   },
   methods: {
+    getType(med_chrgitm_type){
+      switch (med_chrgitm_type) {
+        case '01':
+          return '床位费'
+          break
+        case '02':
+          return '诊察费'
+
+          break
+        case '03':
+          return '检查费'
+
+          break
+        case '04':
+          return '化验费'
+          break
+        case '05':
+          return '治疗费'
+
+          break
+        case '06':
+          return '手术费'
+
+          break
+        case '07':
+          return '护理费'
+
+          break
+        case '08':
+          return '材料费'
+
+          break
+        case '09':
+          return '西药费'
+
+          break
+        case '10':
+          return '中药饮片费'
+
+          break
+        case '11':
+          return '中成药费'
+
+          break
+        case '12':
+          return '一般诊疗费'
+
+          break
+        case '13':
+          return '挂号费'
+
+          break
+        case '14':
+          return '其他费'
+
+          break
+
+      }
+
+
+    },
+
     printThisPage() {
       var ptime = Math.round(new Date().getTime() / 1000)
       this.print_time = uParseTime(ptime, '{y}-{m}-{d} {h}:{i}')
@@ -157,6 +219,37 @@ export default {
           this.cal_two = cal_two
         }
       })
+    },getJiaTotal(items){
+      console.log(items)
+      let total = 0
+      for(let i = 0; i < items.length; i++){
+        if(items[i].chrgitm_lv == "01") {
+          total = parseFloat(total) + (parseFloat(items[i].cnt) * parseFloat(items[i].pric))
+
+        }
+      }
+      return total.toFixed(2)
+    },getYiTotal(items){
+      let total = 0
+      for(let i = 0; i < items.length; i++){
+        if(items[i].chrgitm_lv == "02") {
+          total = parseFloat(total) + (parseFloat(items[i].cnt) * parseFloat(items[i].pric))
+
+          // total = Number(total) + Number((parseFloat(items[i].count) * parseFloat(items[i].price)).toFixed(2))
+        }
+      }
+      return total.toFixed(2)
+    },getBingTotal(items){
+
+      let total = 0
+      for(let i = 0; i < items.length; i++){
+        if(items[i].chrgitm_lv == "03") {
+          total = parseFloat(total) + (parseFloat(items[i].cnt) * parseFloat(items[i].pric))
+
+          // total = Number(total) + Number((parseFloat(items[i].count) * parseFloat(items[i].price)).toFixed(2))
+        }
+      }
+      return total.toFixed(2)
     },
 
     changePatient(row) {
@@ -317,17 +410,14 @@ export default {
                   tempDetails.push(response.data.data.order_info[b])
                 }
               }
-              obj.total = this.getTotal(tempDetails)
-              obj.jiaTotal = this.getJiaTotal(tempDetails)
-              obj.yiTotal = this.getYiTotal(tempDetails)
-              obj.noMedicineTotal = this.getNoMedicineTotal(tempDetails)
-              obj.bingTotal = this.getBingTotal(tempDetails)
-              obj.otherTotal = this.getOtherTotal(tempDetails)
-
-              obj.details = this.setNewData(tempDetails)
-              this.list.push(obj)
+              obj.jiaTotal = that.getJiaTotal(tempDetails)
+              obj.yiTotal = that.getYiTotal(tempDetails)
+              obj.bingTotal = that.getBingTotal(tempDetails)
+              obj.details = that.setNewData(tempDetails)
+              that.list.push(obj)
 
             }
+            console.log(that.list)
           }
         })
 
@@ -410,6 +500,50 @@ export default {
                 that.info['diagnosis'] = response.data.data.diagnosis
                 that.info['his'] = response.data.data.his_hospital
 
+                console.log("22222222")
+
+                //获取所有项目类型进行去重
+                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)
+                }
+                console.log(med_chrgitm_types)
+
+                const obj = {}
+                med_chrgitm_types = med_chrgitm_types.reduce((cur, next) => {
+                  obj[next] ? '' : obj[next] = true && cur.push(next)
+                  return cur
+                }, []) // 设置cur默认类型为数组，并且初始值为空的数组
+                console.log(med_chrgitm_types)
+                console.log("1111111")
+                for (let i = 0; i < med_chrgitm_types.length; i++) {
+                  let obj = {
+                    details: [],
+                    med_chrgitm_name: that.getType(med_chrgitm_types[i]),
+                    jiaTotal: 0,
+                    total: 0,
+                    yiTotal: 0,
+                    noMedicineTotal: 0,
+                    bingTotal: 0,
+                    otherTotal: 0,
+                  }
+                  console.log("222233333333211111222")
+
+                  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("2222211111222")
+                  obj.jiaTotal = that.getJiaTotal(tempDetails)
+                  obj.yiTotal = that.getYiTotal(tempDetails)
+                  obj.bingTotal = that.getBingTotal(tempDetails)
+                  that.list.push(obj)
+                  console.log(that.list)
+                }
+                console.log(that.list)
+
               }
             })
             .catch(function(error) {

src/xt_pages/hospitalStation/summary.vue

@@ -762,6 +762,7 @@
               let obj = {
                 '单号': order.number,
                 '人员编号':order.his_hospital_patient.psn_no,
+                '保地医保区':order.his_hospital_patient.insuplc_admdvs,
                 '身份证号':order.patient.id_card_no,
                 '患者姓名': name,
                 '险种':order.insutype,
@@ -796,8 +797,8 @@
               list.push(obj)
             }
             import('@/vendor/Export2Excel').then(excel => {
-              const tHeader = ['单号', '人员编号', '身份证号', '患者姓名', '险种', '医疗类别', '就诊id', '登记日期', '出院日期', '结算id', '结算日期', '医疗费总额', '全自费金额', '超限价自费金额', '先行自付金额', '符合政策范围金额', '实际支付起付线', '基本医疗保险统筹基金支出', '基本医疗保险统筹基金支付比例', '公务员医疗补助基金支出', '企业补充医疗保险基金支出', '居民大病保险基金支出', '职工大额医疗费用补助基金支出', '医疗救助基金支出', '其他支出','基金支付总额','个人负担总金额','个人账户支付金额','个人现金支出','医院总负担金额','余额','个账共济支付金额']
-              const filterVal = ['单号', '人员编号', '身份证号', '患者姓名', '险种', '医疗类别', '就诊id', '登记日期', '出院日期', '结算id', '结算日期', '医疗费总额', '全自费金额', '超限价自费金额', '先行自付金额', '符合政策范围金额', '实际支付起付线', '基本医疗保险统筹基金支出', '基本医疗保险统筹基金支付比例', '公务员医疗补助基金支出', '企业补充医疗保险基金支出', '居民大病保险基金支出', '职工大额医疗费用补助基金支出', '医疗救助基金支出', '其他支出','基金支付总额','个人负担总金额', '个人账户支付金额','个人现金支出','医院总负担金额','余额','个账共济支付金额']
+              const tHeader = ['单号', '人员编号','保地医保区', '身份证号', '患者姓名', '险种', '医疗类别', '就诊id', '登记日期', '出院日期', '结算id', '结算日期', '医疗费总额', '全自费金额', '超限价自费金额', '先行自付金额', '符合政策范围金额', '实际支付起付线', '基本医疗保险统筹基金支出', '基本医疗保险统筹基金支付比例', '公务员医疗补助基金支出', '企业补充医疗保险基金支出', '居民大病保险基金支出', '职工大额医疗费用补助基金支出', '医疗救助基金支出', '其他支出','基金支付总额','个人负担总金额','个人账户支付金额','个人现金支出','医院总负担金额','余额','个账共济支付金额']
+              const filterVal = ['单号', '人员编号','保地医保区', '身份证号', '患者姓名', '险种', '医疗类别', '就诊id', '登记日期', '出院日期', '结算id', '结算日期', '医疗费总额', '全自费金额', '超限价自费金额', '先行自付金额', '符合政策范围金额', '实际支付起付线', '基本医疗保险统筹基金支出', '基本医疗保险统筹基金支付比例', '公务员医疗补助基金支出', '企业补充医疗保险基金支出', '居民大病保险基金支出', '职工大额医疗费用补助基金支出', '医疗救助基金支出', '其他支出','基金支付总额','个人负担总金额', '个人账户支付金额','个人现金支出','医院总负担金额','余额','个账共济支付金额']
               const data = this.formatJson(filterVal, list)
               excel.export_json_to_excel({
                 header: tHeader,

src/xt_pages/outpatientCharges/allListPrint.vue

@@ -277,7 +277,8 @@
           }
         }
         return res
-      },getType(med_chrgitm_type){
+      },
+      getType(med_chrgitm_type){
         switch (med_chrgitm_type) {
           case '01':
             return '床位费'

src/xt_pages/outpatientCharges/listPrint.vue

@@ -199,7 +199,8 @@
             }
           }
         })
-      },getJiaTotal(items){
+      },
+      getJiaTotal(items){
         console.log(items)
         let total = 0
         for(let i = 0; i < items.length; i++){
@@ -296,7 +297,7 @@
                 obj['name'] = details[a].advice.advice_name
                 // obj['spec'] = details[a].advice.drug.drug_spec
                 obj['spec'] =   details[a].advice.drug.dose +   details[a].advice.drug.dose_unit+"*" +  details[a].advice.drug.min_number +   details[a].advice.drug.min_unit+"/"+ details[a].advice.drug.max_unit
-                obj['unit'] = details[a].advice.drug.min_unit
+                obj['unit'] = details[a].advice.drug.max_unit
                 obj['medicine_insurance_kind'] = this.getMedicineInsuranceType(details[a].chrgitm_lv)
                 obj['med_chrgitm_type'] = this.getType(details[a].med_chrgitm_type)
                 obj['price'] = parseFloat(details[a].pric)

src/xt_pages/outpatientCharges/listTemplate/printTwo10265.vue

@@ -12,8 +12,8 @@
       </div>
 
       <div class="listInfo">
-        <div>入院科室：血透</div>
-        <div>出院科室：血透</div>
+        <div>入院科室：血液透析室</div>
+        <div>出院科室：血液透析室</div>
         <div>入院日期：{{hospital_record.in_hosptial_time.split(' ')[0]}}</div>
         <div>出院日期：{{hospital_record.out_hosptial_time.split(' ')[0]}}</div>
         <div>住院天数:{{getDay(hospital_record.in_hosptial_time.split(' ')[0] ,hospital_record.out_hosptial_time.split(' ')[0])}}</div>
@@ -25,7 +25,9 @@
       >
         <div>出院诊断：尿毒症</div>
         <div>床位号：</div>
-        <div>费别：医保</div>
+        <div v-if="order&&order.insutype == '390'">费别：城乡居民基本医疗保险</div>
+        <div v-if="order&&order.insutype == '310'">费别：职工基本医疗保险</div>
+
       </div>
 
       <table

src/xt_pages/outpatientCharges/statementTemplate/privateChargePrint.vue

@@ -76,7 +76,7 @@
       <tr>
         <td colspan="12" style="text-align:left;padding-left:10px;">
 <!--          本次就医：总费用{{info.medfee_sumamt}}元，基金支付{{info.fund_pay_sumamt}}元，个人支付{{info.medfee_sumamt}}元。-->
-          本次就医：总费用{{info.medfee_sumamt}}元，基金支付{{info.fund_pay_sumamt}}元，个人支付{{info.psn_pay}}元。
+          本次就医：总费用{{info.medfee_sumamt}}元，基金支付{{info.fund_pay_sumamt}}元，个人支付{{info.medfee_sumamt}}元。
           (起付线 {{info.act_pay_dedc}}元, 先自付 {{info.preselfpay_amt}}元, 段内自付 {{info.medfee_sumamt}}元 )
 
         </td>