jiangjiazhi / regional-platform

Authored by liquanyu over 6 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 14 additions and 1 deletions

...	...	@@ -44,6 +44,7 @@
44	44
45	45	//状态 1预约，2签到
46	46	private Integer status;
	47	+ private List<Integer> statuses;
47	48
48	49	//patientid
49	50	private String patientId;
...	...	@@ -101,6 +102,10 @@
101	102	condition = condition.and("status", status, MongoOper.IS);
102	103	}
103	104
	105	+ if (null != statuses && statuses.size() > 0) {
	106	+ condition = condition.and("status", statuses, MongoOper.IN);
	107	+ }
	108	+
104	109	if (null != phone) {
105	110	condition = condition.and("phone", phone, MongoOper.IS);
106	111	}
...	...	@@ -166,6 +171,14 @@
166	171	}
167	172
168	173	return condition.toMongoQuery();
	174	+ }
	175	+
	176	+ public List<Integer> getStatuses() {
	177	+ return statuses;
	178	+ }
	179	+
	180	+ public void setStatuses(List<Integer> statuses) {
	181	+ this.statuses = statuses;
169	182	}
170	183
171	184	public List<String> getCourseIds() {

...	...	@@ -349,7 +349,7 @@
349	349	{
350	350
351	351	//状态 1预约，2签到
352		- patientCourseQuery.setStatus(1);
	352	+ patientCourseQuery.setStatuses(Arrays.asList(1,2));
353	353	List<PatientCourseModel> patientCourseModels = patientCourseService.queryPatientCourseList(patientCourseQuery);
354	354	if (CollectionUtils.isNotEmpty(patientCourseModels))
355	355	{