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 19c393d..19c0111 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 @@ -44,6 +44,7 @@ public class PatientCourseQuery extends BaseQuery implements IConvertToNativeQue //状态 1预约,2签到 private Integer status; + private List statuses; //patientid private String patientId; @@ -101,6 +102,10 @@ public class PatientCourseQuery extends BaseQuery implements IConvertToNativeQue condition = condition.and("status", status, MongoOper.IS); } + if (null != statuses && statuses.size() > 0) { + condition = condition.and("status", statuses, MongoOper.IN); + } + if (null != phone) { condition = condition.and("phone", phone, MongoOper.IS); } @@ -168,6 +173,14 @@ public class PatientCourseQuery extends BaseQuery implements IConvertToNativeQue return condition.toMongoQuery(); } + public List getStatuses() { + return statuses; + } + + public void setStatuses(List statuses) { + this.statuses = statuses; + } + public List getCourseIds() { return courseIds; } 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 b9ef9c6..95b76ba 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,7 +349,7 @@ public class PatientCourseFacade { { //状态 1预约,2签到 - patientCourseQuery.setStatus(1); + patientCourseQuery.setStatuses(Arrays.asList(1,2)); List patientCourseModels = patientCourseService.queryPatientCourseList(patientCourseQuery); if (CollectionUtils.isNotEmpty(patientCourseModels)) {