518合并代码

src/xt_pages/outpatientTool/components/detailStatistics.vue

@@ -177,6 +177,8 @@ export default {
       list:[],
       his_patient:{},
       id:0,
+      start_time:"",
+      end_time:"",
     }
   },
   methods: {
@@ -194,6 +196,8 @@ export default {
      this.getHisSummaryDetailList()
     },
     changeDate() {
+      this.start_time = this.chargeDate[0]
+      this.end_time = this.chargeDate[1]
       this.getHisSummaryDetailList()
     },
     changeItem(id) {
@@ -204,6 +208,7 @@ export default {
     getHisSummaryDetailList() {
       let start_time = this.chargeDate[0]
       let end_time = this.chargeDate[1]
+      
       let params = {
         patient_id:this.patient_id,
         start_time: start_time,
@@ -234,10 +239,10 @@ export default {
             obj.total_price += (this.tableData[i].cnt * this.tableData[i].pric)  
           }
           obj.total_price = (obj.total_price).toFixed(2)
-          // this.tableData.push(obj)cccc
-          // console.log("tabledata23233232233232",this.tableData)
+          
           var new_arr = []
-       
+           
+        
           if(this.keywords!=""){
             for(let i=0;i<this.tableData.length;i++){
               if(this.tableData[i].index!="合计"){
@@ -262,8 +267,6 @@ export default {
             }
             var objs = {index:"合计",total_price:0,record_date:"0"}
             objs.total_price = this.getPrice(new_arr)
-            // new_arr.push(objs)
-            
             this.tableData = new_arr
           }
 
@@ -316,10 +319,10 @@ export default {
             }
             this.tableData = []
             obj.total_price = this.getPrice(new_arr)
-            // new_arr.push(obj)
-            // console.log("new_arr2332323232",new_arr)
             this.tableData = new_arr
-          }          
+          }      
+          
+          console.log("hh233223233232323232322332",this.tableData)
        }
      })
     },
@@ -367,7 +370,7 @@ export default {
       return maf_pay
     },
     toPrint(){
-      this.$router.push({path:"/hisTool/detailPrint?patient_id="+this.patient_id+"&start_time="+this.chargeDate[0]+"&end_time="+this.chargeDate[1]+"&type="+this.item_type +"&keyword="+this.keywords+"&id="+this.id+"&balance_accounts_type="+this.his_patient.balance_accounts_type})
+      this.$router.push({path:"/hisTool/detailPrint?patient_id="+this.patient_id+"&start_time="+this.start_time+"&end_time="+this.end_time+"&type="+this.item_type +"&keyword="+this.keywords+"&id="+this.id+"&balance_accounts_type="+this.his_patient.balance_accounts_type})
     },
     getPrice(val){
       var total_price = 0
@@ -379,6 +382,8 @@ export default {
 
   },
   created() {
+    this.start_time = this.chargeDate[0]
+    this.end_time = this.chargeDate[1]
     this.getHisSummaryDetailList()
   },
   watch:{

src/xt_pages/outpatientTool/components/gatherStatistics.vue

@@ -53,7 +53,9 @@
               v-loading="detail_loading"
               highlight-current-row>
       <el-table-column type="index" label="序号" width="60px" align="center">
-           <template slot-scope="scope">{{scope.row.index}}</template>
+           <template slot-scope="scope">
+           {{scope.row.index}}
+           </template>
       </el-table-column>
       <el-table-column align="center" label="处方日期">
         <template slot-scope="scope">
@@ -121,7 +123,6 @@
     </el-table>
      <div>
       <div class="listInfo">
-            <!-- <div>西药：{{westernMedicineCostTotal}}</div> -->
             <div>西药：{{getWesternMedicineCostTotal()}}</div>
             <div>中成药：{{getChineseTraditionalMedicineCostTotal()}}</div>
             <div>中草药：{{getChineseTotal()}}</div>
@@ -204,6 +205,8 @@ export default {
       balanceAccountsType:0,
       medicalInsuranceLevelList:[],
       id:0,
+      start_time:"",
+      end_time:"",
     }
   },
   methods: {
@@ -219,7 +222,6 @@ export default {
         }
         var obj ={index:"合计",is_total:1,total:0}
         obj.total = this.getPrice(new_arr)
-        // new_arr.push(obj)
         this.tableList = []
         this.tableList = new_arr
       }else{
@@ -235,6 +237,8 @@ export default {
       return total_price.toFixed(2)
     },
     changeDate() {
+      this.start_time = this.chargeDate[0]
+      this.end_time = this.chargeDate[1]
       this.getGatherDetailList()
     },
     changeItem(id) {
@@ -263,16 +267,19 @@ export default {
             this.his_hospital = response.data.data.his_hospital
 
             var order_info = response.data.data.order_info
+
             if(order_info!=null){
               for(let i=0;i<order_info.length;i++){
                 order_info[i].med_chrgitm_type = this.getType(order_info[i].med_chrgitm_type)
                 order_info[i].chrgitm_lv  = this.getMedicineInsuranceType(order_info[i].chrgitm_lv)
              }
-              var prescription = response.data.data.prescription
+             var prescription = response.data.data.prescription
+            //  console.log("prescription2332232323233223",prescription)
               this.setMonthPrescription(prescription)
             }
+            // console.log("order_info233232323232323232",order_info)
             this.order_info_list = order_info
-          
+             
             this.balanceAccountsType = response.data.data.balanceAccountsType
 
             this.medicalInsuranceLevelList = response.data.data.medicalInsuranceLevelList
@@ -435,7 +442,7 @@ export default {
              
     
           }
-
+ 
            if(this.id == 1){
              var new_arr = []
              for(let i=0;i<this.tableList.length;i++){
@@ -474,6 +481,61 @@ export default {
              this.tableList = []
              this.tableList = new_arr
             }
+          
+            var new_arr_two = []
+            for(let i=0;i<this.tableList.length;i++){
+                if(this.tableList[i].advice_id > 0){
+                  this.tableList[i].const_type = this.getAdviceMedChrgintmType(this.tableList[i].name)
+                }
+                if(this.tableList[i].project_id > 0){
+                  this.tableList[i].const_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)
+                }
+               
+               if(this.tableList[i].const_type!=''){
+                  new_arr_two.push(this.tableList[i])
+               }
+
+             }
+           
+            this.tableList = []
+            this.tableList = new_arr_two
+          
+            console.log("分解死23232332332323223322332323232",this.tableList)
+            let dataInfo = {}
+            this.tableList.forEach((item, index) => {
+              let { item_id } = item
+              if (!dataInfo[item_id]) {
+                dataInfo[item_id] = {
+                  item_id,
+                  child: [],
+                  count_number:0,
+                  name:item.name,
+                  price:item.price,
+                  record_date:item.record_date,
+                }
+              }
+              dataInfo[item_id].child.push(item)
+            })
+            
+            let list = Object.values(dataInfo)
+            
+
+            list.forEach((it,index)=>{
+              for(let i=0;i<this.tableList.length;i++){
+                if(it.item_id == this.tableList[i].item_id){
+                    it.child.push(this.tableList[i])
+                }
+              }
+            })
+           console.log("list23232332323223322323",list)
+           for(let i=0;i<list.length;i++){
+            for(let j=0;j<list[i].child.length;j++){
+                list[i].count_number += list[i].child[j].count
+            }
+           }
+
+            console.log("我的list23223233223322323",list)
+             
         }
      })
     },
@@ -496,12 +558,12 @@ export default {
      return project_name
     },
     setNewData(details) {
-     
         let drug_ids = []
         let project_ids = []
 
         for (let i = 0; i < details.length; i++) {
           if (details[i].advice && details[i].advice.id > 0 && details[i].advice.prescription && details[i].advice.prescription.type == 1) { //药品
+            
             let obj = {
               id: details[i].advice.drug_id,
               price: details[i].advice.price,
@@ -519,10 +581,12 @@ export default {
           }
 
         }
+        
         let new_drug_ids = this.unique(drug_ids)
         let new_project_ids = this.unique(project_ids)
         let list = []
-       
+         
+         console.log("new_drug_ids232323323232332332233223",new_drug_ids)
         if (new_drug_ids.length > 0 && new_project_ids.length == 0) {
           for (let i = 0; i < new_drug_ids.length; i++) {
             let obj = {}
@@ -545,6 +609,28 @@ export default {
             list.push(obj)
 
           }
+          console.log("list23323232233232",list)
+
+          // let dataInfo = {}
+          // list.forEach((item, index) => {
+          //   let { name } = item
+          //   if (!dataInfo[name]) {
+          //     dataInfo[name] = {
+          //       name,
+          //       child: []
+          //     }
+          //   }
+          // })
+          // let listOne = Object.values(dataInfo)
+          // listOne.forEach((item,index)=>{
+          //   for(let i=0;i<list.length;i++){
+          //      if(listOne[i].name == list[i].name){
+          //          listOne[i].child.push(list[i])
+          //      }
+          //   }
+          // })
+          // console.log("listONE2322323322323",listOne)
+         
         }
         if (new_drug_ids.length == 0 && new_project_ids.length > 0) {
           for (let i = 0; i < new_project_ids.length; i++) {
@@ -746,10 +832,10 @@ export default {
        }
      },
      toPrint(){
-        this.$router.push({path:"/hisTool/gatherPrint?patient_id="+this.patient_id+"&start_time="+this.chargeDate[0]+"&end_time="+this.chargeDate[1]+"&type="+this.item_type +"&keyword="+this.keywords+"&id="+this.id})
+        this.$router.push({path:"/hisTool/gatherPrint?patient_id="+this.patient_id+"&start_time="+this.start_time+"&end_time="+this.end_time+"&type="+this.item_type +"&keyword="+this.keywords+"&id="+this.id})
      },
      toPrintInvoice(){
-       this.$router.push({path:"/hisTool/gatherPrintInvoice?patient_id="+this.patient_id+"&start_time="+this.chargeDate[0]+"&end_time="+this.chargeDate[1]+"&type="+this.item_type +"&keyword="+this.keywords})
+       this.$router.push({path:"/hisTool/gatherPrintInvoice?patient_id="+this.patient_id+"&start_time="+this.start_time+"&end_time="+this.end_time+"&type="+this.item_type +"&keyword="+this.keywords})
      },
      setMonthPrescription(month_prescriptions) {
       let drug_month_prescriptions = {
@@ -811,6 +897,7 @@ export default {
             obj['is_total'] = 2
             obj['chrgitm_lv'] =  drug_month_prescriptions.advices[a].drug.medical_insurance_level 
             obj['unit'] = drug_month_prescriptions.advices[a].prescribing_number_unit
+            obj['item_id'] = drug_ids[i].id + "/" + drug_ids[i].price
             count = count + drug_month_prescriptions.advices[a].prescribing_number
 
           }
@@ -818,7 +905,6 @@ export default {
         obj['count'] = count
         this.tableList.push(obj)
       }
-
       for (let i = 0; i < project_ids.length; i++) {
         let obj = {}
         let count = 0
@@ -833,6 +919,7 @@ export default {
               obj['spec'] =  project_month_prescriptions.project[a].project.project_name
               obj['unit'] = project_month_prescriptions.project[a].unit
               obj['chrgitm_lv'] =  project_month_prescriptions.project[a].project.medical_coverage
+              obj['item_id'] = project_ids[i].id +"/"+ project_ids[i].price
             }else if (project_month_prescriptions.project[a].type == 3){
               obj['project_id'] = project_month_prescriptions.project[a].id
               obj['name'] = project_month_prescriptions.project[a].good_info.good_name
@@ -841,6 +928,7 @@ export default {
               obj['spec'] = project_month_prescriptions.project[a].good_info.specification_name
               obj['unit'] = project_month_prescriptions.project[a].good_info.packing_unit
               obj['chrgitm_lv'] =  project_month_prescriptions.project[a].good_info.medical_insurance_level
+              obj['item_id'] = project_ids[i].id + "/" + project_ids[i].price
             }
             obj['single_dose'] = project_month_prescriptions.project[a].single_dose
             obj['delivery_way'] = project_month_prescriptions.project[a].delivery_way
@@ -859,16 +947,15 @@ export default {
         }
         obj['count'] = count
         this.tableList.push(obj)
-
       }
+     console.log("表格 2323323232323323323232323232323",this.tableList)
+           
       var objOne = {index:"合计",is_total:1,total:0}
       objOne.total = this.getTotalPrice(this.tableList)
       for(let i=0;i<this.tableList.length;i++){
         this.tableList[i].index = i + 1
         this.tableList[i].total_all = (this.tableList[i].count * this.tableList[i].price).toFixed(2)
-        // console.log(this.tableList[i].count,'opop')
       }
-      // this.tableList.push(objOne)
     },
 
     getTotalPrice(val){
@@ -1028,7 +1115,6 @@ export default {
         if(this.tableList[i].project_id > 0){
            this.tableList[i].drug_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)
          }
-         console.log("化验23233223322323",this.tableList[i].drug_type)
          if(this.tableList[i].drug_type == "化验费"){
             total_price += this.tableList[i].count * this.tableList[i].price
          }
@@ -1168,6 +1254,8 @@ export default {
 
   },
   created() {
+    this.start_time = this.chargeDate[0]
+    this.end_time = this.chargeDate[1]
     this.tableList = []
     this.getGatherDetailList()
 

src/xt_pages/outpatientTool/detailPrint.vue

@@ -10,19 +10,34 @@
       <div class="listInfo">
         <div>患者姓名：{{ patient.name }}</div>
         <div>性别：{{ patient.gender == 1 ? "男" : "女" }}</div>
-        <div>结算类别：{{ getType(his_patient.balance_accounts_type) }}</div>
+        <div>结算类别：
+          {{ getType(his_patient.balance_accounts_type) }}
+          {{getType(his_record_patient.balance_accounts_type)}}
+        </div>
         <div style="min-width:300px;">发票号码：{{order.fa_piao_number}}</div>
       </div>
       <div class="listInfo">
-        <div>住院/门诊号：{{his_patient.number}}</div>
-        <div>科室：{{ getDepartment(his_patient.departments) }}</div>
-        <div style="min-width:350px;">就诊流水号：{{ his_patient.number }}</div>
+        <div>住院/门诊号：
+          {{his_patient.number}}
+          {{his_record_patient.ipt_otp_no}}
+        </div>
+        <div>科室：
+          {{ getDepartment(his_patient.departments) }}
+          {{ getDepartment(his_record_patient.departments) }}
+        </div>
+        <div style="min-width:350px;">就诊流水号：
+          {{ his_patient.number }}
+          {{his_record_patient.number}}
+        </div>
       </div>
       <div class="listInfo">
         <div>总费用：{{ getAllPice() }}</div>
         <div>个人支付：
-          <span v-if="this.$route.query.balance_accounts_type == 2">{{ getAllPice() }}</span>
-          <span v-if="this.$route.query.balance_accounts_type != 2">{{ getActPay() }}</span>
+          <span v-if="this.$route.query.balance_accounts_type == 2 && his_patient.id >0">{{ getAllPice() }}</span>
+          <span v-if="this.$route.query.balance_accounts_type != 2 && his_patient.id >0">{{ getActPay() }}</span>
+          
+          <span v-if="his_record_patient.balance_accounts_type == 2">{{ getAllPice() }}</span>
+          <span v-if="his_record_patient.balance_accounts_type != 2">{{ getActPay() }}</span>
 
         </div>
         <div>基金支付记账：{{ getFundPaySumamt() }}</div>
@@ -126,6 +141,7 @@ export default {
         { value: 8, label: "医保自费" },
       ],
       order:{},
+      his_record_patient:{},
     };
   },
   methods: {
@@ -178,7 +194,8 @@ export default {
           this.patient = response.data.data.patient;
 
           this.his_patient = response.data.data.his_patient;
-
+         
+         this.his_record_patient = response.data.data.his_record_patient
 
           this.hisDepatment = response.data.data.hisDepatment;
 

src/xt_pages/outpatientTool/gatherPrint.vue

@@ -375,6 +375,24 @@
           this.tableList = []
           this.tableList = new_arr
         }
+
+      
+        var new_arr_two = []
+        for(let i=0;i<this.tableList.length;i++){
+            if(this.tableList[i].advice_id > 0){
+              this.tableList[i].const_type = this.getAdviceMedChrgintmType(this.tableList[i].name)
+            }
+            if(this.tableList[i].project_id > 0){
+              this.tableList[i].const_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)
+            }
+            
+            if(this.tableList[i].const_type!=''){
+              new_arr_two.push(this.tableList[i])
+            }
+
+          }
+          this.tableList = []
+          this.tableList = new_arr_two
      })
     },
      getAdviceName(id){

src/xt_pages/outpatientTool/gatherPrintInvoice.vue

@@ -901,7 +901,6 @@
         if(this.tableList[i].project_id > 0){
            this.tableList[i].drug_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)
          }
-         console.log("化验23233223322323",this.tableList[i].drug_type)
          if(this.tableList[i].drug_type == "化验费"){
             total_price += this.tableList[i].count * this.tableList[i].price
          }