diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcStatisticsServiceImpl.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcStatisticsServiceImpl.java
index a2020b9f..b7c4c173 100644
--- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcStatisticsServiceImpl.java
+++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcStatisticsServiceImpl.java
@@ -1168,29 +1168,49 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati
             conditionEndOfDay = DateUtil.formatDateTime(endOfDay);
         }else if(type ==2){
             //获取前月的第一天
-            Calendar   cal_1=Calendar.getInstance();//获取当前日期
-            cal_1.add(Calendar.MONTH, -1);
-            cal_1.set(Calendar.DAY_OF_MONTH,1);//设置为1号,当前日期既为本月第一天
-            conditionBeginOfDay = format.format(cal_1.getTime());
+            Calendar   c=Calendar.getInstance();//获取当前日期
+            c.add(Calendar.MONTH, -1);
+            c.set(Calendar.DAY_OF_MONTH,1);//设置为1号,当前日期既为本月第一天
+            c.set(Calendar.HOUR, 0);
+            c.set(Calendar.MINUTE, 0);
+            c.set(Calendar.SECOND, 0);
+            c.set(Calendar.MILLISECOND, 0);
+            conditionBeginOfDay = format.format(c.getTime());
             //获取前月的最后一天
-            Calendar cale = Calendar.getInstance();
-            cale.set(Calendar.DAY_OF_MONTH,0);//设置为1号,当前日期既为本月第一天
-            conditionEndOfDay = format.format(cale.getTime());
+            Calendar ca = Calendar.getInstance();
+            ca.set(Calendar.DAY_OF_MONTH,0);//设置为1号,当前日期既为本月第一天
+            ca.set(Calendar.HOUR, 23);
+            ca.set(Calendar.MINUTE, 59);
+            ca.set(Calendar.SECOND, 59);
+            ca.set(Calendar.MILLISECOND, 999);
+            conditionEndOfDay = format.format(ca.getTime());
         }else if(type ==3){
             //获取当前月第一天：
             Calendar c = Calendar.getInstance();
             c.add(Calendar.MONTH, 0);
             c.set(Calendar.DAY_OF_MONTH,1);//设置为1号,当前日期既为本月第一天
+            c.set(Calendar.HOUR, 0);
+            c.set(Calendar.MINUTE, 0);
+            c.set(Calendar.SECOND, 0);
+            c.set(Calendar.MILLISECOND, 0);
             conditionBeginOfDay = format.format(c.getTime());
             //获取当前月最后一天
             Calendar ca = Calendar.getInstance();
             ca.set(Calendar.DAY_OF_MONTH, ca.getActualMaximum(Calendar.DAY_OF_MONTH));
+            ca.set(Calendar.HOUR, 23);
+            ca.set(Calendar.MINUTE, 59);
+            ca.set(Calendar.SECOND, 59);
+            ca.set(Calendar.MILLISECOND, 999);
             conditionEndOfDay = format.format(ca.getTime());
         }else{
-            Calendar  cal_1=Calendar.getInstance();//获取当前日期
-            cal_1.add(Calendar.MONTH, -12);
-            cal_1.set(Calendar.DAY_OF_MONTH,1);//设置为1号,当前日期既为本月第一天
-            conditionBeginOfDay = format.format(cal_1.getTime());
+            Calendar c=Calendar.getInstance();//获取当前日期
+            c.add(Calendar.MONTH, -12);
+            c.set(Calendar.DAY_OF_MONTH,1);//设置为1号,当前日期既为本月第一天
+            c.set(Calendar.HOUR, 0);
+            c.set(Calendar.MINUTE, 0);
+            c.set(Calendar.SECOND, 0);
+            c.set(Calendar.MILLISECOND, 0);
+            conditionBeginOfDay = format.format(c.getTime());
             conditionEndOfDay = DateUtil.formatDateTime(endOfDay);
         }
         if(state==1){
@@ -1545,4 +1565,36 @@ public class XhpcStatisticsServiceImpl extends BaseService implements IXhpcStati
         return c;
     }
 
+    public static void main(String[] args) {
+        Date date = new Date();
+        Date beginOfDay = DateUtil.beginOfDay(date);
+        Date endOfDay = DateUtil.endOfDay(date);
+
+        String conditionBeginOfDay = null;
+        String conditionEndOfDay = null;
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+        Calendar c = Calendar.getInstance();
+        c.add(Calendar.MONTH, 0);
+        c.set(Calendar.DAY_OF_MONTH,1);//设置为1号,当前日期既为本月第一天
+        c.set(Calendar.HOUR, 0);
+        c.set(Calendar.MINUTE, 0);
+        c.set(Calendar.SECOND, 0);
+        c.set(Calendar.MILLISECOND, 0);
+        conditionBeginOfDay = format.format(c.getTime());
+        //获取当前月最后一天
+        Calendar ca = Calendar.getInstance();
+        ca.set(Calendar.DAY_OF_MONTH, ca.getActualMaximum(Calendar.DAY_OF_MONTH));
+        ca.set(Calendar.HOUR, 23);
+        ca.set(Calendar.MINUTE, 59);
+        ca.set(Calendar.SECOND, 59);
+        ca.set(Calendar.MILLISECOND, 999);
+        conditionEndOfDay = format.format(ca.getTime());
+
+
+        System.out.println(conditionBeginOfDay);
+        System.out.println(conditionEndOfDay);
+    }
+
+
 }