diff --git a/Frontend/index.html b/Frontend/index.html
index d7b3724..9b47826 100644
--- a/Frontend/index.html
+++ b/Frontend/index.html
@@ -1152,7 +1152,7 @@ License: You must have a valid license purchased only from wrapbootstrap.com (li
                             getAlarmSub(data);
                         }
 
-                        alarmIconBlink();
+                      alarmIconBlink(data);
                     });
                     getAlarm();
                 });
diff --git a/Frontend/js/n4js/alarmbaja.js b/Frontend/js/n4js/alarmbaja.js
index b49054a..8095336 100644
--- a/Frontend/js/n4js/alarmbaja.js
+++ b/Frontend/js/n4js/alarmbaja.js
@@ -780,7 +780,7 @@ function getOtherAlarmByBaja(
       startUrl +
       "timestamp.millis <= " +
       endDate_millisecond +
-      " and normalTime " +
+      " and sourceState " +
       _recoverState +
       " and ackState " +
       _ackState +
@@ -820,10 +820,10 @@ function getOtherAlarmByBaja(
             main.ackedTime = record.get("ackTime").$cEncStr;
             main.ackState = record.get("ackState").$ordinal;
             if (_sourceTmp.includes("undefined")) {
-              main.buildingFloorName_zh = "無";
-              main.alarmClass = "系統/設備異常";
-              main.sourceTmp = "無";
-              main.msgText = "";
+              main.buildingFloorName_zh = "";
+              //main.alarmClass = "系統異常";
+              main.sourceTmp = "";
+              //main.msgText = "";
               _result.data.push(main);
             }
 
@@ -901,10 +901,10 @@ function getAllDeviceAlarmByBaja(
             main.ackState = record.get("ackState").$ordinal;
             if (_sourceTmp.includes("undefined")) {
               // console.log(main.ackState)
-              main.buildingFloorName_zh = "無";
-              main.alarmClass = "系統/設備異常";
-              main.sourceTmp = "無";
-              main.msgText = "";
+              main.buildingFloorName_zh = "";
+              //main.alarmClass = "系統異常";
+              main.sourceTmp = "";
+              //main.msgText = "";
             }
             _result.data.push(main);
             _index++;