diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 6284eb3..8271ce6 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -81,9 +81,10 @@
         bwi.DEPTID AS deptid
         FROM alarm_records ar
         JOIN bus_device_well rdv  ON ar.DEVICE_ID = rdv.DEVICE_ID
-        LEFT JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        LEFT JOIN bus_well_info bwi ON ar.WELL_CODE= bwi.WELL_CODE
+        JOIN alarm_job aj ON ar.JOB_ID = aj.ID
+        JOIN bus_well_info bwi ON ar.WELL_CODE= bwi.WELL_CODE
         WHERE    rdv.VALID='1'
+
         <if test="status!='' and status!=null">
             AND ar.STATUS = #{status}
         </if>

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 6284eb3..8271ce6 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -81,9 +81,10 @@
         bwi.DEPTID AS deptid
         FROM alarm_records ar
         JOIN bus_device_well rdv  ON ar.DEVICE_ID = rdv.DEVICE_ID
-        LEFT JOIN alarm_job aj ON ar.JOB_ID = aj.ID
-        LEFT JOIN bus_well_info bwi ON ar.WELL_CODE= bwi.WELL_CODE
+        JOIN alarm_job aj ON ar.JOB_ID = aj.ID
+        JOIN bus_well_info bwi ON ar.WELL_CODE= bwi.WELL_CODE
         WHERE    rdv.VALID='1'
+
         <if test="status!='' and status!=null">
             AND ar.STATUS = #{status}
         </if>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 13bcb04..1fde0ee 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -48,6 +48,7 @@
             </when>
             <otherwise>
                 AND ar.status = '1'
+                AND ar.ALARM_TYPE = '1'
             </otherwise>
         </choose>
     </select>