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

src/xt_pages/outpatientCharges/costComparison.vue

@@ -652,15 +652,16 @@ c<template>
                   '姓名': this.fromData[i].psn_name,
                   '单位名称': this.fromData[i].psn_name,
                   '个人编号': this.fromData[i].psn_no,
-                  '门诊号': this.fromData[i].mdtrt_id,
+                  '门诊流水号': this.fromData[i].mdtrt_id,
                   '挂号日期': this.getTimes(this.fromData[i].settle_accounts_date),
-                  '挂号科室':  "血透室",
+                  '科室名称':  "血透室",
                   '门诊费用': this.fromData[i].medfee_sumamt,
+                  '医保支付': this.fromData[i].fund_pay_sumamt,
                   '自费': this.fromData[i].psn_cash_pay,
                   '起付线I': this.fromData[i].act_pay_dedc,
                   '按比例自付II': this.fromData[i].psn_cash_pay,
                   '小计I+II': this.fromData[i].act_pay_dedc + this.fromData[i].psn_cash_pay,
-                  '统筹基金': this.fromData[i].fund_pay_sumamt,
+                  '基本统筹基金': this.fromData[i].hifp_pay,
                   '公务员补助': this.fromData[i].cvlserv_pay,
                   '单位补充保险': hifes_pay,
                   '煤矿补充保险': "0.00",
