jiangjiazhi / regional-platform

Authored by zhangchao over 1 year ago

1 parent 42fe208865

Exists in dev

Showing 2 changed files with 8 additions and 5 deletions

...	...	@@ -106,7 +106,7 @@
106	106	condition = condition.and("riskFactorId", rFactorList, MongoOper.IN);
107	107	}
108	108	if (StringUtils.isNotEmpty(name)){
109		- condition=condition.and("name",name,MongoOper.IS);
	109	+ condition=condition.and("name",name,MongoOper.LIKE);
110	110	}
111	111	if (-1 != yn) {
112	112	condition = condition.and("yn", yn, MongoOper.IS);

...	...	@@ -127,7 +127,7 @@
127	127	postpartumReportQuery.setHospitalId(pregnancyReportQuery.getHospitalId());
128	128	postpartumReportQuery.setWeek(week);
129	129	Integer riskType=1;
130		- if (pregnancyReport.getRiskFactorName().contains("健康")){
	130	+ if (pregnancyReport.getName().contains("健康")){
131	131	riskType=0;
132	132	}
133	133	postpartumReportQuery.setRiskType(riskType);
134	134
...	...	@@ -149,9 +149,12 @@
149	149	pregnancyReportQuery.setYn(1);
150	150	pregnancyReportQuery.setNeed("true");
151	151	Integer week= pregnancyReportQuery.getWeek();
152		- pregnancyReportQuery.setWeek(getWeek(week));
	152	+ if (week!=null){
	153	+ pregnancyReportQuery.setWeek(getWeek(week));
	154	+ }
	155	+
153	156	List<PregnancyReport> list= pregnancyReportService.queryPregnancyReport(pregnancyReportQuery);
154		- if (CollectionUtils.isNotEmpty(list)){
	157	+ /* if (CollectionUtils.isNotEmpty(list)){
155	158	for (PregnancyReport pregnancyReport:list){
156	159	//PregnancyReport pregnancyReport= list.get(0);
157	160	PregnancyReportMattersQuery postpartumReportQuery=new PregnancyReportMattersQuery();
...	...	@@ -168,7 +171,7 @@
168	171	pregnancyReport.setMatters(mattersList.get(0).getMatters());
169	172	}
170	173	}
171		- }
	174	+ }*/
172	175	BaseListResponse baseResponse=new BaseListResponse();
173	176	baseResponse.setObject(list);
174	177	baseResponse.setPageInfo(pregnancyReportQuery.getPageInfo());