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 ce0b743..bbdcc5a 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 @@ -349,8 +349,7 @@ public class PatientCourseFacade { { //状态 1预约,2签到 - patientCourseQuery.setStatus(null); - patientCourseQuery.setStatuses(Arrays.asList(1,2)); + patientCourseQuery.setStatus(1); List patientCourseModels = patientCourseService.queryPatientCourseList(patientCourseQuery); if (CollectionUtils.isNotEmpty(patientCourseModels)) { @@ -380,10 +379,61 @@ public class PatientCourseFacade { } else { - BaseResponse objectResponse = new BaseResponse(); - objectResponse.setErrorcode(ErrorCodeConstants.NO_DATA); - objectResponse.setErrormsg("数据不存在"); - return objectResponse; + PatientsQuery patientsQuery = new PatientsQuery(); + patientsQuery.setYn(YnEnums.YES.getId()); + patientsQuery.setPvc(queryNo); + patientsQuery.setHospitalId(hospitalId); + patientsQuery.setDesc("true"); + patientsQuery.setSort("created"); + List patientses = patientsService.queryPatient(patientsQuery); + if (CollectionUtils.isNotEmpty(patientses)) { + Patients patients = patientses.get(0); + orderCourse(courseId, patients.getId(),hospitalId,1); + } + + PatientCourseQuery patientCourseQuery1 = new PatientCourseQuery(); + patientCourseQuery1.setCourseId(courseId); + patientCourseQuery1.setYn(YnEnums.YES.getId()); + + patientCourseQuery1.setHospitalId(hospitalId); + patientCourseQuery1.setQueryNo(queryNo); + + patientCourseQuery1.setStatus(1); + List patientCourseModels1 = patientCourseService.queryPatientCourseList(patientCourseQuery); + + + if (CollectionUtils.isNotEmpty(patientCourseModels1)) + { + PatientsQuery patientsQuery1 = new PatientsQuery(); + patientsQuery1.setYn(YnEnums.YES.getId()); + patientsQuery1.setId(patientCourseModels.get(0).getPatientId()); + List patientses1 = patientsService.queryPatient(patientsQuery1); + if (CollectionUtils.isNotEmpty(patientses1)) + { + Patients patients = patientses1.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()); + result.setPatientCourseId(patientCourseModels.get(0).getId()); + } + BaseObjectResponse objectResponse = new BaseObjectResponse(); + objectResponse.setData(result); + objectResponse.setErrorcode(ErrorCodeConstants.DATA_EXIST); + objectResponse.setErrormsg("确认是否签到?"); + return objectResponse; + } + } + + +// BaseResponse objectResponse = new BaseResponse(); +// objectResponse.setErrorcode(ErrorCodeConstants.NO_DATA); +// objectResponse.setErrormsg("数据不存在"); +// return objectResponse; } }