jiangjiazhi / regional-platform

Authored by changpengfei over 3 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 23 additions and 0 deletions

...	...	@@ -86,6 +86,7 @@
86	86	private String operaterUserId;
87	87
88	88	private String sieveType;
	89	+ private String teamId;
89	90
90	91	public String getSieveType() {
91	92	return sieveType;
...	...	@@ -735,6 +736,9 @@
735	736	if (StringUtils.isNotEmpty(streetRegisterId)) {
736	737	condition = condition.and("streetRegisterId", streetRegisterId, MongoOper.IS);
737	738	}
	739	+ if (StringUtils.isNotEmpty(teamId)) {
	740	+ condition = condition.and("teamIdNew", teamId, MongoOper.IS);
	741	+ }
738	742
739	743
740	744	if (null != hospitalId) {
...	...	@@ -927,5 +931,11 @@
927	931	this.parentId = parentId;
928	932	}
929	933
	934	+ public void setTeamId(String teamId) {
	935	+ this.teamId = teamId;
	936	+ }
	937	+ public String getTeamId() {
	938	+ return teamId;
	939	+ }
930	940	}

...	...	@@ -373,6 +373,9 @@
373	373	String hospital = autoMatchFacade.getHospitalId(userId);
374	374	antExRecordQuery.setHospitalId(hospital);
375	375	}
	376	+ if(org.apache.commons.lang3.StringUtils.isNotEmpty(antExManagerQueryRequest.getTeamId())){
	377	+ antExRecordQuery.setTeamId(antExManagerQueryRequest.getTeamId());
	378	+ }
376	379	return antExRecordQuery;
377	380	}
378	381

...	...	@@ -131,6 +131,16 @@
131	131
132	132	private String sieveType;
133	133
	134	+ private String teamId;
	135	+
	136	+ public String getTeamId() {
	137	+ return teamId;
	138	+ }
	139	+
	140	+ public void setTeamId(String teamId) {
	141	+ this.teamId = teamId;
	142	+ }
	143	+
134	144	public String getSieveType() {
135	145	return sieveType;
136	146	}