@@ -685,8 +686,8 @@ c<template>
               }
 
               import('@/vendor/Export2Excel').then(excel => {
-                const tHeader = ['序号', '姓名', '单位名称','个人编号', '门诊号', '挂号日期','挂号科室','门诊费用','自费', '起付线I','按比例自付II','小计I+II','统筹基金','公务员补助','单位补充保险','煤矿补充保险','超封顶线费用','大额医疗保险应付', '透析补助', '大额合计', '实账支付额', '诊断', '血透次数', '置留管数量','备注']
-                const filterVal = ['序号', '姓名', '单位名称','个人编号', '门诊号', '挂号日期','挂号科室','门诊费用','自费', '起付线I','按比例自付II','小计I+II','统筹基金','公务员补助','单位补充保险','煤矿补充保险','超封顶线费用','大额医疗保险应付', '透析补助', '大额合计', '实账支付额', '诊断', '血透次数', '置留管数量','备注']
+                const tHeader = ['序号', '姓名', '单位名称','个人编号', '门诊流水号', '挂号日期','科室名称','门诊费用','医保支付','自费', '起付线I','按比例自付II','小计I+II','基本统筹基金','公务员补助','单位补充保险','煤矿补充保险','超封顶线费用','大额医疗保险应付', '透析补助', '大额合计', '实账支付额', '诊断', '血透次数', '置留管数量','备注']
+                const filterVal = ['序号', '姓名', '单位名称','个人编号', '门诊流水号', '挂号日期','科室名称','门诊费用','医保支付','自费', '起付线I','按比例自付II','小计I+II','基本统筹基金','公务员补助','单位补充保险','煤矿补充保险','超封顶线费用','大额医疗保险应付', '透析补助', '大额合计', '实账支付额', '诊断', '血透次数', '置留管数量','备注']
                 // const filterVal = [ '姓名', '身份证', '个人编号', '门诊流水号', '挂号日期', '起付线', '统筹基金', '个人支付', '个账支付', '现金支付', '总费用', '冲销标志']
                 const merges = ['A1:A2', 'B1:B2', 'C1:E1', 'F1:H1', 'I1:K1', 'L1:N1', 'O1:Q1', 'R1:T1', 'U1:W1', 'X1:Z1', 'AA1:AC1', 'AD1:AF1', 'AG1:AI1', 'AJ1:AL1', 'AM1:AO1', 'AP1:AR1', 'AS1:AU1', 'AV1:AX1', 'AY1:BA1', 'BB1:BD1', 'BE1:BG1', 'BH1:BJ1', 'BK1:BM1']
 
@@ -728,12 +729,13 @@ c<template>
                   '诊断': this.GetDiagnosisName(this.fromData[i].diagnosis_id),
                   '挂号科室': "血透室",
                   '门诊费用': this.fromData[i].medfee_sumamt,
+                  '医保支付': this.fromData[i].fund_pay_sumamt,
                   '自费': this.fromData[i].psn_cash_pay,
-                  '起付线': this.fromData[i].act_pay_dedc,
-                  '按比例自付': this.fromData[i].psn_cash_pay,
+                  '起付线I': this.fromData[i].act_pay_dedc,
+                  '按比例自付II': this.fromData[i].psn_cash_pay,
                   "超封顶线费用": "0.00",
-                  "合计": parseFloat(this.fromData[i].act_pay_dedc) + parseFloat(this.fromData[i].psn_cash_pay),
-                  '统筹基金': this.fromData[i].fund_pay_sumamt,
+                  "合计": parseFloat(this.fromData[i].act_pay_dedc)  + parseFloat(this.fromData[i].psn_cash_pay),
+                  '基本统筹基金': this.fromData[i].hifp_pay,
                   '大病保险': hifmi_pay,
                   '医疗救助': this.fromData[i].maf_pay,
                   '实账支付额': "0.00",
@@ -757,8 +759,8 @@ c<template>
               }
 
               import('@/vendor/Export2Excel').then(excel => {
-                const tHeader = ['序号', '姓名','个人编号', '门诊号', '挂号日期', '诊断','挂号科室','门诊费用','自费', '起付线','按比例自付','超封顶线费用','合计','统筹基金','大病保险','医疗救助', '实账支付额', '血透次数', '置留管数量','备注']
-                const filterVal = ['序号', '姓名','个人编号', '门诊号', '挂号日期','诊断','挂号科室','门诊费用','自费', '起付线','按比例自付','超封顶线费用','合计','统筹基金','大病保险','医疗救助', '实账支付额', '血透次数', '置留管数量','备注']
+                const tHeader = ['序号', '姓名','个人编te号', '门诊号', '挂号日期', '诊断','挂号科室','门诊费用','医保支付','自费', '起付线', '起付线II','超封顶线费用','合计','统筹基金','大病保险','医疗救助', '实账支付额', '血透次数', '置留管数量','备注']
+                const filterVal = ['序号', '姓名','个人编号', '门诊号', '挂号日期','诊断','挂号科室','门诊费用','医保支付','自费', '起付线', '起付线II','超封顶线费用','合计','统筹基金','大病保险','医疗救助', '实账支付额', '血透次数', '置留管数量','备注']
                 // const filterVal = [ '姓名', '身份证', '个人编号', '门诊流水号', '挂号日期', '起付线', '统筹基金', '个人支付', '个账支付', '现金支付', '总费用', '冲销标志']
                 const merges = ['A1:A2', 'B1:B2', 'C1:E1', 'F1:H1', 'I1:K1', 'L1:N1', 'O1:Q1', 'R1:T1', 'U1:W1', 'X1:Z1', 'AA1:AC1', 'AD1:AF1', 'AG1:AI1', 'AJ1:AL1', 'AM1:AO1', 'AP1:AR1', 'AS1:AU1', 'AV1:AX1', 'AY1:BA1', 'BB1:BD1', 'BE1:BG1', 'BH1:BJ1', 'BK1:BM1']
 

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -495,9 +495,9 @@
         }
       },
       changePrescribingNumber(scope) {
-        //  var max_number = 0 
+        //  var max_number = 0
         //  if(scope.row.prescribing_number_unit == scope.row.drug.max_unit){
-        //     max_number = parseInt(scope.row.prescribing_number) * scope.row.drug.min_number 
+        //     max_number = parseInt(scope.row.prescribing_number) * scope.row.drug.min_number
         //  }
         //  if(scope.row.prescribing_number_unit == scope.row.drug.min_unit){
         //    max_number = parseInt(scope.row.prescribing_number)
@@ -527,7 +527,7 @@
         //        if(adviceList.prescribing_number_unit == adviceList.drug.min_unit){
         //           out_count = adviceList.prescribing_number
         //        }
-               
+
         //        //如果更改的数量大于修改之前的数量
         //        if(max_number > out_count){
         //          if((max_number - out_count)>stock_number){
@@ -543,7 +543,7 @@
         //     this.$message.error(scope.row.drug_name + '库存不足')
         //    }
         // }
-        
+
 
         if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
           if (parseInt(scope.row.prescribing_number) > scope.row.drug.total) {
@@ -604,7 +604,7 @@
         }
         return num
       },
-     
+
     }, mounted() {
       this.getInitData()
 

src/xt_pages/outpatientDoctorStation/components/prescriptionTemplateTable.vue

@@ -16,22 +16,22 @@
                 </template>
             </el-table-column>
 
-            <el-table-column align="center" prop="single_dose" width="120" label="单次用量">
-                <template slot-scope="scope">
-                    <div style="display:flex;align-items:center;">
-                        <el-input v-model="scope.row.single_dose" @input="getSingleDose(scope)"
-                                  style="width:50%;"></el-input>
-                        <!-- <div>{{scope.row.single_dose_unit}}</div> -->
-                        <el-select v-model="scope.row.single_dose_unit" placeholder="请选择" style="width:50%;"
-                                   @change="getAllChange(scope)">
-                            <el-option :label="scope.row.drug.min_unit" :value="scope.row.drug.min_unit"></el-option>
-                            <el-option :label="scope.row.drug.dose_unit"
-                                       v-if="scope.row.drug.dose_unit != scope.row.drug.min_unit"
-                                       :value="scope.row.drug.dose_unit"></el-option>
-                        </el-select>
-                    </div>
-                </template>
-            </el-table-column>
+          <el-table-column align="center" prop="single_dose" width="120" label="单次用量">
+            <template slot-scope="scope">
+              <div style="display:flex;align-items:center;">
+                <el-input v-model="scope.row.single_dose" @input="getAllChange(scope)"
+                          style="width:50%;"></el-input>
+                <!-- <div>{{scope.row.single_dose_unit}}</div> -->
+                <el-select v-model="scope.row.single_dose_unit" placeholder="请选择" style="width:50%;"
+                           @change="getAllChange(scope)">
+                  <el-option :label="scope.row.drug.min_unit" :value="scope.row.drug.min_unit"></el-option>
+                  <el-option :label="scope.row.drug.dose_unit"
+                             v-if="scope.row.drug.dose_unit != scope.row.drug.min_unit"
+                             :value="scope.row.drug.dose_unit"></el-option>
+                </el-select>
+              </div>
+            </template>
+          </el-table-column>
             <el-table-column align="center" prop="delivery_way" width="100" label="用法">
                 <template slot-scope="scope">
                     <el-select v-model="scope.row.delivery_way" placeholder="请选择">
@@ -564,7 +564,41 @@
         //     this.$message.error(scope.row.drug_name + '库存不足')
         //   }
         // }
+      },      getAllChange(scope) {
+        if (scope.row.drug.min_unit == scope.row.single_dose_unit) {
+          if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
+            console.log(1)
+            scope.row.prescribing_number = scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)
+          } else {
+            console.log(12)
+            scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1)) * (scope.row.day ? scope.row.day : 1) / scope.row.drug.min_number)
+          }
+        } else {
+          if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
+            console.log(123)
+            scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)) / scope.row.drug.dose)
+          } else {
+            console.log(1234)
+            scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)) / scope.row.drug.dose / scope.row.drug.min_number)
+          }
+        }
+        if (scope.row.prescribing_number == 0) {
+          scope.row.prescribing_number = 1
+        }
+        if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
+          // scope.row.retail_price = scope.row.drug.min_number / scope.row.retail_price
+          if (scope.row.prescribing_number > scope.row.drug.total) {
+            this.$message.error(scope.row.drug_name + '库存不足')
+          }
+        } else {
+          if ((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.total) {
+            this.$message.error(scope.row.drug_name + '库存不足')
+          }
+          // scope.row.retail_price = scope.row.drug.retail_price * scope.row.prescribing_number
+        }
+
       },
