518合并代码

src/xt_pages/outpatientTool/components/detailStatistics.vue

@@ -86,6 +86,15 @@
           {{scope.row.cnt}}
         </template>
       </el-table-column>
+      <el-table-column align="center" prop="name" 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">
+            <span v-if="scope.row.project.type == 2">{{scope.row.project.project.unit}}</span>
+            <span v-if="scope.row.project.type == 3">{{scope.row.project.good_info.packing_unit}}</span>
+          </span>
+        </template>
+      </el-table-column>
       <el-table-column align="center" prop="name" label="单价">
         <template slot-scope="scope">
           {{scope.row.pric}}
@@ -184,7 +193,6 @@ export default {
         type: this.item_type,
         keyword: this.keywords
       }
-    //  console.log("patient_id 233232323232323",this.patient_id)
      getHisSummaryDetailList(params).then(response=>{
        if(response.data.state == 1){
           var list =  response.data.data.list
@@ -208,8 +216,8 @@ export default {
             obj.total_price += (this.tableData[i].cnt * this.tableData[i].pric)  
           }
           obj.total_price = (obj.total_price).toFixed(2)
-          // console.log("tabledate23232332233223",this.tableData)
           this.tableData.push(obj)
+          console.log("tabl2332322332323232323232323",this.tableData)
           var new_arr = []
        
           if(this.keywords!=""){

src/xt_pages/outpatientTool/components/gatherStatistics.vue

@@ -170,6 +170,13 @@ export default {
       list:[],
       his_patient:{},
       hisDepatment:[],
+      chineseTraditionalMedicineCostTotal:0,
+      checkCostTotal:0,
+      laboratoryCostTotal:0,
+      zhenChaCostTotal:0,
+      bedCostTotal:0,
+      materialCostTotal:0,
+      otherCostTotal:0,
     }
   },
   methods: {
@@ -223,7 +230,7 @@ export default {
               }, []) // 设置cur默认类型为数组，并且初始值为空的数组
 
               let tempOrderInfo = []
-
+              console.log("med_chrgitm_types3323232323232233",med_chrgitm_types)
               for (let i = 0; i < med_chrgitm_types.length; i++) {
                 let obj = {
                   total: 0,
@@ -422,7 +429,7 @@ export default {
      return project_name
     },
     setNewData(details) {
-      console.log("detail23332323232322332332322323232332",details)
+      // console.log("detail23332323232322332332322323232332",details)
         let drug_ids = []
         let project_ids = []
 
@@ -438,7 +445,7 @@ export default {
             let obj = {
               id: details[i].project.project_id,
               price: details[i].project.price,
-              record_date:details[i].advice.record_date
+              record_date:details[i].project.record_date
             }
             project_ids.push(obj)
 
@@ -480,14 +487,17 @@ export default {
               if (new_project_ids[i].id == details[a].project.project_id && new_project_ids[i].price == details[a].project.price) {
                if( details[a].project.type == 2){
                  obj['name'] = details[a].project.project.project_name
-                 obj['spec'] = ''
+                 obj['spec'] =  details[a].project.project.project_name
                  obj['unit'] = details[a].project.project.unit
+                 obj['record_date'] = details[a].project.record_date
+
                 
 
                }else if(details[a].project.type == 3){
                  obj['name'] = details[a].project.good_info.good_name
-                 obj['spec'] = ''
+                 obj['spec'] = details[a].project.good_info.specification_name
                  obj['unit'] = details[a].project.good_info.packing_unit
+                 obj['record_date'] = details[a].project.record_date
 
                }
                 obj['medicine_insurance_kind'] = this.getMedicineInsuranceType(details[a].chrgitm_lv)
@@ -495,7 +505,7 @@ export default {
                 obj['price'] = parseFloat(details[a].pric)
                 obj['chrgitm_lv'] = details[a].chrgitm_lv
                 obj['is_total'] = 2
-                obj['record_date'] = details[a].record_date
+               
                 count = count + details[a].cnt
               }
             }

src/xt_pages/outpatientTool/detailPrint.vue

@@ -35,6 +35,7 @@
           <td style="width: 17%; text-align: center">项目名称</td>
           <td style="width: 10%; text-align: center">规格</td>
           <td style="width: 13%; text-align: center">数量</td>
+          <td style="width: 13%; text-align: center">单位</td>
           <td style="width: 11%; text-align: center">单价(元)</td>
           <td style="width: 10%; text-align: center">金额</td>
         </tr>
@@ -76,6 +77,13 @@
           </td>
           <td style="width: 6%; text-align: center">
             {{ item.cnt }}
+          </td>
+           <td style="width: 6%; text-align: center">
+              <span v-if="item.advice_id > 0">{{item.prescribing_number_unit}}</span>
+              <span v-if="item.project_id > 0">
+                <span v-if="item.project.type == 2">{{item.project.project.unit}}</span>
+                <span v-if="item.project.type == 3">{{item.project.good_info.packing_unit}}</span>
+              </span>
           </td>
           <td style="width: 10%; text-align: center">
             {{ item.pric }}

src/xt_pages/outpatientTool/gatherPrint.vue

@@ -391,6 +391,7 @@
               id: details[i].advice.drug_id,
               price: details[i].advice.price,
               record_date:details[i].advice.advice_date
+              
             }
             drug_ids.push(obj)
           } else if (details[i].project && details[i].project.id > 0 && details[i].project.prescription && details[i].project.prescription.type == 2) { //项目
@@ -440,15 +441,15 @@
               if (new_project_ids[i].id == details[a].project.project_id && new_project_ids[i].price == details[a].project.price) {
                if( details[a].project.type == 2){
                  obj['name'] = details[a].project.project.project_name
-                 obj['spec'] = ''
+                 obj['spec'] = details[a].project.project.project_name
                  obj['unit'] = details[a].project.project.unit
-                
+                 obj['record_date'] = details[a].project.record_date
 
                }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['spec'] =  details[a].project.good_info.specification_name
+                 obj['unit'] =  details[a].project.good_info.packing_unit
+                 obj['record_date'] = details[a].project.record_date
 
                }
                 obj['medicine_insurance_kind'] = this.getMedicineInsuranceType(details[a].chrgitm_lv)