Merge remote-tracking branch 'origin/20201109_pc_vue_new_branch' into 20201109_pc_vue_new_branch

src/xt_pages/outpatientTool/components/detailStatistics.vue

@@ -48,6 +48,7 @@
     <el-table :data="tableData" border :row-style="{ color: '#303133' }" ref="table"
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
               max-height="600"
+              show-summary
               v-loading="detail_loading"
               highlight-current-row>
       <el-table-column type="index" label="序号" width="60px" align="center">
@@ -55,15 +56,15 @@
           {{scope.row.index}}
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="name" label="处方日期">
+      <el-table-column align="center" label="处方日期">
         <template slot-scope="scope">{{getTime(scope.row.record_date)}}</template>
       </el-table-column>
-      <el-table-column align="center" prop="name" label="费用编码">
+      <el-table-column align="center" label="费用编码">
         <template slot-scope="scope">
           {{scope.row.number}}
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="name" label="项目名称">
+      <el-table-column align="center" label="项目名称">
         <template slot-scope="scope">
           <span v-if="scope.row.advice_id > 0">{{scope.row.advice.advice_name}}</span>
           <span v-if="scope.row.project_id > 0">
@@ -72,7 +73,7 @@
           </span>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="name" label="规格">
+      <el-table-column align="center" label="规格">
         <template slot-scope="scope">
           <span v-if="scope.row.advice_id > 0">{{scope.row.advice.drug.dose}}{{scope.row.advice.drug.dose_unit}}*{{scope.row.advice.drug.min_number}}{{scope.row.advice.drug.min_unit}}/{{scope.row.advice.drug.max_unit}}</span>
           <span v-if="scope.row.project_id > 0">
@@ -81,12 +82,12 @@
           </span>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="name" label="数量">
+      <el-table-column align="center"  label="数量">
         <template slot-scope="scope">
           {{scope.row.cnt}}
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="name" label="单位">
+      <el-table-column align="center" label="单位">
         <template slot-scope="scope">
           <span v-if="scope.row.advice_id > 0">{{scope.row.advice.prescribing_number_unit}}</span>
           <span v-if="scope.row.project_id > 0">
@@ -95,18 +96,29 @@
           </span>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="name" label="单价">
+      <el-table-column align="center" label="单价">
         <template slot-scope="scope">
           {{scope.row.pric}}
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="name" label="金额">
+      <el-table-column align="center" label="金额" prop="total_price">
         <template slot-scope="scope">
           <div>
             {{scope.row.total_price}}
           </div>
         </template>
       </el-table-column>
+      <el-table-column align="center" prop="name" label="备注">
+        <template slot-scope="scope">
+          <div>
+            <span v-if="scope.row.advice_id > 0">{{scope.row.advice.remark}}</span>
+            <span v-if="scope.row.project_id > 0">
+              <span v-if="scope.row.project.type == 2">{{scope.row.project.remark}}</span>
+              <span v-if="scope.row.project.type == 3">{{scope.row.project.remark}}</span>
+            </span>
+          </div>
+        </template>
+      </el-table-column>
      
     </el-table>
     <div style="display:flex;justify-content: space-around;">
@@ -222,8 +234,8 @@ 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)
-          console.log("tabledata23233232233232",this.tableData)
+          // this.tableData.push(obj)cccc
+          // console.log("tabledata23233232233232",this.tableData)
           var new_arr = []
        
           if(this.keywords!=""){
@@ -250,10 +262,11 @@ export default {
             }
             var objs = {index:"合计",total_price:0,record_date:"0"}
             objs.total_price = this.getPrice(new_arr)
-            new_arr.push(objs)
+            // new_arr.push(objs)
             
             this.tableData = new_arr
           }
