jiangjiazhi / regional-platform

Authored by dongqin about 7 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 19 additions and 2 deletions

...	...	@@ -38,7 +38,16 @@
38	38
39	39	private String interpretDoctorId;
40	40
	41	+ private String status;
41	42
	43	+ public String getStatus() {
	44	+ return status;
	45	+ }
	46	+
	47	+ public void setStatus(String status) {
	48	+ this.status = status;
	49	+ }
	50	+
42	51	@Override
43	52	public MongoQuery convertToQuery() {
44	53	MongoCondition condition = MongoCondition.newInstance();
...	...	@@ -65,6 +74,10 @@
65	74
66	75	if (null != doctorId) {
67	76	condition = condition.and("doctorId", doctorId, MongoOper.IS);
	77	+ }
	78	+
	79	+ if (null != status) {
	80	+ condition = condition.and("status", status, MongoOper.IS);
68	81	}
69	82
70	83

...	...	@@ -242,8 +242,12 @@
242	242	babyQuery.setBabyIds(babyIds);
243	243	babyQuery.setLimit(limit);
244	244	babyQuery.setPage(page);
245		- babyQuery.setInterpretDoctorId(interpretDoctorId);
246		-
	245	+ if (StringUtils.isNotEmpty(interpretDoctorId)) {
	246	+ babyQuery.setInterpretDoctorId(interpretDoctorId);
	247	+ }
	248	+ if (StringUtils.isNotEmpty(settleStatus)) {
	249	+ babyQuery.setStatus(settleStatus);
	250	+ }
247	251
248	252	if (StringUtils.isNotEmpty(recordTime)) {
249	253	String[] dates = recordTime.split(" - ");