diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientCourseController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientCourseController.java index 36775e0..75fec7f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientCourseController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientCourseController.java @@ -94,66 +94,71 @@ public class PatientCourseController extends BaseController { } + /** - * 孕妇预约课程 - * @param courseId - * @param patientId - * @param hospitalId - * @param orderType //预约类型 1 院内 2 小程序 + * 孕妇签到 + * @param patientCourseId * @param request * @return */ - @RequestMapping(method = RequestMethod.GET, value = "/orderCourse") + @RequestMapping(method = RequestMethod.GET, value = "/signCourse") @ResponseBody - public BaseResponse orderCourse( + @TokenRequired + public BaseResponse signCourse( + @RequestParam(required = true) String patientCourseId, @RequestParam(required = true) String courseId, - @RequestParam(required = true) String patientId, - @RequestParam(required = true) String hospitalId, - @RequestParam(required = true) Integer orderType, HttpServletRequest request) { - return patientCourseFacade.orderCourse(courseId, patientId, hospitalId, orderType); + return patientCourseFacade.signCourse(patientCourseId, courseId, getUserId(request)); } + /** - * 取消预约课程 - * @param id + * 院内系统和小程序孕妇预约课程 + * @param courseId 课程id + * @param patientId 孕妇id + * @param hospitalId 医院id + * @param orderType 预约类型 1 院内 2 小程序 * @param request * @return */ - @RequestMapping(method = RequestMethod.GET, value = "/cancelOrderCourse") + @RequestMapping(method = RequestMethod.GET, value = "/orderCourse") @ResponseBody - public BaseResponse cancelOrderCourse( - @RequestParam(required = true) String id, + public BaseResponse orderCourse( + @RequestParam(required = true) String courseId, + @RequestParam(required = true) String patientId, + @RequestParam(required = true) String hospitalId, + @RequestParam(required = true) Integer orderType, HttpServletRequest request) { - return patientCourseFacade.cancelOrderCourse(id); + return patientCourseFacade.orderCourse(courseId, patientId, hospitalId, orderType); } /** - * 孕妇签到 - * @param patientCourseId + * 取消预约课程 + * @param patientId 孕妇id + * @param courseId 课程id * @param request * @return */ - @RequestMapping(method = RequestMethod.GET, value = "/signCourse") + @RequestMapping(method = RequestMethod.GET, value = "/cancelOrderCourse") @ResponseBody - @TokenRequired - public BaseResponse signCourse( - @RequestParam(required = true) String patientCourseId, + public BaseResponse cancelOrderCourse( + @RequestParam(required = true) String patientId, @RequestParam(required = true) String courseId, HttpServletRequest request) { - return patientCourseFacade.signCourse(patientCourseId, courseId, getUserId(request)); + return patientCourseFacade.cancelOrderCourse(patientId, courseId); } + /** * 获取小程序的孕妇学校列表 - * @param hospitalIds 医院id - * @param patientId 患者id + * @param hospitalIds 医院id 例:213,132 + * @param patientId 孕妇id * @param keyword 查询关键字 * @param status 2 最新课程 3 历史课程 * @param page 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 eb5287f..04f4fe4 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 @@ -443,6 +443,9 @@ public class PatientCourseFacade { for (CourseModel model : courseModels) { Map result = new HashMap<>(); + //课程id + result.put("courseId",model.getId()); + //课程名称 result.put("courseName",model.getCourseName()); //课程描述 @@ -507,8 +510,18 @@ public class PatientCourseFacade { return objectResponse; } - public BaseResponse cancelOrderCourse(String id) { - patientCourseService.deletePatientCourse(id); + public BaseResponse cancelOrderCourse(String patientId,String courseId) { + + PatientCourseQuery patientCourseQuery = new PatientCourseQuery(); + patientCourseQuery.setYn(YnEnums.YES.getId()); + patientCourseQuery.setPatientId(patientId); + patientCourseQuery.setCourseId(courseId); + List patientCourseModels = patientCourseService.queryPatientCourseList(patientCourseQuery); + if (CollectionUtils.isNotEmpty(patientCourseModels)) + { + String id = patientCourseModels.get(0).getId(); + patientCourseService.deletePatientCourse(id); + } BaseResponse objectResponse = new BaseResponse(); objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); objectResponse.setErrormsg("成功");