diff --git a/taskschedule/Tnb.TaskScheduler/Listener/GenerateMaintainPlanTimeWorker.cs b/taskschedule/Tnb.TaskScheduler/Listener/GenerateMaintainPlanTimeWorker.cs
index baba20a4..adfe18c8 100644
--- a/taskschedule/Tnb.TaskScheduler/Listener/GenerateMaintainPlanTimeWorker.cs
+++ b/taskschedule/Tnb.TaskScheduler/Listener/GenerateMaintainPlanTimeWorker.cs
@@ -42,15 +42,41 @@ namespace JNPF.TaskScheduler.Listener
                 {
 
                     //整除表示一个周期到了
+                    // foreach (var item in eqpSpotInsTemEquipHsByCirculate)
+                    // {
+                    //     TimeSpan ts1 = new TimeSpan(Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd")).Ticks);
+                    //     TimeSpan ts2 = new TimeSpan(Convert.ToDateTime(item.start_time.ToString("yyyy-MM-dd")).Ticks);
+                    //     TimeSpan ts3 = ts1.Subtract(ts2).Duration();
+                    //     if (ts3.TotalDays * 10 % (10 * (double)item.plan_cycle) == 0)
+                    //     {
+                    //         tobeCreateTemplets.Add(item);
+                    //     }
+                    // }
+                    
+                    //按上一个保养记录来生成数据
                     foreach (var item in eqpSpotInsTemEquipHsByCirculate)
                     {
-                        TimeSpan ts1 = new TimeSpan(Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd")).Ticks);
-                        TimeSpan ts2 = new TimeSpan(Convert.ToDateTime(item.start_time.ToString("yyyy-MM-dd")).Ticks);
-                        TimeSpan ts3 = ts1.Subtract(ts2).Duration();
-                        if (ts3.TotalDays * 10 % (10 * (double)item.plan_cycle) == 0)
+                        EqpMaintainRecordH eqpMaintainRecordH = await db.Queryable<EqpMaintainRecordH>().Where(x=>x.maintain_tem_equip_id==item.id).OrderByDescending(x=>x.create_time).FirstAsync();
+                        if (eqpMaintainRecordH == null)
                         {
-                            tobeCreateTemplets.Add(item);
+                            TimeSpan ts1 = new TimeSpan(Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd")).Ticks);
+                            TimeSpan ts2 = new TimeSpan(Convert.ToDateTime(item.start_time.ToString("yyyy-MM-dd")).Ticks);
+                            TimeSpan ts3 = ts1.Subtract(ts2).Duration();
+                            if (ts3.TotalDays * 10 % (10 * (double)item.plan_cycle) == 0)
+                            {
+                                tobeCreateTemplets.Add(item);
+                            }
+                        }else if (eqpMaintainRecordH.status!="1")
+                        {
+                            TimeSpan ts1 = new TimeSpan(Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd")).Ticks);
+                            TimeSpan ts2 = new TimeSpan(Convert.ToDateTime(eqpMaintainRecordH.execute_time.Value.ToString("yyyy-MM-dd")).Ticks);
+                            TimeSpan ts3 = ts1.Subtract(ts2).Duration();
+                            if (ts3.TotalDays * 10 % (10 * (double)item.plan_cycle) == 0)
+                            {
+                                tobeCreateTemplets.Add(item);
+                            }
                         }
+                        
                     }
                 }