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 9b64a64..6b7d9ee 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 @@ -69,9 +69,10 @@ public class PatientCourseController extends BaseController { @TokenRequired public BaseResponse queryOrderPatient( @RequestParam(required = true) String queryNo, + @RequestParam(required = true) String courseId, HttpServletRequest request) { - return patientCourseFacade.queryOrderPatient(queryNo, getUserId(request)); + return patientCourseFacade.queryOrderPatient(queryNo,courseId, getUserId(request)); } @@ -86,9 +87,10 @@ public class PatientCourseController extends BaseController { @TokenRequired public BaseResponse querySignPatient( @RequestParam(required = true) String queryNo, + @RequestParam(required = true) String courseId, HttpServletRequest request) { - return patientCourseFacade.querySignPatient(queryNo, getUserId(request)); + return patientCourseFacade.querySignPatient(queryNo,courseId, getUserId(request)); } @@ -103,7 +105,6 @@ public class PatientCourseController extends BaseController { */ @RequestMapping(method = RequestMethod.GET, value = "/orderCourse") @ResponseBody - @TokenRequired public BaseResponse orderCourse( @RequestParam(required = true) String courseId, @RequestParam(required = true) String patientId, @@ -115,16 +116,19 @@ public class PatientCourseController extends BaseController { } + /** + * 孕妇签到 + * @param patientCourseId + * @param request + * @return + */ @RequestMapping(method = RequestMethod.GET, value = "/signCourse") @ResponseBody - @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.signCourse(courseId,patientId,hospitalId, orderType,getUserId(request)); + return patientCourseFacade.signCourse(patientCourseId,courseId,getUserId(request)); } } 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 4d3dafe..65d1a0f 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 @@ -80,12 +80,12 @@ public class PatientCourseFacade { return objectResponse; } - public BaseResponse queryOrderPatient(String queryNo, Integer userId) { + public BaseResponse queryOrderPatient(String queryNo,String courseId, Integer userId) { String hospitalId = autoMatchFacade.getHospitalId(userId); PatientCourseQuery patientCourseQuery = new PatientCourseQuery(); patientCourseQuery.setYn(YnEnums.YES.getId()); - + patientCourseQuery.setCourseId(courseId); patientCourseQuery.setHospitalId(hospitalId); patientCourseQuery.setQueryNo(queryNo); //状态 1预约，2签到 @@ -113,14 +113,14 @@ public class PatientCourseFacade { } BaseObjectResponse objectResponse = new BaseObjectResponse(); objectResponse.setData(result); - objectResponse.setErrorcode(ErrorCodeConstants.NO_DATA); + objectResponse.setErrorcode(ErrorCodeConstants.NAME_EXIST); objectResponse.setErrormsg("该孕妇未预约此课程，是否现在预约？"); return objectResponse; } else { BaseResponse objectResponse = new BaseResponse(); - objectResponse.setErrorcode(ErrorCodeConstants.DATA_EXIST); + objectResponse.setErrorcode(ErrorCodeConstants.NO_DATA); objectResponse.setErrormsg("数据不存在"); return objectResponse; } @@ -144,15 +144,6 @@ public class PatientCourseFacade { for (PatientCourseModel model : patientCourseModels) { PatientCourseResult result = new PatientCourseResult(); -// Patients patients = patientsService.findOnePatientById(model.getPatientId()); -// if (patients != null) -// { -// result.setAge(DateUtil.getAge(patients.getBirth(),new Date())); -// result.setCardNo(patients.getCardNo()); -// result.setUserName(patients.getUsername()); -// result.setPhone(patients.getPhone()); -// result.setVcCardNo(patients.getVcCardNo()); -// } result.setAge(DateUtil.getAge(model.getBirthday(),new Date())); result.setCardNo(model.getCardNo()); result.setUserName(model.getUserName()); @@ -213,10 +204,11 @@ public class PatientCourseFacade { } - public BaseResponse querySignPatient(String queryNo, Integer userId) { + public BaseResponse querySignPatient(String queryNo,String courseId, Integer userId) { String hospitalId = autoMatchFacade.getHospitalId(userId); PatientCourseQuery patientCourseQuery = new PatientCourseQuery(); + patientCourseQuery.setCourseId(courseId); patientCourseQuery.setYn(YnEnums.YES.getId()); patientCourseQuery.setHospitalId(hospitalId); @@ -227,33 +219,21 @@ public class PatientCourseFacade { List results = getPatientCourse(patientCourseQuery); if (CollectionUtils.isEmpty(results)) { - PatientsQuery patientsQuery = new PatientsQuery(); - patientsQuery.setYn(YnEnums.YES.getId()); - patientsQuery.setPvc(queryNo); - List patientses = patientsService.queryPatient(patientsQuery); - if (CollectionUtils.isNotEmpty(patientses)) + + //状态 1预约，2签到 + patientCourseQuery.setStatus(1); + List patientCourseModels = patientCourseService.queryPatientCourseList(patientCourseQuery); + if (CollectionUtils.isNotEmpty(patientCourseModels)) { - Patients patients = patientses.get(0); - PatientCourseResult result = new PatientCourseResult(); - if (patients != null) - { - result.setAge(DateUtil.getAge(patients.getBirth(),new Date())); - result.setCardNo(patients.getCardNo()); - result.setUserName(patients.getUsername()); - result.setPhone(patients.getPhone()); - result.setVcCardNo(patients.getVcCardNo()); - result.setPatientId(patients.getId()); - } - BaseObjectResponse objectResponse = new BaseObjectResponse(); - objectResponse.setData(result); - objectResponse.setErrorcode(ErrorCodeConstants.NO_DATA); - objectResponse.setErrormsg("该孕妇未预约此课程，无法签到，是否现在预约？"); + BaseResponse objectResponse = new BaseResponse(); + objectResponse.setErrorcode(ErrorCodeConstants.DATA_EXIST); + objectResponse.setErrormsg("孕妇已经预约，确认是否签到？"); return objectResponse; } else { BaseResponse objectResponse = new BaseResponse(); - objectResponse.setErrorcode(ErrorCodeConstants.DATA_EXIST); + objectResponse.setErrorcode(ErrorCodeConstants.NO_DATA); objectResponse.setErrormsg("数据不存在"); return objectResponse; } @@ -267,7 +247,7 @@ public class PatientCourseFacade { return objectResponse; } - public BaseResponse signCourse(String courseId, String patientId, String hospitalId, Integer orderType, Integer userId) { + public BaseResponse signCourse(String patientCourseId,String courseId, Integer userId) { BaseResponse objectResponse = new BaseResponse(); CourseQuery query = new CourseQuery(); @@ -280,29 +260,19 @@ public class PatientCourseFacade { if (model != null && model.getCourseEndTime().getTime() < new Date().getTime()) { objectResponse.setErrorcode(ErrorCodeConstants.DATA_EXPIRE); - objectResponse.setErrormsg("该课程预约时间已截止，请刷新后重试"); + objectResponse.setErrormsg("该课程签到时间已截止，请刷新后重试"); return objectResponse; } } - Patients patients = patientsService.findOnePatientById(patientId); - if (patients == null) + if (patientCourseId == null) { PatientCourseModel model = new PatientCourseModel(); - model.setBirthday(patients.getBirth()); - model.setCardNo(patients.getCardNo()); - model.setUserName(patients.getUsername()); - model.setPhone(patients.getPhone()); - model.setVcCardNo(patients.getVcCardNo()); - model.setOrderTime(new Date()); - model.setOrderType(orderType); - model.setOperUserId(String.valueOf(userId)); - model.setHospitalId(hospitalId); - model.setCourseId(courseId); - model.setCreated(new Date()); + model.setId(patientCourseId); model.setModified(new Date()); model.setYn(YnEnums.YES.getId()); - patientCourseService.addPatientCourse(model); + model.setStatus(2); + patientCourseService.updatePatientCourse(model); } objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);