diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/overall/OverallService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/overall/OverallService.java
index 05fce92..d1976ee 100644
--- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/overall/OverallService.java
+++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/overall/OverallService.java
@@ -180,9 +180,12 @@ group by date
                "               ifnull(sum(t.weight), 0) total_weight,\n" +
                "               ifnull(sum(t.total_price), 0) total_price,\n" +
                "               ifnull(sum(t.count), 0) truck_cnt,\n" +
-               "               ifnull(sum(case when t.date >= ? and t.sale_type = 0 then t.weight end ), 0) year_total_weight,\n" +
-               "               ifnull(sum(case when t.date >= ? and t.sale_type = 0 then t.total_price end ), 0) year_total_price,\n" +
-               "               ifnull(sum(case when t.date >= ? and t.sale_type = 0 then t.count else 0 end ), 0)  year_truck_cnt,\n" +
+//               "               ifnull(sum(case when t.date >= ? and t.sale_type = 0 then t.weight end ), 0) year_total_weight,\n" +
+               "               ifnull(sum(case when t.date >= ? and  then t.weight end ), 0) year_total_weight,\n" +
+//               "               ifnull(sum(case when t.date >= ? and t.sale_type = 0 then t.total_price end ), 0) year_total_price,\n" +
+               "               ifnull(sum(case when t.date >= ? then t.total_price end ), 0) year_total_price,\n" +
+//               "               ifnull(sum(case when t.date >= ? and t.sale_type = 0 then t.count else 0 end ), 0)  year_truck_cnt,\n" +
+               "               ifnull(sum(case when t.date >= ? then t.count else 0 end ), 0)  year_truck_cnt,\n" +
                "               ifnull(sum(case when t.date >= ? then t.weight end ), 0) month_total_weight,\n" +
                "               ifnull(sum(case when t.date >= ? then t.total_price end ), 0) month_total_price,\n" +
                "               ifnull(sum(case when t.date >= ? then t.count else 0 end ), 0) month_truck_cnt,\n" +
@@ -203,7 +206,7 @@ group by date
                "                ifnull( count( t.sn ), 0 ) month_truck_cnt,\n" +
                "                ifnull( sum( t.weight ), 0 ) day_total_weight,\n" +
                "                ifnull( sum( t.total_price ), 0 ) day_total_price,\n" +
-               "                ifnull( count( t.sn ), 0 ) month_truck_cnt \n" +
+               "                ifnull( count( t.sn ), 0 ) day_truck_cnt \n" +
                "            FROM\n" +
                "                order_temp t \n" +
                "            WHERE\n" +