jiangjiazhi / regional-platform

Authored by jiangjiazhi almost 9 years ago

Exists in master and in 8 other branches

Showing 2 changed files with 26 additions and 2 deletions

...	...	@@ -214,10 +214,15 @@
214	214	patientsQuery.setrLevel(riskPatientsQueryRequest.getrLevel());
215	215	patientsQuery.setLastMensesStart(riskPatientsQueryRequest.capEnd());
216	216	patientsQuery.setLastMensesEnd(riskPatientsQueryRequest.capStart());
	217	+ if(StringUtils.isNotEmpty(riskPatientsQueryRequest.getBuildTimeEnd())){
	218	+ patientsQuery.setBookbuildingDateStart(DateUtil.parseYMD(riskPatientsQueryRequest.getBuildTimeEnd()));
	219	+ }
	220	+ if(StringUtils.isNotEmpty(riskPatientsQueryRequest.getBuildTimeStart())){
	221	+ patientsQuery.setBookbuildingDateStart(DateUtil.parseYMD(riskPatientsQueryRequest.getBuildTimeStart()));
	222	+ }
217	223
218	224	if (null != riskPatientsQueryRequest.getStartAge()) {
219	225	Date date = DateUtil.addYear(currentDate, -riskPatientsQueryRequest.getStartAge());
220		-
221	226	patientsQuery.setBirthEnd(date);
222	227	}
223	228	if (null != riskPatientsQueryRequest.getEndAge()) {

...	...	@@ -61,10 +61,29 @@
61	61	//体验会员 0非会员 1会员
62	62	@FormParam
63	63	private Integer expVip;
	64	+ //建档时间开始
	65	+ private String buildTimeStart;
	66	+ //
	67	+ private String buildTimeEnd;
64	68
65		-
66	69	// 0 高危孕妇 1 全部孕妇 2全部产妇
67	70	private Integer queryType;
	71	+
	72	+ public String getBuildTimeEnd() {
	73	+ return buildTimeEnd;
	74	+ }
	75	+
	76	+ public void setBuildTimeEnd(String buildTimeEnd) {
	77	+ this.buildTimeEnd = buildTimeEnd;
	78	+ }
	79	+
	80	+ public String getBuildTimeStart() {
	81	+ return buildTimeStart;
	82	+ }
	83	+
	84	+ public void setBuildTimeStart(String buildTimeStart) {
	85	+ this.buildTimeStart = buildTimeStart;
	86	+ }
68	87
69	88	public Integer getQueryType() {
70	89	return queryType;