fangcheng / regional-platform

Authored by jiangjiazhi over 9 years ago

Showing 2 changed files with 17 additions and 4 deletions

...	...	@@ -44,6 +44,16 @@
44	44	this.mphone = mphone;
45	45	}
46	46
	47	+ private String areaId;
	48	+
	49	+ public String getAreaId() {
	50	+ return areaId;
	51	+ }
	52	+
	53	+ public void setAreaId(String areaId) {
	54	+ this.areaId = areaId;
	55	+ }
	56	+
47	57	/**
48	58	* 母亲的id
49	59	*/
...	...	@@ -148,6 +158,9 @@
148	158	}
149	159	if(-1!=yn){
150	160	condition = condition.and("yn", yn, MongoOper.IS);
	161	+ }
	162	+ if(null!=areaId){
	163	+ condition = condition.and("areaId", areaId, MongoOper.IS);
151	164	}
152	165	/*
153	166	* if(null!=keyword){ if(null!=keyword){ MongoCondition con1= MongoCondition.newInstance("phone", keyword, MongoOper.LIKE); MongoCondition con

...	...	@@ -39,7 +39,7 @@
39	39	*/
40	40	private int visitstatus=-1;
41	41
42		- private int areaId=-1;
	42	+ private String areaId;
43	43	/**
44	44	* 产妇手机号
45	45	*/
46	46
...	...	@@ -75,11 +75,11 @@
75	75	*/
76	76	private Date birthEnd;
77	77
78		- public int getAreaId() {
	78	+ public String getAreaId() {
79	79	return areaId;
80	80	}
81	81
82		- public void setAreaId(int areaId) {
	82	+ public void setAreaId(String areaId) {
83	83	this.areaId = areaId;
84	84	}
85	85
...	...	@@ -199,7 +199,7 @@
199	199	if(null!=communityId&&!"-1".equals(communityId)){
200	200	condition= condition.and("communityId", communityId, MongoOper.IS);
201	201	}
202		- if(-1!=areaId){
	202	+ if(null!=areaId){
203	203	condition= condition.and("areaId", areaId, MongoOper.IS);
204	204	}
205	205	if(null!=id){