diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PatientCourseQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PatientCourseQuery.java index 2ad7765..624aa29 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PatientCourseQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PatientCourseQuery.java @@ -5,6 +5,7 @@ import com.lyms.platform.common.dao.BaseQuery; 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 org.springframework.data.mongodb.core.query.Criteria; import java.util.Date; @@ -60,6 +61,8 @@ public class PatientCourseQuery extends BaseQuery implements IConvertToNativeQue private String hospitalId; + private String queryNo; + @Override public MongoQuery convertToQuery() { MongoCondition condition = MongoCondition.newInstance(); @@ -106,10 +109,36 @@ public class PatientCourseQuery extends BaseQuery implements IConvertToNativeQue if (null != yn) { condition = condition.and("yn", yn, MongoOper.IS); } + Criteria c1 = null; + + if (null != queryNo) { + MongoCondition c = MongoCondition.newInstance(); + MongoCondition con1 = MongoCondition.newInstance("phone", queryNo, MongoOper.IS); + MongoCondition con3 = MongoCondition.newInstance("cardNo", queryNo, MongoOper.IS); + MongoCondition con5 = MongoCondition.newInstance("vcCardNo", queryNo, MongoOper.IS); + if (c1 != null) { + c1 = c1.andOperator(c.orCondition(new MongoCondition[]{con1, con3, con5}).getCriteria()); + } else { + c1 = c.orCondition(new MongoCondition[]{con1, con3, con5}).getCriteria(); + } + } + + + if (null != c1) { + condition = condition.andCondition(new MongoCondition(c1)); + + } return condition.toMongoQuery(); } + public String getQueryNo() { + return queryNo; + } + + public void setQueryNo(String queryNo) { + this.queryNo = queryNo; + } public String getId() { return 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 34bb0d4..41843a9 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 @@ -56,4 +56,21 @@ public class PatientCourseController extends BaseController { return patientCourseFacade.getPatientCourseList(2,courseId, page, limit, getUserId(request)); } + + + /** + * 搜索预约详情 + * @param queryNo + * @param request + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/queryOrderPatient") + @ResponseBody + @TokenRequired + public BaseResponse queryOrderPatient( + @RequestParam(required = true) String queryNo, + HttpServletRequest request) { + + return patientCourseFacade.queryOrderPatient(queryNo, 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 fb62a80..74031e0 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 @@ -11,10 +11,13 @@ import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.operate.web.result.PatientCourseResult; import com.lyms.platform.permission.service.UsersService; +import com.lyms.platform.pojo.CourseModel; import com.lyms.platform.pojo.PatientCourseModel; import com.lyms.platform.pojo.Patients; +import com.lyms.platform.query.CourseQuery; import com.lyms.platform.query.PatientCourseQuery; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -96,4 +99,21 @@ public class PatientCourseFacade { return objectResponse; } + public BaseResponse queryOrderPatient(String queryNo, Integer userId) { + String hospitalId = autoMatchFacade.getHospitalId(userId); + + PatientCourseQuery patientCourseQuery = new PatientCourseQuery(); + patientCourseQuery.setYn(YnEnums.YES.getId()); + + patientCourseQuery.setHospitalId(hospitalId); + patientCourseQuery.setQueryNo(queryNo); + //状态 1预约,2签到 + patientCourseQuery.setStatus(1); + + List results = new ArrayList<>(); + + + List patientCourseModels = patientCourseService.queryPatientCourseList(patientCourseQuery); + return null; + } } \ No newline at end of file