+
            if(this.id == 1){
               var obj = {index:"合计",total_price:0,record_date:"0"}
               var new_arr = []
@@ -266,7 +279,7 @@ export default {
               }
               this.tableData = []
               obj.total_price = this.getPrice(new_arr)
-              new_arr.push(obj)
+              // new_arr.push(obj)
               this.tableData = new_arr
            }
           if(this.id == 2){
@@ -284,8 +297,8 @@ export default {
             console.log("项目new_arr",new_arr)
             this.tableData = []
             obj.total_price = this.getPrice(new_arr)
-            console.log("ar3233223232",new_arr)
-            new_arr.push(obj)
+            // console.log("ar3233223232",new_arr)
+            // new_arr.push(obj)
             this.tableData = new_arr
             }
 
@@ -303,15 +316,15 @@ export default {
             }
             this.tableData = []
             obj.total_price = this.getPrice(new_arr)
-            new_arr.push(obj)
-            console.log("new_arr2332323232",new_arr)
+            // new_arr.push(obj)
+            // console.log("new_arr2332323232",new_arr)
             this.tableData = new_arr
           }          
        }
      })
     },
     getAllPice(){
-     console.log("表哥233323232323223",this.tableData)
+    //  console.log("表哥233323232323223",this.tableData)
       var total_price = 0
       for(let i=0;i<this.tableData.length;i++){
         if(this.tableData[i].index =="合计"){
@@ -321,7 +334,7 @@ export default {
       return total_price
     },
     getActPay(){
-      console.log("list2332323232323232",this.list)
+      // console.log("list2332323232323232",this.list)
       var act_pay = 0
       for(let i=0;i<this.list.length;i++){
         for(let j=0;j<this.list[i].orders.length;j++){

src/xt_pages/outpatientTool/components/gatherStatistics.vue

@@ -49,17 +49,18 @@
     <el-table :data="tableList" border :row-style="{ color: '#303133' }" ref="table"
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
               max-height="600"
+              show-summary
               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>
       </el-table-column>
-      <el-table-column align="center" prop="name" label="处方日期">
+      <el-table-column align="center" label="处方日期">
         <template slot-scope="scope">
           <span v-if="scope.row.record_date > 0">{{getTimes(scope.row.record_date)}} </span> 
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="name" label="费用分类">
+      <el-table-column align="center" label="费用分类">
         <template slot-scope="scope">
            <span v-if="scope.row.type == 1">
               {{getAdviceMedChrgintmType(scope.row.name)}}
@@ -72,34 +73,34 @@
            </span>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="name" label="项目名称">
+      <el-table-column align="center" label="项目名称">
         <template slot-scope="scope">
           <span>{{scope.row.name}}</span>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="name" label="规格型号">
+      <el-table-column align="center" label="规格型号">
         <template slot-scope="scope">
           {{ scope.row.spec }}
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="name" label="数量">
+      <el-table-column align="center" label="数量">
         <template slot-scope="scope">
           {{ scope.row.count }}
           {{ scope.row.unit }}
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="name" label="单价">
+      <el-table-column align="center" label="单价">
         <template slot-scope="scope">
           {{scope.row.price}}
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="name" label="金额">
+      <el-table-column align="center" label="金额" prop="total_all">
         <template slot-scope="scope">
           <span v-if="scope.row.is_total == 1">{{ scope.row.total }}</span>  
           <span v-if="scope.row.is_total == 2">{{ (scope.row.price * scope.row.count).toFixed(2) }}</span>  
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="name" label="医保类别">
+      <el-table-column align="center" label="医保类别">
         <template slot-scope="scope">
          <span v-if="balanceAccountsType == 2">{{getChrgitmLv(scope.row.chrgitm_lv)}}</span>
 
@@ -202,6 +203,7 @@ export default {
       order_info_list:[],
       balanceAccountsType:0,
       medicalInsuranceLevelList:[],
+      id:0,
     }
   },
   methods: {
@@ -217,7 +219,7 @@ export default {
         }
         var obj ={index:"合计",is_total:1,total:0}
         obj.total = this.getPrice(new_arr)
-        new_arr.push(obj)
+        // new_arr.push(obj)
         this.tableList = []
         this.tableList = new_arr
       }else{
@@ -236,50 +238,9 @@ export default {
       this.getGatherDetailList()
     },
     changeItem(id) {
-      if(id == 0){
-        this.tableList = []
-        this.getGatherDetailList()
-      }
-      
-      if(id == 1){
-       var new_arr = []
-       for(let i=0;i<this.tableList.length;i++){
-        if(this.tableList[i].is_total != 1){
-          if(this.tableList[i].type == 1){
-            new_arr.push(this.tableList[i])
-          }  
-        }
-       }
-       this.tableList = []
-       this.tableList = new_arr
-      }
-      if(id == 2){
-       var new_arr = []
-     
-       for(let i=0;i<this.tableList.length;i++){
-        if(this.tableList[i].is_total != 1){
-          if(this.tableList[i].type == 2){
-            new_arr.push(this.tableList[i])
-          }  
-        }
-       }
-       this.tableList = []
-       this.tableList = new_arr
-      }
-      if(id == 3){
-       console.log("tabl4233223232323323223",this.tableList)
-       var new_arr = []
-       for(let i=0;i<this.tableList.length;i++){
-        if(this.tableList[i].is_total != 1){
-          if(this.tableList[i].project_type == 3){
-            new_arr.push(this.tableList[i])
-          }  
-        }
-       }
-       console.log("new_ar3232332323232233223",new_arr)
-       this.tableList = []
-       this.tableList = new_arr
-      }
+      this.id = id
+      this.tableList = []
+      this.getGatherDetailList()
     },
     getGatherDetailList() {
       let start_time = this.chargeDate[0]
@@ -302,16 +263,16 @@ export default {
             this.his_hospital = response.data.data.his_hospital
 
             var order_info = response.data.data.order_info
-           
-            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)
+            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
+              this.setMonthPrescription(prescription)
             }
-            console.log("order_info32323232323232233232323232",order_info)
             this.order_info_list = order_info
-            var prescription = response.data.data.prescription
           
-            this.setMonthPrescription(prescription)
             this.balanceAccountsType = response.data.data.balanceAccountsType
 
             this.medicalInsuranceLevelList = response.data.data.medicalInsuranceLevelList
@@ -436,8 +397,7 @@ export default {
                 return cur
               }, []) // 设置cur默认类型为数组，并且初始值为空的数组
               let tempOrderInfo = []
-              console.log("med_chrgitm_type323223322323233223",med_chrgitm_types)
-              console.log("order_info232322332323232322323",order_info)
+            
               for (let i = 0; i < med_chrgitm_types.length; i++) {
                 let obj = {
                   total: 0,
@@ -449,7 +409,7 @@ export default {
                     tempDetails.push(order_info[b])
                   }
                 }
-                console.log("tempDetails2332323232322323",tempDetails)
+                
               
                 obj.details = this.setNewData(tempDetails)
                
@@ -471,7 +431,49 @@ export default {
                 }
                
              }
+
+             
+    
           }
+
+           if(this.id == 1){
+             var new_arr = []
+             for(let i=0;i<this.tableList.length;i++){
+              if(this.tableList[i].is_total != 1){
+                if(this.tableList[i].type == 1){
+                  new_arr.push(this.tableList[i])
+                }  
+              }
+             }
+             this.tableList = []
+             this.tableList = new_arr
+            }
+            if(this.id == 2){
+             var new_arr = []
+          
+             for(let i=0;i<this.tableList.length;i++){
+              if(this.tableList[i].is_total != 1){
+                if(this.tableList[i].project_type == 2){
+                  new_arr.push(this.tableList[i])
+                }  
+              }
+             }
+             this.tableList = []
+             this.tableList = new_arr
+            }
+            if(this.id == 3){
+             var new_arr = []
+             for(let i=0;i<this.tableList.length;i++){
+              if(this.tableList[i].is_total != 1){
+                if(this.tableList[i].project_type == 3){
+                  new_arr.push(this.tableList[i])
+                }  
+              }
+             }
+             console.log("this.tableist2332323223323223",this.tableList)
+             this.tableList = []
+             this.tableList = new_arr
+            }
         }
      })
     },
