diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
index 4f101da15f..3332f525f3 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
@@ -831,9 +831,15 @@
             </choose>
             <if test='sourceType != "" and sourceType == "start" and startTime != "" and startTime != null '>
                 AND date_id <![CDATA[>=]]> #{startTime}
+                <if test='endTime != "" and endTime != null '>
+                    AND date_id <![CDATA[<=]]> #{endTime}
+                </if>
                 ORDER BY date_id ASC
             </if>
             <if test='sourceType != "" and sourceType == "end" and endTime != "" and endTime != null '>
+                <if test='startTime != "" and startTime != null '>
+                    AND date_id <![CDATA[>=]]> #{startTime}
+                </if>
                 AND date_id <![CDATA[<=]]> #{endTime}
                 ORDER BY date_id DESC
             </if>
@@ -871,9 +877,15 @@
             </choose>
             <if test='sourceType != "" and sourceType == "start" and startTime != "" and startTime != null '>
                 AND date_id <![CDATA[>=]]> #{startTime}
+                <if test='endTime != "" and endTime != null '>
+                    AND date_id <![CDATA[<=]]> #{endTime}
+                </if>
                 ORDER BY date_id ASC
             </if>
             <if test='sourceType != "" and sourceType == "end" and endTime != "" and endTime != null '>
+                <if test='startTime != "" and startTime != null '>
+                    AND date_id <![CDATA[>=]]> #{startTime}
+                </if>
                 AND date_id <![CDATA[<=]]> #{endTime}
                 ORDER BY date_id DESC
             </if>
@@ -911,9 +923,15 @@
             </choose>
             <if test='sourceType != "" and sourceType == "start" and startTime != "" and startTime != null '>
                 AND date_id <![CDATA[>=]]> #{startTime}
+                <if test='endTime != "" and endTime != null '>
+                    AND date_id <![CDATA[<=]]> #{endTime}
+                </if>
                 ORDER BY date_id ASC
             </if>
             <if test='sourceType != "" and sourceType == "end" and endTime != "" and endTime != null '>
+                <if test='startTime != "" and startTime != null '>
+                    AND date_id <![CDATA[>=]]> #{startTime}
+                </if>
                 AND date_id <![CDATA[<=]]> #{endTime}
                 ORDER BY date_id DESC
             </if>
@@ -951,9 +969,15 @@
             </choose>
             <if test='sourceType != "" and sourceType == "start" and startTime != "" and startTime != null '>
                 AND date_id <![CDATA[>=]]> #{startTime}
+                <if test='endTime != "" and endTime != null '>
+                    AND date_id <![CDATA[<=]]> #{endTime}
+                </if>
                 ORDER BY date_id ASC
             </if>
             <if test='sourceType != "" and sourceType == "end" and endTime != "" and endTime != null '>
+                <if test='startTime != "" and startTime != null '>
+                    AND date_id <![CDATA[>=]]> #{startTime}
+                </if>
                 AND date_id <![CDATA[<=]]> #{endTime}
                 ORDER BY date_id DESC
             </if>
@@ -991,9 +1015,15 @@
             </choose>
             <if test='sourceType != "" and sourceType == "start" and startTime != "" and startTime != null '>
                 AND date_id <![CDATA[>=]]> #{startTime}
+                <if test='endTime != "" and endTime != null '>
+                    AND date_id <![CDATA[<=]]> #{endTime}
+                </if>
                 ORDER BY date_id ASC
             </if>
             <if test='sourceType != "" and sourceType == "end" and endTime != "" and endTime != null '>
+                <if test='startTime != "" and startTime != null '>
+                    AND date_id <![CDATA[>=]]> #{startTime}
+                </if>
                 AND date_id <![CDATA[<=]]> #{endTime}
                 ORDER BY date_id DESC
             </if>