diff --git a/src/main/java/com/peanut/modules/medical/service/impl/CourseServiceImpl.java b/src/main/java/com/peanut/modules/medical/service/impl/CourseServiceImpl.java
index ced3772f..9050a9c1 100644
--- a/src/main/java/com/peanut/modules/medical/service/impl/CourseServiceImpl.java
+++ b/src/main/java/com/peanut/modules/medical/service/impl/CourseServiceImpl.java
@@ -96,17 +96,63 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
 
     @Override
     public List getUserCourseStudying(Map<String, Object> param) {
+        MyUserEntity user = ShiroUtils.getUser();
         MPJLambdaWrapper<CourseEntity> wrapper = new MPJLambdaWrapper<>();
-        wrapper.distinct();
-        wrapper.leftJoin(CourseCatalogueEntity.class,CourseCatalogueEntity::getCourseId,CourseEntity::getId);
         wrapper.leftJoin(CourseToMedicine.class,CourseToMedicine::getCourseId,CourseEntity::getId);
         wrapper.leftJoin(UserCourseStudying.class,UserCourseStudying::getCourseId,CourseEntity::getId);
-        wrapper.eq(UserCourseStudying::getUserId,param.get("userId"));
+        wrapper.eq(UserCourseStudying::getUserId,ShiroUtils.getUId());
         wrapper.selectAll(CourseEntity.class);
-        wrapper.selectAs(CourseCatalogueEntity::getId,"catalogueId");
-        wrapper.selectAs(CourseCatalogueEntity::getTitle,"catalogueTitle");
         wrapper.orderByAsc(CourseEntity::getSort);
-        List courseEntities = this.getBaseMapper().selectMaps(wrapper);
+        List<CourseEntity> courseEntities = this.getBaseMapper().selectList(wrapper);
+        if(courseEntities!=null&&courseEntities.size()>0){
+            for (CourseEntity co:courseEntities){
+                List<CourseCatalogueEntity> courseCatalogueEntities = courseCatalogueDao.selectList(new MPJLambdaWrapper<CourseCatalogueEntity>().eq(CourseCatalogueEntity::getCourseId, co.getId()).orderByAsc(CourseCatalogueEntity::getSort));
+                if (courseCatalogueEntities.size() > 0) {
+                    //查询目录添加，购买的课程目录详细信息
+                    for (CourseCatalogueEntity courseCatalogueEntity : courseCatalogueEntities) {
+                        List<UserVip> userVipList = userVipDao.selectList(new LambdaQueryWrapper<UserVip>().eq(UserVip::getUserId, user.getId()));
+                        List<UserCourseBuyEntity> userCourseBuyList = userCourseBuyDao.selectList(new LambdaQueryWrapper<UserCourseBuyEntity>().eq(UserCourseBuyEntity::getUserId, ShiroUtils.getUId()).eq(UserCourseBuyEntity::getCatalogueId, courseCatalogueEntity.getId()));
+                        //是否购买，生效时间
+                        if ("1".equals(user.getVip())||"2".equals(user.getVip())){
+                            //是超级会员或者医学会员
+                            if (userVipList.size() > 0) {
+                                courseCatalogueEntity.setStartTime(userVipList.get(0).getStartTime());
+                                courseCatalogueEntity.setEndTime(userVipList.get(0).getEndTime());
+                            }
+                            courseCatalogueEntity.setIsBuy(1);
+                        }else if ("0".equals(user.getVip())){
+                            //普通用户
+                            if (userCourseBuyList.size() > 0) {
+                                courseCatalogueEntity.setIsBuy(1);
+                                courseCatalogueEntity.setStartTime(userCourseBuyList.get(0).getStartTime());
+                                courseCatalogueEntity.setEndTime(userCourseBuyList.get(0).getEndTime());
+                            }else {
+                                courseCatalogueEntity.setIsBuy(0);
+                            }
+                        }else if ("3".equals(user.getVip())){
+                            //国学会员
+                            //买的医学课程
+                            if (userCourseBuyList.size() > 0) {
+                                courseCatalogueEntity.setIsBuy(1);
+                                courseCatalogueEntity.setStartTime(userCourseBuyList.get(0).getStartTime());
+                                courseCatalogueEntity.setEndTime(userCourseBuyList.get(0).getEndTime());
+                            }else {
+                                //国学课程会员免费
+                                List<CourseToSociologyEntity> courseToSociologyList = courseToSociologyDao.selectList(new LambdaQueryWrapper<CourseToSociologyEntity>().eq(CourseToSociologyEntity::getCourseId, courseCatalogueEntity.getCourseId()));
+                                if (courseToSociologyList.size() > 0) {
+                                    courseCatalogueEntity.setIsBuy(1);
+                                    courseCatalogueEntity.setStartTime(userVipList.get(0).getStartTime());
+                                    courseCatalogueEntity.setEndTime(userVipList.get(0).getEndTime());
+                                }else {
+                                    courseCatalogueEntity.setIsBuy(0);
+                                }
+                            }
+                        }
+                    }
+                }
+                co.setCourseCatalogueEntityList(courseCatalogueEntities);
+            }
+        }
         return courseEntities;
     }