bug修复

unify_api/modules/home_page/procedures/count_info_pds.py

@@ -85,15 +85,16 @@ async def electric_use_info(cid):
                     'overResidualCurrent', 'unbalanceU', 'overI']
     score_sql = f"select importance, count(importance) doc_count from " \
                 f"point_1min_event where cid=%s and event_datetime BETWEEN" \
-                f"'{start}' and '{now}' GROUP BY importance"
+                f"'{start}' and '{now}' and event_type in %s " \
+                f"GROUP BY importance"
     alarm_sql = f"select importance, count(importance) doc_count from " \
                 f"point_1min_event where cid=%s and event_datetime BETWEEN" \
-                f"'{start}' and '{now}' and event_type in %s " \
+                f"'{start}' and '{now}' " \
                 f"GROUP BY importance"
     first_score, second_score, third_score = 0, 0, 0
     async with MysqlUtil() as conn:
-        score_datas = await conn.fetchall(score_sql, args=(cid,))
-        alarm_datas = await conn.fetchall(alarm_sql, args=(cid, score_events))
+        score_datas = await conn.fetchall(score_sql, args=(cid, score_events))
+        alarm_datas = await conn.fetchall(alarm_sql, args=(cid,))
     for data in score_datas:
         if data["importance"] == Importance.First.value:
             first_score += data["doc_count"]