518合并代码

src/router/modules/hisTool.js

@@ -83,7 +83,22 @@ export default {
       component: () => import('@/xt_pages/outpatientTool/zeroSummary'),
       name: 'zeroSummary',
       meta: { title: 'zeroSummary', noCache: true }
+    },
+    {
+      path: '/hisTool/detailPrint',
+      component: () => import('@/xt_pages/outpatientTool/detailPrint'),
+      name: 'detailPrint',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'detailPrint', noCache: true }
+    },
+    {
+      path: '/hisTool/gatherPrint',
+      component: () => import('@/xt_pages/outpatientTool/gatherPrint'),
+      name: 'gatherPrint',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'gatherPrint', noCache: true }
     }
-
   ]
 }

src/xt_pages/hospitalStation/components/deskRecord.vue

@@ -786,9 +786,9 @@ export default {
     this.getInitData();
     this.wayOptions = getDataConfig("patient", "reimbursement_ways");
 
-    if ((this.patientInfo.gender = 1)) {
+    if ((this.patientInfo.gender = 2)) {
       this.patientInfo.gender = "男";
-    } else if ((this.patientInfo.gender = 2)) {
+    } else if ((this.patientInfo.gender = 1)) {
       this.patientInfo.gender = "女";
     }
 

src/xt_pages/outpatientTool/components/detailStatistics.vue

@@ -17,17 +17,18 @@
         </el-select>
 
         <el-input
-            size="small"
-            style="width: 150px"
-            v-model="keywords"
-            class="filter-item"
+          size="small"
+          style="width: 150px"
+          v-model="keywords"
+          class="filter-item"
+          placeholder="请输入患者姓名"
         />
         <el-button
-            size="small"
-            style="margin: 0 10px"
-            class="filter-item"
-            type="primary"
-            @click="searchAction"
+          size="small"
+          style="margin: 0 10px"
+          class="filter-item"
+          type="primary"
+          @click="searchAction"
         >搜索
         </el-button>
         <el-date-picker
@@ -39,6 +40,7 @@
             @change="changeDate"
             end-placeholder="结束日期">
         </el-date-picker>
+        <el-button  type="primary" size="small" @click="toPrint">打印</el-button>
       </div>
       <div>
       </div>
@@ -99,10 +101,10 @@
      
     </el-table>
      <div>总费用:{{getAllPice()}}</div>
-     <div>个人支付:</div>
-     <div>基金支付记账:</div>
-     <div>补充医疗支付记账:</div>
-    <div>救助支付金额:</div>
+     <div>个人支付:{{getActPay()}}</div>
+     <div>基金支付记账:{{getFundPaySumamt()}}</div>
+     <div>补充医疗支付记账:{{getHifesPay()}}</div>
+    <div>救助支付金额:{{getMafPay()}}</div>
   </div>
 
   <!-- </div> -->
@@ -144,7 +146,8 @@ export default {
         { id: 3, name: '耗材' },
         { id: 2, name: '项目' }
 
-      ]
+      ],
+      list:[],
 
     }
   },
@@ -160,8 +163,7 @@ export default {
       }
      },
     searchAction(){
-
-
+     this.getHisSummaryDetailList()
     },
     changeDate() {
       this.getHisSummaryDetailList()
@@ -182,8 +184,9 @@ export default {
      getHisSummaryDetailList(params).then(response=>{
        if(response.data.state == 1){
           var list =  response.data.data.list
+          console.log("list23323232323232232323",list)
+          this.list = list
           this.tableData = []
-          // console.log("list23232332232322323",list)
           for(let i=0;i<list.length;i++){
             for(let j=0;j<list[i].orders.length;j++){
               for(let z=0;z<list[i].orders[j].order_info.length;z++){
@@ -202,8 +205,6 @@ export default {
           }
           obj.total_price = (obj.total_price).toFixed(2)
           this.tableData.push(obj)
-          
-          // console.log("tabledata",this.tableData)
        }
      })
     },
@@ -215,7 +216,48 @@ export default {
         }
       }
       return total_price
+    },
+    getActPay(){
+      console.log("hh23h323223323",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++){
+           act_pay +=this.list[i].orders[j].acct_pay
+        }
+      }
+      return act_pay
+    },
+    getFundPaySumamt(){
+      var fund_pay_sumamt = 0
+      for(let i=0;i<this.list.length;i++){
+        for(let j=0;j<this.list[i].orders.length;j++){
+           fund_pay_sumamt +=this.list[i].orders[j].fund_pay_sumamt
+        }
+      }
+      return fund_pay_sumamt
+    },
+    getHifesPay(){
+      var hifes_pay = 0
+      for(let i=0;i<this.list.length;i++){
+        for(let j=0;j<this.list[i].orders.length;j++){
+          hifes_pay +=this.list[i].orders[j].hifes_pay
+        }
+      }
+      return hifes_pay
+    },
+    getMafPay(){
+      var maf_pay = 0
+      for(let i=0;i<this.list.length;i++){
+        for(let j=0;j<this.list[i].orders.length;j++){
+          maf_pay +=this.list[i].orders[j].maf_pay
+        }
+      }
+      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})
     }
