jiangjiazhi / regional-platform | GitLab

Commit 9de70b1c9c9ffe652874471d74247da772d06209

Authored by rui.zhang over 9 years ago

2 parents 322acd604f 09d03ddba1

Exists in master and in 8 other branches

Merge remote-tracking branch 'origin/master'

Showing 4 changed files

platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManagerQueryRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PuerperaManagerQueryRequest.java

...	...	@@ -184,7 +184,7 @@
184	184	condition = condition.orCondition(new MongoCondition[]{con1,con});
185	185	}
186	186	if(visitstatus!=-1){
187		- condition= condition.and("visitstatus", visitstatus, MongoOper.IS);
	187	+ condition= condition.and("isVisit", visitstatus, MongoOper.IS);
188	188	}
189	189	if(null!=communityId){
190	190	condition= condition.and("communityId", communityId, MongoOper.IS);

...	...	@@ -35,8 +35,8 @@
35	35
36	36	BasicConfigQuery basicConfigQuery = new BasicConfigQuery();
37	37	basicConfigQuery.setNeed("1");
38		- basicConfigQuery.setId(basicConfigQueryRequest.getId());
39		- basicConfigQuery.setParentId(basicConfigQueryRequest.getParentId());
	38	+// basicConfigQuery.setId(basicConfigQueryRequest.getId());
	39	+// basicConfigQuery.setParentId(basicConfigQueryRequest.getParentId());
40	40	basicConfigQuery.setPage(basicConfigQueryRequest.getPage());
41	41	basicConfigQuery.setLimit(basicConfigQueryRequest.getLimit());
42	42	basicConfigQuery.setYn(YnEnums.YES.getId());

...	...	@@ -71,6 +71,10 @@
71	71	}
72	72
73	73	public int getVisitstatus() {
	74	+ //如果传的未访视就转成0
	75	+ if(visitstatus==2){
	76	+ visitstatus=0;
	77	+ }
74	78	return visitstatus;
75	79	}
76	80

...	...	@@ -83,6 +83,10 @@
83	83	}
84	84
85	85	public int getVisitstatus() {
	86	+ //如果传的未访视就转成0
	87	+ if(visitstatus==2){
	88	+ visitstatus=0;
	89	+ }
86	90	return visitstatus;
87	91	}
88	92