+
       getSingleDose(scope) {
         this.prescription.advices[scope.$index].prescribing_number = scope.row.single_dose * scope.row.day
       },

src/xt_pages/outpatientDoctorStation/template/printOne.vue

@@ -2,9 +2,9 @@
   <div id='prescriptionPrint'>
     <div v-for="(item,index) in advicePrint" :key="index">
       <div id='prescription-print' class="prescription-print" style="page-break-after: always;">
-          <div class="printTitle" v-if="item.med_type == '1111'">{{orgname}}第一类精神处方笺</div>
-          <div class="printTitle"  v-if="item.med_type == '1112'">{{orgname}}第二类精神处方笺</div>
-          <div class="printTitle" v-if="item.med_type != '1111' && item.med_type != '1112'">{{orgname}}处方笺</div>
+          <div class="printTitle" v-if="prescriptions[index].med_type == '1111'">{{orgname}}第一类精神处方笺</div>
+          <div class="printTitle"  v-if="prescriptions[index].med_type == '1112'">{{orgname}}第二类精神处方笺</div>
+          <div class="printTitle" v-if="prescriptions[index].med_type != '1111' && prescriptions[index].med_type != '1112'">{{orgname}}处方笺</div>
           <!--<div class="printTitle">{{orgname}}处方笺</div>-->
           <div class="infoTitle">
               <p>姓名：{{item.patient.name?item.patient.name:""}}</p>

src/xt_pages/outpatientDoctorStation/template/printSix.vue

@@ -6,14 +6,14 @@
         class="prescription-print"
         style="page-break-after: always"
       >
-        <div class="printTitle" v-if="prescriptions[0].med_type == '1111'">
+        <div class="printTitle" v-if="prescriptions[index].med_type == '1111'">
           {{ orgname }}第一类精神处方笺
         </div>
-        <div class="printTitle" v-if="prescriptions[0].med_type == '1112'">
+        <div class="printTitle" v-if="prescriptions[index].med_type == '1112'">
           {{ orgname }}第二类精神处方笺
         </div>
         <div
-            v-if="prescriptions[0].med_type != '1112' && prescriptions[0].med_type != '1111'"
+            v-if="prescriptions[index].med_type != '1112' && prescriptions[index].med_type != '1111'"
           class="printTitle"
         >
           {{ orgname }}处方笺  普通