diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CourseController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CourseController.java index e4493a6..59bc853 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CourseController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CourseController.java @@ -228,9 +228,11 @@ public class CourseController extends BaseController { @RequestMapping(method = RequestMethod.GET, value = "/getCourseCount") @ResponseBody @TokenRequired - public BaseResponse getCourseCount(HttpServletRequest request, @RequestParam(required = false) String time) { + public BaseResponse getCourseCount( HttpServletRequest request, + @RequestParam(required = false) String time, + @RequestParam(required = false) String courseName) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return courseFacade.getCourseCount(time, loginState.getId()); + return courseFacade.getCourseCount(time,courseName, loginState.getId()); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java index 64f0c8b..14731c4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java @@ -696,7 +696,7 @@ public class CourseFacade { * @param userId * @return */ - public BaseResponse getCourseCount(String time, Integer userId) { + public BaseResponse getCourseCount(String time,String courseName, Integer userId) { BaseObjectResponse objectResponse = new BaseObjectResponse(); String hospitalId = autoMatchFacade.getHospitalId(userId); @@ -867,6 +867,13 @@ public class CourseFacade { Map tableItem = new HashMap(); for (Map map: list) { + // 如果前端有courseName传下来,判断是否存在,不存在进行循环下一个 + if(StringUtils.isNotEmpty(courseName)){ + if(!map.get("courseName").contains(courseName)){ + continue; + } + } + if (courseModel.getId().equals(map.get("courseId"))) { titles.add(map.get("title"));