From 72399d6bc5ddeb7ff94da401a3b3faf80c39ec30 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 30 Apr 2021 18:16:50 +0800 Subject: [PATCH] update --- .../java/com/lyms/platform/query/CourseQuery.java | 13 +++ .../operate/web/controller/CourseController.java | 19 +++++ .../platform/operate/web/facade/CourseFacade.java | 99 ++++++++++++++++++++-- 3 files changed, 125 insertions(+), 6 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/query/CourseQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/CourseQuery.java index a98d7c7..785ee74 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/CourseQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/CourseQuery.java @@ -17,6 +17,7 @@ import java.util.List; public class CourseQuery extends BaseQuery implements IConvertToNativeQuery { private String id; + private List ids; //课程名称 private String courseName; @@ -89,6 +90,10 @@ public class CourseQuery extends BaseQuery implements IConvertToNativeQuery { condition = condition.and("id", id, MongoOper.IS); } + if (CollectionUtils.isNotEmpty(ids)) { + condition = condition.and("id", ids, MongoOper.IN); + } + if (null != yn) { condition = condition.and("yn", yn, MongoOper.IS); } @@ -214,6 +219,14 @@ public class CourseQuery extends BaseQuery implements IConvertToNativeQuery { return condition.toMongoQuery(); } + public List getIds() { + return ids; + } + + public void setIds(List ids) { + this.ids = ids; + } + public Date getPublishTimeStart() { return publishTimeStart; } 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 c653757..b0b31d6 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 @@ -89,6 +89,25 @@ public class CourseController extends BaseController { } + /** + * 小程序获取取消的课程列表 + * @param hospitalId + * @param patientId + * @param request + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/getCancelAppCourseList") + @ResponseBody + public BaseResponse getCancelAppCourseList( + @RequestParam(required = false) String hospitalId, + @RequestParam(required = false) String patientId, + HttpServletRequest request) { + + return courseFacade.getCancelAppCourseList(hospitalId,patientId); + } + + + /** * 课程列表 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 fbb2301..2997dc9 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 @@ -11,17 +11,12 @@ import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.*; import com.lyms.platform.operate.web.request.CourseRequest; import com.lyms.platform.operate.web.result.CourseResult; -import com.lyms.platform.operate.web.result.PatientCourseResult; -import com.lyms.platform.operate.web.utils.MessageCenterService; import com.lyms.platform.operate.web.worker.CourseCountWorker; import com.lyms.platform.permission.model.*; import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.*; -import com.lyms.platform.query.CourseEvalQuery; -import com.lyms.platform.query.CourseQuery; -import com.lyms.platform.query.CourseTypeQuery; -import com.lyms.platform.query.PatientCourseQuery; +import com.lyms.platform.query.*; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -910,4 +905,96 @@ public class CourseFacade { objectResponse.setErrormsg("成功"); return objectResponse; } + + public BaseResponse getCancelAppCourseList(String hospitalId, String patientId) { + + + + + PatientCourseQuery patientCourseQuery = new PatientCourseQuery(); + patientCourseQuery.setYn(YnEnums.YES.getId()); + List patids = new ArrayList<>(); + + PatientsQuery patientsQuery = new PatientsQuery(); + patientsQuery.setYn(YnEnums.YES.getId()); + patientsQuery.setId(patientId); + List patientses = patientsService.queryPatient(patientsQuery); + if (CollectionUtils.isNotEmpty(patientses)) { + + Patients patients = patientses.get(0); + patientsQuery.setId(null); + patientsQuery.setPid(patients.getPid()); + patientsQuery.setDesc("true"); + patientsQuery.setSort("created"); + patientses = patientsService.queryPatient(patientsQuery); + if (CollectionUtils.isNotEmpty(patientses)) + { + for (Patients pat : patientses) + { + patids.add(pat.getId()); + } + } + } + patientCourseQuery.setPatientIds(patids); + + //状态 1预约，2签到 + patientCourseQuery.setStatus(1); + List patientCourseModels = patientCourseService.queryPatientCourseList(patientCourseQuery); + + List courses = new ArrayList<>(); + //获取预约的课程id + if (CollectionUtils.isNotEmpty(patientCourseModels)) + { + for (PatientCourseModel courseModel : patientCourseModels) + { + courses.add(courseModel.getCourseId()); + } + } + + if (CollectionUtils.isEmpty(courses)) + { + return new BaseObjectResponse().setData(null).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION); + } + CourseQuery query = new CourseQuery(); + query.setYn(YnEnums.YES.getId()); + query.setIds(courses); + query.setStatus(CourseStatusEnums.YQX.getId()); + List courseModels = courseService.queryCourseList(query); + List results = new ArrayList<>(); + + if (CollectionUtils.isNotEmpty(courseModels)) + { + for (CourseModel model : courseModels) + { + if (model.getCourseEndTime().getTime() > System.currentTimeMillis()) + { + CourseResult result = new CourseResult(); + CourseTypeQuery courseTypeQuery = new CourseTypeQuery(); + courseTypeQuery.setYn(YnEnums.YES.getId()); + courseTypeQuery.setId(model.getCourseTypeId()); + List typeModels = courseTypeService.queryCourseTypeList(courseTypeQuery); + if (CollectionUtils.isNotEmpty(typeModels)) + { + String courseType = typeModels.get(0).getCourseTypeName(); + result.setCourseType(courseType); + } + result.setCourseTypeId(model.getCourseTypeId()); + result.setId(model.getId()); + result.setCourseTypeId(model.getCourseTypeId()); + result.setCourseName(model.getCourseName()); + result.setCourseSpeaker(model.getCourseSpeaker()); + result.setCourseAddress(model.getCourseAddress()); + result.setCourseTime(DateUtil.gety_m_dhm(model.getCourseTime())); + result.setTimeLong(model.getTimeLong()); + result.setLimitNum(model.getLimitNum()); + result.setEnrolmentNum(model.getEnrolmentNum()); + result.setSignNum(model.getSignNum()); + result.setStatus(CourseStatusEnums.getNameById(model.getStatus())); + result.setCreated(DateUtil.getyyyy_MM_dd_hms(model.getCreated())); + results.add(result); + } + } + } + return new BaseObjectResponse().setData(results).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION); + } } \ No newline at end of file -- 1.8.3.1