+
   },
   created() {
     this.getHisSummaryDetailList()

src/xt_pages/outpatientTool/components/gatherStatistics.vue

@@ -39,6 +39,7 @@
             @change="changeDate"
             end-placeholder="结束日期">
         </el-date-picker>
+        <el-button  type="primary" size="small" @click="toPrint">打印</el-button>
       </div>
       <div>
       </div>
@@ -54,7 +55,7 @@
       </el-table-column>
       <el-table-column align="center" prop="name" label="处方日期">
         <template slot-scope="scope">
-          {{getTime(scope.row.record_date)}}
+          <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="费用分类">
@@ -84,11 +85,16 @@
       </el-table-column>
       <el-table-column align="center" prop="name" label="金额">
         <template slot-scope="scope">
-          {{ (scope.row.price * scope.row.count).toFixed(2) }}
+          <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="医保类别">
-        <template slot-scope="scope"></template>
+        <template slot-scope="scope">
+         <span v-if="scope.row.chrgitm_lv== '01'">甲类</span>
+         <span v-if="scope.row.chrgitm_lv== '02'">乙类</span>
+         <span v-if="scope.row.chrgitm_lv== '03'">自费</span>
+        </template>
       </el-table-column>
 
     </el-table>
@@ -163,21 +169,25 @@ export default {
             return false
           } else {
             this.order = response.data.data.order
-            this.order['bedCostTotal'] = response.data.data.bedCostTotal
-            this.order['operationCostTotal'] = response.data.data.operationCostTotal
-            this.order['otherCostTotal'] = response.data.data.otherCostTotal
-            this.order['materialCostTotal'] = response.data.data.materialCostTotal
-            this.order['westernMedicineCostTotal'] = response.data.data.westernMedicineCostTotal
-            this.order['chineseTraditionalMedicineCostTotal'] = response.data.data.chineseTraditionalMedicineCostTotal
-            this.order['checkCostTotal'] = response.data.data.checkCostTotal
-            this.order['zhenChaCostTotal'] = response.data.data.zhenChaCostTotal
-            this.order['laboratoryCostTotal'] = response.data.data.laboratoryCostTotal
-            this.order['treatCostTotal'] = response.data.data.treatCostTotal
+            // console.log("order23323232323232332322323",response.data.data.order)
+            // for(let i=0;i<this.order.length;i++){
+            //   this.order['bedCostTotal'] = response.data.data.bedCostTotal
+            //   this.order['operationCostTotal'] = response.data.data.operationCostTotal
+            //   this.order['otherCostTotal'] = response.data.data.otherCostTotal
+            //   this.order['materialCostTotal'] = response.data.data.materialCostTotal
+            //   this.order['westernMedicineCostTotal'] = response.data.data.westernMedicineCostTotal
+            //   this.order['chineseTraditionalMedicineCostTotal'] = response.data.data.chineseTraditionalMedicineCostTotal
+            //   this.order['checkCostTotal'] = response.data.data.checkCostTotal
+            //   this.order['zhenChaCostTotal'] = response.data.data.zhenChaCostTotal
+            //   this.order['laboratoryCostTotal'] = response.data.data.laboratoryCostTotal
+            //   this.order['treatCostTotal'] = response.data.data.treatCostTotal
+            // }
+         
             this.patient = response.data.data.patient
             this.admin = response.data.data.admin_info
             this.his_hospital = response.data.data.his_hospital
             var order_info = response.data.data.order_info
-
+            // console.log("order_info2332323232323232323",order_info)
             if(this.$store.getters.xt_user.org_id == 10215 || this.$store.getters.xt_user.org_id == 0){
               //获取所有项目类型进行去重
               let med_chrgitm_types = []
@@ -217,12 +227,12 @@ export default {
               
               this.list.push(newobj)
             }else{
-              console.log("hh2332322323232332232332",order_info)
               //获取所有项目类型进行去重
               let med_chrgitm_types = []
               for (let i = 0; i < order_info.length; i++) {
                 med_chrgitm_types.push(order_info[i].med_chrgitm_type)
               }
+              // console.log("med_chrgitm_types23323332233232232323232332322332233",med_chrgitm_types)
               const obj = {}
               med_chrgitm_types = med_chrgitm_types.reduce((cur, next) => {
                 obj[next] ? '' : obj[next] = true && cur.push(next)
@@ -240,7 +250,7 @@ export default {
                     tempDetails.push(order_info[b])
                   }
                 }
-                console.log("tempdetail2323323232322332233223",tempDetails)
+                // console.log("tempdetail2323323232322332233223",tempDetails)
                 obj.details = this.setNewData(tempDetails)
 
                 obj.total = this.getTotal(obj.details)
@@ -248,12 +258,12 @@ export default {
                   total: obj.total,
                   is_total: 1,
                 })
-                console.log("obj3232232332323223",obj.details)
+                // console.log("obj3232232332323223",obj.details)
                 this.list =  this.list.concat(obj.details)
                 for(let i=0;i<this.list.length;i++){
                   this.list[i].index = i+1
                 }
-                console.log("list32233223233332232323232323",this.list)
+                // console.log("list32233223233332232323232323",this.list)
              }
           }
         }
@@ -278,7 +288,7 @@ export default {
      return project_name
     },
     setNewData(details) {
-      console.log("detail233223233223",details)
+      // console.log("detail233223233223",details)
         let drug_ids = []
         let project_ids = []
 
@@ -301,9 +311,12 @@ export default {
           }
 
         }
-   
+        // console.log("drug_ids232332322323",drug_ids)
+        // console.log("project_ids2323232332",project_ids)
         let new_drug_ids = this.unique(drug_ids)
         let new_project_ids = this.unique(project_ids)
+        // console.log("new23233232332322323323232",new_drug_ids)
+        // console.log("new_project_ids2332332323",new_project_ids)
         let list = []
         if (new_drug_ids.length > 0 && new_project_ids.length == 0) {
           for (let i = 0; i < new_drug_ids.length; i++) {
@@ -319,14 +332,16 @@ export default {
                 obj['price'] = parseFloat(details[a].pric)
                 obj['is_total'] = 2
                 obj['record_date'] = details[a].advice.record_date
+                obj['chrgitm_lv'] = details[a].chrgitm_lv
                 count = count + details[a].cnt
               }
             }
             obj['count'] = count
             list.push(obj)
+
           }
         }
