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 5d76bb6..2b58315 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 @@ -70,6 +70,23 @@ public class CourseController extends BaseController { null, null, null, null, getUserId(request), null); } + /** + * 小程序获取可以签到的列表 + * @param hospitalId + * @param request + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/getAppYfbCoureseList") + @ResponseBody + @TokenRequired + public BaseResponse getAppYfbCoureseList( + @RequestParam(required = false) String hospitalId, + HttpServletRequest request) { + + return courseFacade.getCoureseListResp(null, 2, null, null, + null, null, null, null, null, hospitalId); + } + /** 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 502fbee..1e61412 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 @@ -114,11 +114,22 @@ public class CourseFacade { return model; } - public BaseResponse getCoureseList(String courseTypeId, Integer status,String courseName,String courseSpeaker, + public BaseResponse getCoureseList(String courseTypeId, Integer status, + String courseName,String courseSpeaker, String createdTime, String courseTime, - Integer page, Integer limit, Integer userId,String isPage) { + Integer page, Integer limit, + Integer userId,String isPage) { String hospitalId = autoMatchFacade.getHospitalId(userId); + BaseListResponse objectResponse = getCoureseListResp(courseTypeId, status, courseName, courseSpeaker, createdTime, courseTime, page, limit, isPage, hospitalId); + return objectResponse; + } + + public BaseListResponse getCoureseListResp(String courseTypeId, Integer status, + String courseName, String courseSpeaker, + String createdTime, String courseTime, + Integer page, Integer limit, + String isPage, String hospitalId) { List results = new ArrayList<>(); CourseQuery query = new CourseQuery(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientCourseFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientCourseFacade.java index ebae1e7..c30bcc7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientCourseFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientCourseFacade.java @@ -544,6 +544,7 @@ public class PatientCourseFacade { } result.put("hospitalName",hospitalName); + result.put("hospitalId",model.getHospitalId()); //报名人数 result.put("enrolmentNum", model.getEnrolmentNum() == null ? "0" : String.valueOf(model.getEnrolmentNum()));