@@ -744,7 +746,7 @@ 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})
+        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})
      },
      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})
@@ -850,7 +852,7 @@ export default {
             count = count + parseFloat(project_month_prescriptions.project[a].count)
             obj['price'] = parseFloat(project_month_prescriptions.project[a].price)
             obj['remark'] = project_month_prescriptions.project[a].remark
-            obj['type'] = 2
+            obj['type'] = 3
             obj['record_date'] = project_month_prescriptions.project[a].record_date
             obj['is_total'] = 2
           }
@@ -863,10 +865,10 @@ export default {
       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)
-
-      console.log("hh2323323232322323233223",this.tableList)
+      // this.tableList.push(objOne)
     },
 
     getTotalPrice(val){

src/xt_pages/outpatientTool/gatherPrint.vue

@@ -311,6 +311,70 @@
              }
           }
         }
+
+        if(this.$route.query.id == 1){
+          var new_arr = []
+          var objOne = {index:"合计",is_total:1,total:0}
+          objOne.total = this.getTotalPriceTwo(this.tableList)
+          for(let i=0;i<this.tableList.length;i++){
+          if(this.tableList[i].is_total != 1){
+            if(this.tableList[i].type == 1){
+              new_arr.push(this.tableList[i])
+            }  
+           }
+          }
+          new_arr.push(objOne)
+          this.tableList = []
+          this.tableList = new_arr
+        }
+        if(this.$route.query.id == 2){
+          var new_arr = []
+          var objOne = {index:"合计",is_total:1,total:0}
+          objOne.total = this.getTotalPriceTwo(this.tableList)
+          for(let i=0;i<this.tableList.length;i++){
+          if(this.tableList[i].is_total != 1){
+            if(this.tableList[i].project_type == 2){
+              new_arr.push(this.tableList[i])
+            }  
+          }
+          }
+          this.tableList = []
+          new_arr.push(objOne)
+          this.tableList = new_arr
+        }
+        if(this.$route.query.id == 3){
+          console.log("2323232332233232322332",this.tableList)
+          var new_arr = []
+          var objOne = {index:"合计",is_total:1,total:0}
+          objOne.total = this.getTotalPriceTwo(this.tableList)
+          for(let i=0;i<this.tableList.length;i++){
+          if(this.tableList[i].is_total != 1){
+            if(this.tableList[i].project_type == 3){
+              new_arr.push(this.tableList[i])
+            }  
+           }
+          }
+          new_arr.push(objOne)
+          this.tableList = []
+          this.tableList = new_arr
+        }
+        console.log("keyworde23232322332323232233232",this.$route.query.keyword)
+        
+        if(this.$route.query.keyword!=""){
+          var new_arr = []
+          for(let i=0;i<this.tableList.length;i++){
+            if(this.tableList[i].is_total!=1){
+              if(this.tableList[i].name.indexOf(this.$route.query.keyword) >-1){
+                  new_arr.push(this.tableList[i])
+                }
+              }
+          }
+          var obj ={index:"合计",is_total:1,total:0}
+          obj.total = this.getTotalPriceTwo(new_arr)
+          new_arr.push(obj)
+          this.tableList = []
+          this.tableList = new_arr
+        }
      })
     },
      getAdviceName(id){
@@ -727,6 +791,15 @@
       }
       return total_price.toFixed(2)
     },
+    getTotalPriceTwo(val){
+      var total_price = 0
+      for(let i=0;i<val.length;i++){
+        if(val[i].is_total!=1){
+          total_price +=val[i].count * val[i].price
+        }
+      }
+      return total_price.toFixed(2)
+    },
     getAdviceMedChrgintmType(name){
       var med_chrgitm_type = ""
       for(let i=0;i<this.order_info_list.length;i++){
@@ -1014,8 +1087,6 @@
       return total_price.toFixed(2)  
     },
     getBedName(id){
-      console.log("2332233223232323",id)
-      console.log("bed_number23223232232323232",this.bedNumber)
       var bed_number = ""
       for(let i=0;i<this.bedNumber.length;i++){
         if(id == this.bedNumber[i].id){