Ver código fonte

提交代码

陈少旭 10 meses atrás
pai
commit
5fd08db432

+ 2 - 1
src/xt_pages/outpatientCharges/statementPrint.vue Ver arquivo

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

+ 12 - 2
src/xt_pages/outpatientDoctorStation/doctorDesk.vue Ver arquivo

@@ -1143,6 +1143,7 @@ export default {
1143 1143
       })
1144 1144
     },
1145 1145
     setMonthPrescription(month_prescriptions) {
1146
+      console.log("--======-66666777--====")
1146 1147
 
1147 1148
       this.month_prescriptions = []
1148 1149
 
@@ -1271,6 +1272,14 @@ export default {
1271 1272
             // obj['medical_c/**/ode'] = project_month_prescriptions.project[a].project.medical_code
1272 1273
             obj['unit'] = project_month_prescriptions.project[a].unit
1273 1274
             obj['project_id'] = project_month_prescriptions.project[a].project_id
1275
+
1276
+
1277
+            if(project_month_prescriptions.project[a].project_id == 12302){
1278
+              console.log("--======---====")
1279
+              console.log("--======---====")
1280
+              console.log(count)
1281
+            }
1282
+
1274 1283
             count = count + parseFloat(project_month_prescriptions.project[a].count)
1275 1284
             // price = price + project_month_prescriptions.project[a].price
1276 1285
             obj['price'] = parseFloat(project_month_prescriptions.project[a].price)
@@ -1945,7 +1954,8 @@ export default {
1945 1954
                     hosp_appr_flag: '1',
1946 1955
                     execution_state: 2,
1947 1956
                     is_self_drug: '',
1948
-                    drug_way_count: '1'
1957
+                    drug_way_count: '1',
1958
+
1949 1959
 
1950 1960
                   }
1951 1961
 
@@ -2289,7 +2299,7 @@ export default {
2289 2299
                         execution_state: prescription.advices[b].execution_state,
2290 2300
                         is_medicine: prescription.advices[b].is_medicine,
2291 2301
                         is_self_drug: prescription.advices[b].is_self_drug.toString(),
2292
-                        drug_way_count: prescription.advices[b].drug_way_count
2302
+                        drug_way_count: prescription.advices[b].drug_way_count,
2293 2303
 
2294 2304
                       }
2295 2305
                       tempAdvice.push(obj)

+ 3 - 3
src/xt_pages/outpatientTool/components/gatherStatistics.vue Ver arquivo

@@ -113,7 +113,7 @@
113 113
       </el-table-column>
114 114
       <el-table-column align="center" label="金额" prop="total_all">
115 115
         <template slot-scope="scope">
116
-          <!-- <span v-if="scope.row.is_total == 1">{{ scope.row.total }}</span>  
116
+          <!-- <span v-if="scope.row.is_total == 1">{{ scope.row.total }}</span>
117 117
           <span v-if="scope.row.is_total == 2">{{ (scope.row.price * scope.row.count).toFixed(2) }}</span>   -->
118 118
           <span>{{
119 119
             (scope.row.count_number * scope.row.pric).toFixed(2)
@@ -455,7 +455,7 @@ export default {
455 455
             this.item_type = this.id;
456 456
           }
457 457
           console.log(this.item_type,'this.item_type')
458
-          
458
+
459 459
 
460 460
           if (this.keywords != "") {
461 461
             for (let i = 0; i < this.tableList.length; i++) {
@@ -1165,7 +1165,7 @@ export default {
1165 1165
     getLaboratoryCostTotal() {
1166 1166
       var total_price = 0;
1167 1167
       for (let i = 0; i < this.tableList.length; i++) {
1168
-        if (this.tableList[i].cost_type == "化验费") {
1168
+        if (this.tableList[i].cost_type == "化验费" || this.tableList[i].cost_type == "化验") {
1169 1169
           total_price +=
1170 1170
             this.tableList[i].count_number * this.tableList[i].pric;
1171 1171
         }