diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
index c586d01..ecac34b 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
@@ -758,15 +758,10 @@
         AS logtime,
         dg.STRENGTH AS strength
         FROM
-        data_gas dg
-        INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE
-        INNER JOIN bus_well_info bwi ON dg.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        <where>
-            bd.VALID = '1' AND bwi.VALID = '1'
-            <if test="deptid != null and deptid != -1 ">
-                and bwi.DEPTID = #{deptid}
-            </if>
+        (
+            SELECT *
+            FROM data_gas dg
+            where 1=1
             <if test="beginTime != null and beginTime != '' ">
                 and dg.UPTIME  <![CDATA[ >= ]]>
                 <include refid="char_toDate">
@@ -786,7 +781,25 @@
                 <include refid="keywords_sql"/>
                 )
             </if>
-        </where>
+        ) dg
+        INNER JOIN
+        (
+            SELECT *
+            FROM bus_device
+            WHERE VALID = '1'
+        ) bd ON dg.DEVCODE = bd.DEVCODE
+        INNER JOIN
+        (
+            SELECT *
+            FROM bus_well_info
+            <where>
+                VALID = '1'
+                <if test="deptid != null and deptid != -1 ">
+                    and DEPTID = #{deptid}
+                </if>
+            </where>
+        )bwi ON dg.WELL_CODE = bwi.WELL_CODE
+        INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
         ORDER BY dg.UPTIME DESC
     </select>