jiangjiazhi / regional-platform

Authored by liquanyu about 5 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 10 additions and 3 deletions

...	...	@@ -3444,6 +3444,7 @@
3444	3444	@ResponseBody
3445	3445	public String syncTrckDownNextTime() {
3446	3446	TrackDownRecordQuery downRecordQuery = new TrackDownRecordQuery();
	3447	+ downRecordQuery.setLastMensesStart(DateUtil.addMonth(new Date(),-10));
3447	3448	downRecordQuery.setStatus(3);
3448	3449	List<TrackDownRecord> records = trackDownRecordService.queryTrackDown(downRecordQuery);
3449	3450	int batchSize = 1000;

...	...	@@ -812,6 +812,7 @@
812	812	pageResult.setGrid(new ArrayList<>());
813	813	return RespBuilder.buildSuccess(pageResult);
814	814	}
	815	+ System.out.println(downRecordQuery.convertToQuery().convertToMongoQuery().toString());
815	816	List<TrackDownRecord> downRecordList = trackDownRecordService.queryTrackDown(downRecordQuery);
816	817	List<Map> data = new ArrayList<>();
817	818	TrackDownTypeHandler downTypeHandler = trackDownTypeHandlerMap.get(downQueryRequest.getTrackType());

...	...	@@ -98,8 +98,11 @@
98	98	query.addCriteria(Criteria.where("code").is(code));
99	99	}
100	100
101		- PreEugenicsBaseModel one = mongoTemplate.findOne(query, PreEugenicsBaseModel.class);
102		- if (one == null) {
	101	+ List<PreEugenicsBaseModel> list = mongoTemplate.find(query, PreEugenicsBaseModel.class);
	102	+ if (CollectionUtils.isEmpty(list)) {
	103	+
	104	+ PreEugenicsBaseModel one = new PreEugenicsBaseModel();
	105	+
103	106	if (StringUtils.isNotEmpty(cardNo)) {
104	107	ResidentsArchiveModel model = mongoTemplate.findOne(Query.query(Criteria.where("certificateNum").is(cardNo).and("hospitalId").is(hospitalId)), ResidentsArchiveModel.class);
105	108	if (model == null) {
106	109
...	...	@@ -186,10 +189,12 @@
186	189	baseResponse.setObject(one);
187	190	return baseResponse;
188	191	}
	192	+
	193	+ list.add(one);
189	194	}
190	195
191	196	BaseResponse baseResponse = new BaseResponse();
192		- baseResponse.setObject(one);
	197	+ baseResponse.setObject(list);
193	198	return baseResponse;
194	199	}
195	200