diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/statistics/TingKeStatisticsController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/statistics/TingKeStatisticsController.java
index 91e74c68..9f1a155d 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/statistics/TingKeStatisticsController.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/statistics/TingKeStatisticsController.java
@@ -88,6 +88,7 @@ public class TingKeStatisticsController {
         queryWrapper.like(StringUtils.isNotBlank(evaluation.getSkjgh()),"kt.jgh",evaluation.getSkjgh());
         queryWrapper.like(StringUtils.isNotBlank(evaluation.getUpuseridLike()),"a.upuserid",evaluation.getUpuseridLike());
         queryWrapper.like(StringUtils.isNotBlank(evaluation.getUpUserName()),"a.upuser",evaluation.getUpUserName());
+        queryWrapper.like(StringUtils.isNotBlank(evaluation.getTkdwmc()),"xu.DWMC",evaluation.getTkdwmc());
 
 
 
@@ -114,6 +115,19 @@ public class TingKeStatisticsController {
 //            queryWrapper.ge("a.up_date",xqxnHistory.getStartTime());
 //            queryWrapper.le("a.up_date",xqxnHistory.getEndTime());
         }
+
+        //按听课身份查询
+        if(StringUtils.isNotBlank(evaluation.getTksf())){
+            QueryWrapper<KcTksfrzb> tksfSerachQw = new QueryWrapper<>();
+            tksfSerachQw.in("kc_tksfrzb.ZWMC",evaluation.getTksf());
+            List<KcTksfrzb> tksfGhList =  kcTksfrzbService.list(tksfSerachQw);
+            if(tksfGhList != null && !tksfGhList.isEmpty()){
+                Set<String> ghSet = tksfGhList.stream().map(x -> x.getGh()).collect(Collectors.toSet());
+                queryWrapper.in("a.upuserid",ghSet);
+            }else{
+                queryWrapper.eq("a.upuserid","-1");
+            }
+        }
         IPage<KcEvaluationVo> pageList = service.selectPageAndKcmc(page, queryWrapper);
         //---------------------补数据1------------------------------------------
         Map<Integer,String> sourceDictMap = Maps.newHashMap();
@@ -235,6 +249,18 @@ public class TingKeStatisticsController {
                 queryWrapper.le("a.up_date",xqxnHistory.getEndTime());
             }
         }
+        //按听课身份查询
+        if(StringUtils.isNotBlank(evaluation.getTksf())){
+            QueryWrapper<KcTksfrzb> tksfSerachQw = new QueryWrapper<>();
+            tksfSerachQw.in("kc_tksfrzb.ZWMC",evaluation.getTksf());
+            List<KcTksfrzb> tksfGhList =  kcTksfrzbService.list(tksfSerachQw);
+            if(tksfGhList != null && !tksfGhList.isEmpty()){
+                Set<String> ghSet = tksfGhList.stream().map(x -> x.getGh()).collect(Collectors.toSet());
+                queryWrapper.in("a.upuserid",ghSet);
+            }else{
+                queryWrapper.eq("a.upuserid","-1");
+            }
+        }
         IPage<KcEvaluationVo2> pageList = service.selectPageAndKcmc2(page, queryWrapper);
         //---------------------补数据1------------------------------------------
         Map<Integer,String> sourceDictMap = Maps.newHashMap();