jiangjiazhi / regional-platform

Authored by jiangjiazhi over 8 years ago

Exists in master and in 8 other branches

Showing 2 changed files with 28 additions and 7 deletions

...	...	@@ -208,7 +208,16 @@
208	208	patientsQuery.setrLevel(riskPatientsQueryRequest.getrLevel());
209	209	patientsQuery.setLastMensesStart(riskPatientsQueryRequest.capStart());
210	210	patientsQuery.setLastMensesEnd(riskPatientsQueryRequest.capEnd());
211		- patientsQuery.setAge(riskPatientsQueryRequest.getAge());
	211	+
	212	+ if(null!= riskPatientsQueryRequest.getStartAge()){
	213	+ Date date = DateUtil.addYear(new Date(), -riskPatientsQueryRequest.getStartAge());
	214	+ patientsQuery.setBirthEnd(date);
	215	+ }
	216	+ if(null!= riskPatientsQueryRequest.getEndAge()){
	217	+ Date date = DateUtil.addYear(new Date(), -riskPatientsQueryRequest.getEndAge());
	218	+ patientsQuery.setBirthStart(date);
	219	+ }
	220	+
212	221	patientsQuery.setLimit(riskPatientsQueryRequest.getLimit());
213	222	patientsQuery.setPage(riskPatientsQueryRequest.getPage());
214	223	patientsQuery.setIsHighRisk(isHighRisk);

...	...	@@ -33,7 +33,10 @@
33	33	private String endDueWeek;
34	34	//年龄
35	35	@FormParam
36		- private Integer age;
	36	+ private Integer startAge;
	37	+ private Integer endAge;
	38	+
	39	+
37	40	//风险等级
38	41	@FormParam
39	42	private String rLevel;
40	43
...	...	@@ -106,10 +109,22 @@
106	109	this.expVip = expVip;
107	110	}
108	111
109		- public void setAge(Integer age) {
110		- this.age = age;
	112	+ public Integer getEndAge() {
	113	+ return endAge;
111	114	}
112	115
	116	+ public void setEndAge(Integer endAge) {
	117	+ this.endAge = endAge;
	118	+ }
	119	+
	120	+ public Integer getStartAge() {
	121	+ return startAge;
	122	+ }
	123	+
	124	+ public void setStartAge(Integer startAge) {
	125	+ this.startAge = startAge;
	126	+ }
	127	+
113	128	public void sethScore(Integer hScore) {
114	129	this.hScore = hScore;
115	130	}
...	...	@@ -122,9 +137,6 @@
122	137	this.serviceStatus = serviceStatus;
123	138	}
124	139
125		- public Integer getAge() {
126		- return age;
127		- }
128	140
129	141	public Integer gethScore() {
130	142	return hScore;