diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/tools/ChangeTingKeTongJi.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/tools/ChangeTingKeTongJi.java
index b287696a..d5d597ad 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/tools/ChangeTingKeTongJi.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/tools/ChangeTingKeTongJi.java
@@ -322,8 +322,8 @@ public class ChangeTingKeTongJi {
                 KcTksfrzb currentData = tksfMap.get(x.getGh());
                 String currentZwmc = currentData.getZwmc();
                 String currentTkyq = currentData.getTkyq();
-                if(StringUtils.isNotBlank(currentTkyq)){
-                    int tkyq = Integer.parseInt(currentTkyq);
+                if(StringUtils.isNotBlank(currentZwmc)){
+                    int tkyq = Integer.parseInt(StringUtils.defaultString(currentTkyq,"0"));
                     int xtkyq = Integer.parseInt(StringUtils.defaultString(x.getTkyq(),"0"));
                     x.setZwmc(currentZwmc + "、" + x.getZwmc());
                     if(tkyq > xtkyq){
@@ -347,13 +347,19 @@ public class ChangeTingKeTongJi {
         kcTingke.setUserid(userId);
         if(tksfMap.containsKey(userId)){
             KcTksfrzb currentData = tksfMap.get(userId);
-            kcTingke.setUsername(currentData.getXm());
             if(StringUtils.isNotBlank(currentData.getTkyq())){
                 kcTingke.setUsertkyq(Integer.parseInt(currentData.getTkyq()));
             }else{
                 kcTingke.setUsertkyq(0);
             }
 
+            Xxhbuser xxhbuser = szdwMap.get(userId);
+            if(xxhbuser != null){
+                kcTingke.setUsername(xxhbuser.getXm());
+                kcTingke.setUserdwmc(xxhbuser.getDwmc());
+            }
+
+
             String tksfs = currentData.getZwmc();
             if(StringUtils.isNotBlank(tksfs)){
                 if(StringUtils.indexOf(tksfs,"、") != 1){
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKetangbiaoController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKetangbiaoController.java
index 436bd47c..6b4b59c4 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKetangbiaoController.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKetangbiaoController.java
@@ -12,6 +12,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import cn.hutool.core.date.DateField;
+import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import com.google.common.collect.Maps;
@@ -23,6 +24,8 @@ import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.system.vo.SysUserCacheInfo;
 import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.kc.grab.SynchronizationService.tools.ChangeTingKeTongJi;
+import org.jeecg.modules.kc.kcXqxnHistory.entity.KcXqxnHistory;
 import org.jeecg.modules.kc.ktgl.entity.KcKetangbiao;
 import org.jeecg.modules.kc.ktgl.service.IKcKetangbiaoService;
 
@@ -63,11 +66,23 @@ public class KcKetangbiaoController extends JeecgController<KcKetangbiao, IKcKet
 	@Autowired
 	private IKcKetangbiaoService kcKetangbiaoService;
 
+	@Autowired
+	private ChangeTingKeTongJi changeTingKeTongJi;
+
 	 @Lazy
 	 @Autowired
 	 private CommonAPI commonApi;
 
-	 String startTime = "2023-02-19";
+	 String startTime = "";
+
+	 private String getBxqStartTime(){
+		 if(StringUtils.isNotBlank(startTime)) return startTime;
+		 //查找本学期学年的
+		 KcXqxnHistory kcXqxnHistory = changeTingKeTongJi.getXqConfig();
+
+		 startTime = DateUtil.format(kcXqxnHistory.getStartTime(), DatePattern.NORM_DATETIME_FORMAT);
+		 return startTime;
+	 }
 
 	/**
 	 * 分页列表查询
@@ -236,14 +251,14 @@ public class KcKetangbiaoController extends JeecgController<KcKetangbiao, IKcKet
 			"count( CASE WHEN date_format( now(), '%H%i' ) > hhjs THEN 1 END ) xkktnum",//【下课课堂数】
 			"count( CASE WHEN date_format( now(), '%H%i' ) < hhjs AND date_format( now(), '%H%i' ) > hhks THEN 1 END ) zzsknum"//【正在上课课堂数】
 		);
-		 qw3.ge("skrq",startTime);//<=
+		 qw3.ge("skrq",getBxqStartTime());//<=
 		 qw3.le("skrq",skrq);//>=
 		 List<Map<String, Object>> kcKetangbiao3List = kcKetangbiaoService.listMaps(qw3);
 		 if(kcKetangbiao3List != null && !kcKetangbiao3List.isEmpty()){
 			 rmap.put("yiKaiKeTang",kcKetangbiao3List.get(0));
 		 }
 		 KcKetangbiao kcKetangbiao = new KcKetangbiao();
-		 kcKetangbiao.setStartTime(startTime);
+		 kcKetangbiao.setStartTime(getBxqStartTime());
 		 kcKetangbiao.setEndTime(skrq);
 		 List<Map<String, Object>> listTjIndex = kcKetangbiaoService.getIndexYkktstj(kcKetangbiao);
 		 if(listTjIndex != null && !listTjIndex.isEmpty()){
@@ -320,7 +335,7 @@ public class KcKetangbiaoController extends JeecgController<KcKetangbiao, IKcKet
 		 //查询第三句-已开课堂总数
 		 QueryWrapper qw3 = new QueryWrapper();
 		 qw3.select("*");
-		 qw3.ge("skrq",startTime);//<=
+		 qw3.ge("skrq",getBxqStartTime());//<=
 		 qw3.le("skrq",skrq);//>=
 		 Page<Map<String, Object>> page = new Page<>(pageNo, pageSize);
 		 IPage<Map<String, Object>> kcKetangbiao3List = kcKetangbiaoService.pageMaps(page,qw3);
@@ -338,7 +353,7 @@ public class KcKetangbiaoController extends JeecgController<KcKetangbiao, IKcKet
 	 public Result<?> ykkttkktList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,String skrq) {
 		 //查询第三句-已开课堂听课课堂
 		 KcKetangbiao kcKetangbiao = new KcKetangbiao();
-		 kcKetangbiao.setStartTime(startTime);
+		 kcKetangbiao.setStartTime(getBxqStartTime());
 		 kcKetangbiao.setEndTime(skrq);
 		 Page<Map<String, Object>> page = new Page<>(pageNo, pageSize);
 		 IPage<Map<String, Object>> listTjIndex = kcKetangbiaoService.getIndexYkktstjYkkttkktList(page,kcKetangbiao);
@@ -356,7 +371,7 @@ public class KcKetangbiaoController extends JeecgController<KcKetangbiao, IKcKet
 	 public Result<?> ykkttkrcList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,String skrq) {
 		 //查询第三句-已开课堂听课课堂
 		 KcKetangbiao kcKetangbiao = new KcKetangbiao();
-		 kcKetangbiao.setStartTime(startTime);
+		 kcKetangbiao.setStartTime(getBxqStartTime());
 		 kcKetangbiao.setEndTime(skrq);
 		 Page<Map<String, Object>> page = new Page<>(pageNo, pageSize);
 		 IPage<Map<String, Object>> listTjIndex = kcKetangbiaoService.getIndexYkktstjYkkttkrcList(page,kcKetangbiao);
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml
index f8b2d245..ed6565de 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml
@@ -20,9 +20,9 @@
 
     <select id="getIndexYkktstj" resultType="java.util.Map">
         SELECT
-        count( DISTINCT ( CASE WHEN t.tingketime > '1' THEN k.id END ))+ 0 btkktnum, -- 【已开课堂数：听课课堂数】
-        count( CASE WHEN t.tingketime > '1' THEN '1' END ) + 0 tkrcnum,-- 【已开课堂数：听课人次数】
-        count( DISTINCT ( CASE WHEN t.jianchatime > '1' THEN k.id END )) jcktnum -- 检查课堂数
+        count( DISTINCT ( CASE WHEN t.tingketime > '1' THEN k.id END ))+ 0 btkktnum,<!-- 【已开课堂数：听课课堂数】-->
+        count( CASE WHEN t.tingketime > '1' THEN '1' END ) + 0 tkrcnum,<!-- 【已开课堂数：听课人次数】-->
+        count( DISTINCT ( CASE WHEN t.jianchatime > '1' THEN k.id END )) jcktnum<!-- 检查课堂数-->
         FROM kc_ketangbiao k, kc_tingke t WHERE k.id = t.kechengbiaoid
         <if test="startTime != '' and startTime != null">
         AND skrq >= #{startTime}
@@ -141,7 +141,7 @@
     </select>
     <select id="getIndexYkktstjYkkttkktList" resultType="java.util.Map">
         SELECT
-            *
+            DISTINCT k.id, k.kcmc,k.skjs, k.hh,k.skdd
         FROM kc_ketangbiao k, kc_tingke t WHERE k.id = t.kechengbiaoid
         and t.tingketime > '1'
         <if test="et.startTime != '' and et.startTime != null">