jiangjiazhi / regional-platform

Authored by liquanyu over 7 years ago

Exists in master and in 6 other branches

Showing 4 changed files with 47 additions and 15 deletions

...	...	@@ -55,6 +55,23 @@
55	55
56	56
57	57	/**
	58	+ * 获取已发布课程列表
	59	+ * @param request
	60	+ * @return
	61	+ */
	62	+ @RequestMapping(method = RequestMethod.GET, value = "/getYfbCoureseList")
	63	+ @ResponseBody
	64	+ @TokenRequired
	65	+ public BaseResponse getCoureseList(
	66	+ HttpServletRequest request) {
	67	+
	68	+ return courseFacade.getCoureseList(null, 2, null, null,
	69	+ null, null, null, null, getUserId(request),null);
	70	+ }
	71	+
	72	+
	73	+
	74	+ /**
58	75	* 课程列表
59	76	* @param courseTypeId 课程类型id
60	77	* @param page
...	...	@@ -81,7 +98,7 @@
81	98	HttpServletRequest request) {
82	99
83	100	return courseFacade.getCoureseList(courseTypeId, status,courseName,courseSpeaker,
84		- createdTime, courseTime, page, limit, getUserId(request));
	101	+ createdTime, courseTime, page, limit, getUserId(request),"true");
85	102	}
86	103
87	104

...	...	@@ -22,22 +22,26 @@
22	22	private PatientCourseFacade patientCourseFacade;
23	23
24	24	/**
25		- * 可预约课程
	25	+ * 预约列表
	26	+ * @param courseId 课程id
26	27	* @param request
27	28	* @return
28	29	*/
29	30	@RequestMapping(method = RequestMethod.GET, value = "/getOrderPatientCourseList")
30	31	@ResponseBody
31	32	@TokenRequired
32		- public BaseResponse getOrderPatientCourseList(
	33	+ public BaseResponse getOrderPatientCourseList(@RequestParam(required = false) String courseId,
	34	+ @RequestParam("page") Integer page,
	35	+ @RequestParam("limit") Integer limit,
33	36	HttpServletRequest request) {
34	37
35		- return patientCourseFacade.getPatientCourseList(getUserId(request));
	38	+ return patientCourseFacade.getPatientCourseList(1,courseId, page,limit,getUserId(request));
36	39	}
37	40
38	41
39	42	/**
40	43	* 签到列表
	44	+ * @param courseId 课程id
41	45	* @param request
42	46	* @return
43	47	*/
44	48
...	...	@@ -45,9 +49,12 @@
45	49	@ResponseBody
46	50	@TokenRequired
47	51	public BaseResponse getSignPatientCourseList(
48		- HttpServletRequest request) {
	52	+ @RequestParam(required = false) String courseId,
	53	+ @RequestParam("page") Integer page,
	54	+ @RequestParam("limit") Integer limit,
	55	+ HttpServletRequest request) {
49	56
50		- return patientCourseFacade.getPatientCourseList(getUserId(request));
	57	+ return patientCourseFacade.getPatientCourseList(2,courseId, page, limit, getUserId(request));
51	58	}
52	59
53	60

...	...	@@ -99,7 +99,7 @@
99	99
100	100	public BaseResponse getCoureseList(String courseTypeId, Integer status,String courseName,String courseSpeaker,
101	101	String createdTime, String courseTime,
102		- Integer page, Integer limit, Integer userId) {
	102	+ Integer page, Integer limit, Integer userId,String isPage) {
103	103
104	104	String hospitalId = autoMatchFacade.getHospitalId(userId);
105	105	List<CourseResult> results = new ArrayList<>();
...	...	@@ -128,7 +128,7 @@
128	128	query.setStatus(status);
129	129	query.setPage(page);
130	130	query.setLimit(limit);
131		- query.setNeed("true");
	131	+ query.setNeed(isPage);
132	132	query.setHospitalId(hospitalId);
133	133	query.setCourseSpeaker(courseSpeaker);
134	134	query.setCourseName(courseName);

...	...	@@ -64,18 +64,26 @@
64	64	private OrganizationService organizationService;
65	65
66	66
67		- public BaseResponse getPatientCourseList(Integer userId) {
	67	+ public BaseResponse getPatientCourseList(Integer status,String courseId, Integer page,
	68	+ Integer limit, Integer userId) {
68	69
69	70	String hospitalId = autoMatchFacade.getHospitalId(userId);
70		- CourseQuery query = new CourseQuery();
71		- query.setYn(YnEnums.YES.getId());
72		- query.setStatus(CourseStatusEnums.YFB.getId());
73		- query.setHospitalId(hospitalId);
74		- List<CourseResult> results = getCourseList(query);
75	71
	72	+ PatientCourseQuery patientCourseQuery = new PatientCourseQuery();
	73	+ patientCourseQuery.setYn(YnEnums.YES.getId());
	74	+ patientCourseQuery.setNeed("true");
	75	+ patientCourseQuery.setPage(page);
	76	+ patientCourseQuery.setLimit(limit);
	77	+ patientCourseQuery.setHospitalId(hospitalId);
	78	+ patientCourseQuery.setCourseId(courseId);
	79	+ //状态 1预约，2签到
	80	+ patientCourseQuery.setStatus(status);
	81	+
	82	+ List<PatientCourseResult> results = getPatientCourse(patientCourseQuery);
	83	+
76	84	BaseListResponse objectResponse = new BaseListResponse();
77	85	objectResponse.setData(results);
78		- objectResponse.setPageInfo(query.getPageInfo());
	86	+ objectResponse.setPageInfo(patientCourseQuery.getPageInfo());
79	87	objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
80	88	objectResponse.setErrormsg("成功");
81	89	return objectResponse;