提交代码

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -60,6 +60,7 @@
       <printtwelve :info="info" v-if="org_id == 10480 "></printtwelve>
       <!-- 大冶 -->
       <printthirteen :info="info" v-if="org_id == 10510 || org_id == 0"></printthirteen>
+
       <printOne :info="info" v-if=" org_id != 9990 &&
             org_id != 10138 &&
             org_id != 9504 &&
@@ -1078,7 +1079,7 @@ export default {
                 that.info = response.data.data.info
                 that.p_admin = response.data.data.printor_admin
                 that.charge_admin = response.data.data.charge_admin
-
+                that.info['psn_cash_pay'] = response.data.data.psn_cash_pay
                 that.info['new_order'] = response.data.data.order
                 that.info['p_admin'] = that.p_admin
                 that.info['charge_admin'] = that.charge_admin

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -1143,6 +1143,7 @@ export default {
       })
     },
     setMonthPrescription(month_prescriptions) {
+      console.log("--======-66666777--====")
 
       this.month_prescriptions = []
 
@@ -1271,6 +1272,14 @@ export default {
             // obj['medical_c/**/ode'] = project_month_prescriptions.project[a].project.medical_code
             obj['unit'] = project_month_prescriptions.project[a].unit
             obj['project_id'] = project_month_prescriptions.project[a].project_id
+
+
+            if(project_month_prescriptions.project[a].project_id == 12302){
+              console.log("--======---====")
+              console.log("--======---====")
+              console.log(count)
+            }
+
             count = count + parseFloat(project_month_prescriptions.project[a].count)
             // price = price + project_month_prescriptions.project[a].price
             obj['price'] = parseFloat(project_month_prescriptions.project[a].price)
@@ -1945,7 +1954,8 @@ export default {
                     hosp_appr_flag: '1',
                     execution_state: 2,
                     is_self_drug: '',
-                    drug_way_count: '1'
+                    drug_way_count: '1',
+
 
                   }
 
@@ -2289,7 +2299,7 @@ export default {
                         execution_state: prescription.advices[b].execution_state,
                         is_medicine: prescription.advices[b].is_medicine,
                         is_self_drug: prescription.advices[b].is_self_drug.toString(),
-                        drug_way_count: prescription.advices[b].drug_way_count
+                        drug_way_count: prescription.advices[b].drug_way_count,
 
                       }
                       tempAdvice.push(obj)

src/xt_pages/outpatientTool/components/gatherStatistics.vue

@@ -113,7 +113,7 @@
       </el-table-column>
       <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 == 1">{{ scope.row.total }}</span>
           <span v-if="scope.row.is_total == 2">{{ (scope.row.price * scope.row.count).toFixed(2) }}</span>   -->
           <span>{{
             (scope.row.count_number * scope.row.pric).toFixed(2)
@@ -455,7 +455,7 @@ export default {
             this.item_type = this.id;
           }
           console.log(this.item_type,'this.item_type')
-          
+
 
           if (this.keywords != "") {
             for (let i = 0; i < this.tableList.length; i++) {
@@ -1165,7 +1165,7 @@ export default {
     getLaboratoryCostTotal() {
       var total_price = 0;
       for (let i = 0; i < this.tableList.length; i++) {
-        if (this.tableList[i].cost_type == "化验费") {
+        if (this.tableList[i].cost_type == "化验费" || this.tableList[i].cost_type == "化验") {
           total_price +=
             this.tableList[i].count_number * this.tableList[i].pric;
         }