jiangjiazhi / regional-platform

Commit 55f1d8391121deb5054e114f2adcf0bfb76553b1

Authored by liquanyu over 5 years ago

Exists in master and in 6 other branches

update code

Showing 1 changed file with 9 additions and 3 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java

...	...	@@ -5489,6 +5489,8 @@
5489	5489
5490	5490
5491	5491	public BaseResponse getAutoRiskRecord(AntExManagerQueryRequest antExManagerQueryRequest, Integer id) {
	5492	+ List riskList = new ArrayList();
	5493	+ BaseQuery baseQuery = new BaseQuery();
5492	5494
5493	5495	PatientsQuery patientsQuery = new PatientsQuery();
5494	5496	List<Patients> patientses = null;
...	...	@@ -5505,6 +5507,10 @@
5505	5507	patientIds.add(pat.getId());
5506	5508	}
5507	5509	}
	5510	+ else
	5511	+ {
	5512	+ return new BaseListResponse().setData(riskList).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(baseQuery.getPageInfo());
	5513	+ }
5508	5514
5509	5515	Query query = new Query();
5510	5516	if (CollectionUtils.isNotEmpty(patientIds)) {
5511	5517
5512	5518
...	...	@@ -5527,18 +5533,18 @@
5527	5533	}
5528	5534
5529	5535	if (antExManagerQueryRequest.getRiskFactorId() != null) {
5530		- query.addCriteria(Criteria.where("hRisk").in(antExManagerQueryRequest.getRiskFactorId()));
	5536	+ query.addCriteria(Criteria.where("hRisk").in(com.lyms.platform.common.utils.StringUtils.covertToList(antExManagerQueryRequest.getRiskFactorId(), String.class)));
5531	5537	}
5532	5538
5533	5539	long count = mongoTemplate.count(query, AutoRiskRecord.class);
5534	5540
5535		- BaseQuery baseQuery = new BaseQuery();
	5541	+
5536	5542	baseQuery.mysqlBuild((int) count);
5537	5543	baseQuery.setPage(antExManagerQueryRequest.getPage());
5538	5544	baseQuery.setLimit(antExManagerQueryRequest.getLimit());
5539	5545
5540	5546	query.skip(baseQuery.getOffset()).limit(antExManagerQueryRequest.getLimit());
5541		- List riskList = new ArrayList();
	5547	+
5542	5548	System.out.println(query.toString());
5543	5549	List<AutoRiskRecord> models = mongoTemplate.find(query.with(new Sort(Sort.Direction.DESC, "created")), AutoRiskRecord.class);
5544	5550	System.out.println(models);