jiangjiazhi / regional-platform | GitLab

Commit 96cdb75ab5a6488fff31fa145e105deaa60973f9

Authored by liquanyu over 8 years ago

1 parent 62db62450f

Exists in master and in 8 other branches

code update

Showing 2 changed files with 6 additions and 1 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyCheckService.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java

...	...	@@ -50,6 +50,10 @@
50	50	return babyCheckDao.queryBabyCheckRecord(query.convertToQuery().addOrder(Sort.Direction.DESC,"modified"));
51	51	}
52	52
	53	+ public List<BabyCheckModel> queryBabyCheckRecord(BabyCheckModelQuery query,String sortkey,Sort.Direction sort) {
	54	+ return babyCheckDao.queryBabyCheckRecord(query.convertToQuery().addOrder(sort,sortkey));
	55	+ }
	56	+
53	57	public List<HwModel> queryHWByHeight(Double height, Integer sex) {
54	58	MongoCondition condition = MongoCondition.newInstance();
55	59	condition = condition.and("height", height, MongoOper.IS);

...	...	@@ -19,6 +19,7 @@
19	19	import com.lyms.platform.query.*;
20	20	import org.apache.commons.collections.CollectionUtils;
21	21	import org.springframework.beans.factory.annotation.Autowired;
	22	+import org.springframework.data.domain.Sort;
22	23	import org.springframework.stereotype.Component;
23	24
24	25	import java.util.*;
...	...	@@ -313,7 +314,7 @@
313	314	query.setYn(YnEnums.YES.getId());
314	315	query.setBuildIds(ids);
315	316	//查询儿童的检查记录
316		- checkModels = babyCheckService.queryBabyCheckRecord(query);
	317	+ checkModels = babyCheckService.queryBabyCheckRecord(query,"checkDate", Sort.Direction.DESC);
317	318	Date babyBirth = model.getBirth();
318	319	if (CollectionUtils.isNotEmpty(checkModels))
319	320	{