jiangjiazhi / regional-platform

Commit 006a69c07b8c609d5dd8806669c9af03f358a6fa

Authored by liquanyu over 2 years ago

Exists in master and in 6 other branches

儿童检查

Showing 2 changed files with 18 additions and 5 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java

...	...	@@ -197,9 +197,10 @@
197	197	@RequestParam(value = "checkDoctorId", required = false) String checkDoctorId,
198	198	@RequestParam(value = "articleTypes", required = false) Integer articleTypes,//中医指导类型,
199	199	@RequestParam(value = "level", required = false) String level,
	200	+ @RequestParam(value = "type", required = false) Integer type, //肥胖分类 1 重度肥胖 2 肥胖 3 超重
200	201	Integer page, Integer limit, HttpServletRequest request) {
201	202	return babyCheckFacade.babyCheckList(checkTime, queryNo, startCheckMonthAge, endCheckMonthAge,
202		- nextDate, highRisk, waskSon, checkDoctorId,articleTypes, page, limit, getUserId(request), level);
	203	+ nextDate, highRisk, waskSon, checkDoctorId,articleTypes, page, limit, getUserId(request), level,type);
203	204	}
204	205
205	206	/**

...	...	@@ -1458,7 +1458,7 @@
1458	1458	}
1459	1459
1460	1460	public BaseResponse babyCheckList(String checkTime, String queryNo, Integer checkMonthAge, Integer endCheckMonthAge, String nextDate,
1461		- Integer highRisk, Integer waskSon, String checkDoctorId,Integer articleTypes,Integer page, Integer limit, Integer userId,String level) {
	1461	+ Integer highRisk, Integer waskSon, String checkDoctorId,Integer articleTypes,Integer page, Integer limit, Integer userId,String level,Integer type) {
1462	1462	boolean flag = false;
1463	1463	// List<String> hospital = groupsFacade.findGroupHospital(userId, false);
1464	1464	String hospitalId = autoMatchFacade.getHospitalId(userId);
...	...	@@ -1506,6 +1506,21 @@
1506	1506	if (StringUtils.isNotEmpty(level)) {
1507	1507	criteria.and("diagnoseLevel").in(level);
1508	1508	}
	1509	+
	1510	+ if (type != null) {
	1511	+ if (type == 1)
	1512	+ {
	1513	+ criteria.and("heightWeight").is("上");
	1514	+ }else if (type == 2)
	1515	+ {
	1516	+ criteria.and("heightWeight").is("中上");
	1517	+ }
	1518	+ else if (type == 3)
	1519	+ {
	1520	+ criteria.and("heightWeight").is("中+");
	1521	+ }
	1522	+ }
	1523	+
1509	1524	if (null != checkDoctorId) {
1510	1525	criteria.and("checkDoctor").is(checkDoctorId);
1511	1526	}
1512	1527
...	...	@@ -1526,10 +1541,7 @@
1526	1541	criteria.and("articleTypes").in(Arrays.asList(articleTypes));
1527	1542	}
1528	1543	}
1529		-
1530		-
1531	1544	Query query = new Query(criteria);
1532		- System.out.println(query.toString());
1533	1545	PageResult pageResult = findMongoPage(BabyCheckModel.class, query.with(new Sort(Sort.Direction.DESC, "created")), page, limit);
1534	1546	List <BabyCheckModel> babyCheckModelList = (List <BabyCheckModel>) pageResult.getGrid();
1535	1547	List <Map <String, Object>> list = new ArrayList();