diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IPatientCourseDao.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IPatientCourseDao.java index 2d06250..e5e3e13 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IPatientCourseDao.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IPatientCourseDao.java @@ -13,4 +13,6 @@ public interface IPatientCourseDao { public int queryPatientCourseListCount(MongoQuery mongoQuery); public void addPatientCourse(PatientCourseModel model); public void updatePatientCourse(MongoQuery mongoQuery,PatientCourseModel model); + + void deletePatientCourse(String id); } diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/PatientCourseDaoImpl.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/PatientCourseDaoImpl.java index a2128dd..68da732 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/PatientCourseDaoImpl.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/PatientCourseDaoImpl.java @@ -2,6 +2,8 @@ package com.lyms.platform.biz.dal.impl; import com.lyms.platform.biz.dal.IPatientCourseDao; import com.lyms.platform.common.dao.BaseMongoDAOImpl; +import com.lyms.platform.common.dao.operator.MongoCondition; +import com.lyms.platform.common.dao.operator.MongoOper; import com.lyms.platform.common.dao.operator.MongoQuery; import com.lyms.platform.pojo.PatientCourseModel; import org.springframework.stereotype.Repository; @@ -32,4 +34,9 @@ public class PatientCourseDaoImpl extends BaseMongoDAOImpl i public void updatePatientCourse(MongoQuery mongoQuery,PatientCourseModel model) { update(mongoQuery.convertToMongoQuery(),model); } + + @Override + public void deletePatientCourse(String id) { + delete(new MongoQuery(new MongoCondition("id", id, MongoOper.IS)).convertToMongoQuery()); + } } diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientCourseService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientCourseService.java index 4d6b00f..1f3c5cd 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientCourseService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientCourseService.java @@ -36,4 +36,8 @@ public class PatientCourseService { public void updatePatientCourse(PatientCourseModel model) { patientCourseDao.updatePatientCourse(new MongoQuery(new MongoCondition("id", model.getId(), MongoOper.IS)), model); } + + public void deletePatientCourse(String id) { + patientCourseDao.deletePatientCourse(id); + } } 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 9326179..d0fc878 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 @@ -117,6 +117,22 @@ public class PatientCourseController extends BaseController { /** + * 取消预约课程 + * @param id + * @param request + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/cancelOrderCourse") + @ResponseBody + public BaseResponse cancelOrderCourse( + @RequestParam(required = true) String id, + HttpServletRequest request) { + + return patientCourseFacade.cancelOrderCourse(id); + } + + + /** * 孕妇签到 * @param patientCourseId * @param request 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 6653374..596d7f4 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 @@ -126,9 +126,13 @@ public class CourseFacade { query.setYn(YnEnums.YES.getId()); query.setCourseTypeId(courseTypeId); query.setStatus(status); - query.setPage(page); - query.setLimit(limit); - query.setNeed(isPage); + if ("true".equals(isPage)) + { + query.setPage(page); + query.setLimit(limit); + query.setNeed(isPage); + } + query.setHospitalId(hospitalId); query.setCourseSpeaker(courseSpeaker); query.setCourseName(courseName); 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 b0cef5e..8e5c018 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 @@ -365,6 +365,7 @@ public class PatientCourseFacade { query.setLimit(limit); query.setNeed("true"); query.setHospitalIds(hospitalIdList); + query.setKeyword(keyword); List courseModels = courseService.queryCourseList(query); List results = new ArrayList<>(); @@ -428,4 +429,12 @@ public class PatientCourseFacade { objectResponse.setErrormsg("成功"); return objectResponse; } + + public BaseResponse cancelOrderCourse(String id) { + patientCourseService.deletePatientCourse(id); + BaseResponse objectResponse = new BaseResponse(); + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + objectResponse.setErrormsg("成功"); + return objectResponse; + } } \ No newline at end of file