jiangjiazhi / regional-platform

Authored by liquanyu over 8 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 16 additions and 1 deletions

...	...	@@ -142,6 +142,17 @@
142	142
143	143	private Boolean extEnable;
144	144
	145	+ //是否是主档案
	146	+ private String enableNETwo;
	147	+
	148	+ public String getEnableNETwo() {
	149	+ return enableNETwo;
	150	+ }
	151	+
	152	+ public void setEnableNETwo(String enableNETwo) {
	153	+ this.enableNETwo = enableNETwo;
	154	+ }
	155	+
145	156	public Boolean getExtEnable() {
146	157	return extEnable;
147	158	}
...	...	@@ -531,6 +542,10 @@
531	542
532	543	if(null!=extEnable){
533	544	condition.and("enable",extEnable,MongoOper.EXISTS);
	545	+ }
	546	+
	547	+ if(null!=enableNETwo){
	548	+ condition.and("enable",enableNETwo,MongoOper.NE);
534	549	}
535	550	if (-1 != yn) {
536	551	condition = condition.and("yn", yn, MongoOper.IS);

...	...	@@ -1523,7 +1523,7 @@
1523	1523	String hospitalName = "";
1524	1524	BabyModelQuery babyQuery = new BabyModelQuery();
1525	1525	if(String.valueOf("true").equals(request.getIsArea())){
1526		- babyQuery.setExtEnable(false);
	1526	+ babyQuery.setEnableNETwo("2");
1527	1527	OrganizationQuery organizationQuery = new OrganizationQuery();
1528	1528
1529	1529	if(!StringUtils.isEmpty(request.getHospitalId())){