diff --git a/Service/AlarmService.cs b/Service/AlarmService.cs
index f048174..6d9cc03 100644
--- a/Service/AlarmService.cs
+++ b/Service/AlarmService.cs
@@ -423,12 +423,12 @@ namespace LY.App.Service
             var pageitem = await _db.Ado.SqlQueryAsync<int, long>(string.Format(coutsql, tablesql) + string.Format(page, tablesql, (input.pageNum - 1) * input.pageSize, input.pageSize));
 
             var temp = await _db.Queryable<Alarm>()
-                .Where(s => pageitem.Item2.Contains(s.BatchId)).SplitTable().Select(s => new { s.BatchId, s.freq, s.Id,s.positionId,s.PostionName,s.alarmLevel }).ToListAsync();
+                .Where(s => pageitem.Item2.Contains(s.BatchId)).SplitTable().Select(s => new { s.BatchId, s.freq, s.Id,s.positionId,s.PostionName,s.alarmLevel, s.device_type }).ToListAsync();
 
 
             var query = await _db.Queryable<Alarm>()
                 .Where(s => pageitem.Item2.Contains(s.BatchId)).SplitTable()
-              .GroupBy(s => new { s.BatchId, s.serial_number, s.device_type})
+              .GroupBy(s => new { s.BatchId, s.serial_number})
                 .Select(st => new AlarmRepDto
                 {
                     batchId = st.BatchId.ToString(),
@@ -437,7 +437,6 @@ namespace LY.App.Service
                     sn = st.serial_number,
                     Frequency = 0,
                     duration = (SqlFunc.AggregateMax(st.CreateTime) - SqlFunc.AggregateMin(st.CreateTime)).TotalSeconds,
-                    model = st.device_type,
                     IsWhitelist = SqlFunc.AggregateMax(st.IsWhitelist),
                 }).OrderByDescending(s => s.batchId).ToListAsync();
 
@@ -448,6 +447,7 @@ namespace LY.App.Service
                 s.positionId=temp.Where(m => m.BatchId == long.Parse(s.batchId)).OrderByDescending(o => o.Id).FirstOrDefault().positionId;
                 s.positionName = temp.Where(m => m.BatchId == long.Parse(s.batchId)).OrderByDescending(o => o.Id).FirstOrDefault().PostionName;
                 s.alarmLevel = temp.Where(m => m.BatchId == long.Parse(s.batchId)).Any(o => o.alarmLevel == 1) ? 1 : 0;
+                s.model = temp.Where(m => m.BatchId == long.Parse(s.batchId)).OrderByDescending(o => o.Id).FirstOrDefault().device_type;
             });
             return new ApiResult()
             {