diff --git a/safesite/tasks.py b/safesite/tasks.py
index 2798fc0d..38f81f99 100644
--- a/safesite/tasks.py
+++ b/safesite/tasks.py
@@ -312,16 +312,21 @@ def sendGridtask(obj):
 def sendGridtask2(**kwargs):
     obj = GridTaskSet.objects.get(id=kwargs['gridtaskset'])
     if obj.trouble:
-        TroubleFollowTask.objects.filter(taskset=obj, usable=1).update(usable=0)
-        nowtime = datetime.datetime.now()
-        if obj.expire:
-            newm = nowtime + datetime.timedelta(hours=int(obj.expire))
-            TroubleFollowTask.objects.create(trouble=obj.trouble,taskexpire = newm,taskadd=nowtime,taskset=obj,tasknote=obj.note,user=obj.user,gridlevel=obj.gridlevel)
+        if obj.trouble.yhzt == 6:
+            #如果隐患关闭了就直接停止计划任务
+            obj.periodictask.enabled = False
+            obj.periodictask.save()
         else:
-            TroubleFollowTask.objects.create(trouble=obj.trouble,taskadd=nowtime,taskset=obj,tasknote=obj.note,user=obj.user,gridlevel=obj.gridlevel)
-        obj.last_run_at = nowtime
-        obj.count = obj.count+1
-        obj.save()
+            TroubleFollowTask.objects.filter(taskset=obj, usable=1).update(usable=0)
+            nowtime = datetime.datetime.now()
+            if obj.expire:
+                newm = nowtime + datetime.timedelta(hours=int(obj.expire))
+                TroubleFollowTask.objects.create(trouble=obj.trouble,taskexpire = newm,taskadd=nowtime,taskset=obj,tasknote=obj.note,user=obj.user,gridlevel=obj.gridlevel)
+            else:
+                TroubleFollowTask.objects.create(trouble=obj.trouble,taskadd=nowtime,taskset=obj,tasknote=obj.note,user=obj.user,gridlevel=obj.gridlevel)
+            obj.last_run_at = nowtime
+            obj.count = obj.count+1
+            obj.save()
 
     elif obj.riskact:
         RiskActTask.objects.filter(taskset=obj, usable=1).update(usable=0)