diff --git a/apps/wpm/datax.py b/apps/wpm/datax.py
index 48f37bf6..96628cde 100644
--- a/apps/wpm/datax.py
+++ b/apps/wpm/datax.py
@@ -18,7 +18,7 @@ def tran_time_to_mstate(mstate_json, reminder_interval_list, work_start_time: da
         xval += val
         if work_start_time + timedelta(minutes=xval) > now:
             return mstate_json[ind]['name']
-    return '未运行'
+    return '运行'
 
 class AnaViewSet(GenericViewSet):
     perms_map = {}
@@ -30,9 +30,9 @@ class AnaViewSet(GenericViewSet):
         """
         data = request.data
         now = timezone.now()
-        mgroup: Mgroup = Mgroup.objects.get(name=data['mgroup_name'])
+        mgroup: Mgroup = Mgroup.objects.get(id=data['mgroup'])
         # 子状态
-        mstate_json = mgroup.process.mstate_json
+        mstate_json = mgroup.process.mstate_json if mgroup.process.mstate_json else []
         # 生产设备
         equip_qs = Equipment.objects.filter(mgroup=mgroup, type = 10)
         equip_qs_v = equip_qs.values('id', 'name', 'number', 'state').order_by('number')
@@ -51,6 +51,7 @@ class AnaViewSet(GenericViewSet):
         冷却 = 0
         未运行 = 0
         故障 = 0
+        运行 = 0
         now = timezone.now()
         for item in equip_qs_l:
             item['mstate'] = '未运行'
@@ -69,11 +70,13 @@ class AnaViewSet(GenericViewSet):
                 保温 += 1
             elif item['mstate'] == '冷却':
                 冷却 += 1
+            elif item['mstate'] == '运行':
+                运行 += 1
             elif item['mstate'] == '未运行':
                 未运行 += 1
             elif item['mstate'] == '故障':
                 故障 += 1
-        ret = {"保温": 保温, "冷却": 冷却, "未运行": 未运行, "故障": 故障}
+        ret = {"保温": 保温, "冷却": 冷却, "未运行": 未运行, "故障": 故障, "运行": 运行}
         ret['mstate_json'] = mstate_json
         ret['now'] = timezone.localtime(now).strftime('%Y-%m-%d %H:%M:%S')
         ret["rows"] = equip_qs_l