-
+        //  console.log("list我的2323232323233223322332",list)
         if (new_drug_ids.length == 0 && new_project_ids.length > 0) {
           for (let i = 0; i < new_project_ids.length; i++) {
             let obj = {}
@@ -348,6 +363,7 @@ export default {
                 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)
+                obj['chrgitm_lv'] = details[a].chrgitm_lv
                 obj['is_total'] = 2
 
                 count = count + details[a].cnt
@@ -355,8 +371,65 @@ export default {
             }
             obj['count'] = count
             list.push(obj)
+          
           }
         }
+
+         if (new_drug_ids.length > 0 && new_project_ids.length > 0) {
+           for (let i = 0; i < new_drug_ids.length; i++) {
+            let obj = {}
+            let count = 0
+            for (let a = 0; a < details.length; a++) {
+              if (new_drug_ids[i].id == details[a].advice.drug_id && new_drug_ids[i].price == details[a].advice.price) {
+                obj['name'] = details[a].advice.advice_name
+                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['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)
+                obj['is_total'] = 2
+                obj['record_date'] = details[a].advice.record_date
+                obj['chrgitm_lv'] = details[a].chrgitm_lv
+                count = count + details[a].cnt
+              }
+            }
+            obj['count'] = count
+            list.push(obj)
+
+          }
+         
+          for (let i = 0; i < new_project_ids.length; i++) {
+            let obj = {}
+            let count = 0
+            for (let a = 0; a < details.length; a++) {
+              if (new_project_ids[i].id == details[a].project.project_id && new_project_ids[i].price == details[a].project.price) {
+                // console.log("hhha23322332233232332",details[a].project)
+              if( details[a].project.type == 2){
+                 obj['name'] = details[a].project.project.project_name
+                 obj['spec'] = ''
+                 obj['unit'] = details[a].project.project.unit
+
+               }else if(details[a].project.type == 3){
+                 obj['name'] = details[a].project.good_info.good_name
+                 obj['spec'] = ''
+                 obj['unit'] = details[a].project.good_info.packing_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)
+                obj['is_total'] = 2
+                obj['record_date'] = details[a].project.record_date
+                obj['chrgitm_lv'] = details[a].chrgitm_lv
+                count = count + details[a].cnt
+              }
+            }
+            obj['count'] = count
+            list.push(obj)
+          
+          }
+         }
+
+        // console.log("list我的2323232323233223322332",list)
         return list
       }, 
     
@@ -459,12 +532,25 @@ export default {
         return total.toFixed(2)
       },
       getTimes(time) {
-       return uParseTime(time, '{y}-{m}-{d}')
+       if(time < 0){
+         return ""
+       }else{
+        return uParseTime(time, '{y}-{m}-{d}')
+       }
      },
+     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})
+     }
   },
   created() {
     this.getGatherDetailList()
 
+  },
+  watch:{
+    "patient_id":function(){
+      this.patient_id = this.patient_id
+      this.getHisSummaryDetailList()
+    }
   }
 }
 </script>

src/xt_pages/outpatientTool/statistics.vue

@@ -75,9 +75,10 @@ export default {
       })
     },
     handleCurrentChange(row){
+      this.patient_id = 0
       this.patient_id =  row.id
       this.$refs.child.getHisSummaryDetailList()
-     
+      this.$refs.childOne.getGatherDetailList()
     },
 
   },