diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcJieci/service/impl/KcJieciServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcJieci/service/impl/KcJieciServiceImpl.java
index efec2b2e..9140eacc 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcJieci/service/impl/KcJieciServiceImpl.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcJieci/service/impl/KcJieciServiceImpl.java
@@ -35,10 +35,16 @@ public class KcJieciServiceImpl extends ServiceImpl<KcJieciMapper, KcJieci> impl
         String dqsj = DateUtils.getDate("HHmm");//获取当前时间的小时和分钟
         String minDate = list.get(0).getHhks();//最小开始时间
         String maxDate = list.get(5).getHhjs();//最大结束时间
-        String dqkssj = "";//当前开始时间
+        String dqkssj = DateUtils.getDate("yyyy-MM-dd");//当前开始时间
         String dqjc = "";//当前节次
         String xyjkssj = "";//当前开始时间
         String xyjjc = "";//当前节次
+        Calendar calendarMin = Calendar.getInstance();
+        calendarMin.setTime(DateUtil.parse(dqkssj+" "+minDate.substring(0,2)+":"+minDate.substring(2,4)+":00","yyyy-MM-dd HH:mm:ss"));
+        //从当前日期减去30分钟
+        calendarMin.add(Calendar.MINUTE, -30);
+        minDate = DateUtil.format(calendarMin.getTime(),"HHmm") ;
+
         if(Integer.parseInt(dqsj)<Integer.parseInt(minDate)){
             SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");//设置格式
             Calendar calendar = Calendar.getInstance(); //创建Calendar 的实例
@@ -62,7 +68,6 @@ public class KcJieciServiceImpl extends ServiceImpl<KcJieciMapper, KcJieci> impl
                 xyjjc = list.get(0).getJieci();
             }else{
                 for(int i=0;i<list.size();i++){
-                    dqkssj = DateUtils.getDate("yyyy-MM-dd");
                     String kssj = "";
                     String jssj = "";
 
@@ -72,7 +77,7 @@ public class KcJieciServiceImpl extends ServiceImpl<KcJieciMapper, KcJieci> impl
                     Calendar calendar2 = Calendar.getInstance();
                     calendar2.setTime(DateUtil.parse(dqkssj+" "+kssj.substring(0,2)+":"+kssj.substring(2,4)+":00","yyyy-MM-dd HH:mm:ss"));
                     //从当前日期减去15分钟
-                    calendar2.add(Calendar.MINUTE, -15);
+                    calendar2.add(Calendar.MINUTE, -30);
                     kssj = DateUtil.format(calendar2.getTime(),"HHmm") ;
 //
 //                    if(i==list.size()-1){
@@ -89,8 +94,7 @@ public class KcJieciServiceImpl extends ServiceImpl<KcJieciMapper, KcJieci> impl
                             Calendar calendar = Calendar.getInstance(); //创建Calendar 的实例
                             calendar.add(Calendar.DAY_OF_MONTH, +1); //当前时间减去一天，即一天前的时间
                             //如果当前时间大于最后一节课则赋值给最后一节课
-                            dqkssj = DateUtils.getDate("yyyy-MM-dd");
-                            dqjc = "";
+                            dqjc = list.get(i).getJieci();
                             //下一节课赋值给明天第一节
                             xyjkssj = simpleDateFormat.format(calendar.getTime());
                             xyjjc = list.get(0).getJieci();
@@ -100,6 +104,14 @@ public class KcJieciServiceImpl extends ServiceImpl<KcJieciMapper, KcJieci> impl
                         }
                         break;
                     }
+                    if(Integer.parseInt(dqsj)>=1130&&Integer.parseInt(dqsj)<=1300){
+                        xyjkssj = DateUtils.getDate("yyyy-MM-dd");
+                        xyjjc = "05、06";
+                    }
+                    if(Integer.parseInt(dqsj)>=1645&&Integer.parseInt(dqsj)<=1730){
+                        xyjkssj = DateUtils.getDate("yyyy-MM-dd");
+                        xyjjc = "09、10";
+                    }
                 }
             }
         }
@@ -181,7 +193,7 @@ public class KcJieciServiceImpl extends ServiceImpl<KcJieciMapper, KcJieci> impl
                             calendar.add(Calendar.DAY_OF_MONTH, +1); //当前时间减去一天，即一天前的时间
                             //如果当前时间大于最后一节课则赋值给最后一节课
                             dqkssj = DateUtils.getDate("yyyy-MM-dd");
-                            dqjc = "";
+                            dqjc = list.get(i).getJieci();
                             //下一节课赋值给明天第一节
                             xyjkssj = simpleDateFormat.format(calendar.getTime());
                             xyjjc = list.get(0).getJieci();