jiangjiazhi / regional-platform

Authored by zhangchao over 1 year ago

Exists in dev

Showing 3 changed files with 17 additions and 4 deletions

...	...	@@ -1211,9 +1211,10 @@
1211	1211	@TokenRequired
1212	1212	public BaseResponse xtStatisticsList(HttpServletRequest request,
1213	1213	String startTime,String endTime,
1214		- Integer id,Integer page,Integer limit){
	1214	+ Integer type,Integer page,Integer limit,
	1215	+ String key, String vcCardNo, Integer weekStart, Integer weekEnd, Integer age){
1215	1216	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
1216		- return bloodSugarService.getXtStatisticsList(loginState.getId(),startTime,endTime,id,page,limit);
	1217	+ return bloodSugarService.getXtStatisticsList(loginState.getId(),startTime,endTime,type,page,limit,key,vcCardNo,weekStart,weekEnd,age);
1217	1218	}
1218	1219
1219	1220	@RequestMapping(value = "/yjStatistics", method = RequestMethod.GET)

...	...	@@ -46,6 +46,6 @@
46	46
47	47	BaseResponse getDoctorWx(String patientId);
48	48	BaseResponse getXtStatistics(Integer userId,String startTime,String endTime);
49		- BaseResponse getXtStatisticsList(Integer userId,String startTime,String endTime,Integer id,Integer page,Integer limit);
	49	+ BaseResponse getXtStatisticsList(Integer userId,String startTime,String endTime,Integer id,Integer page,Integer limit,String key,String vcCardNo,Integer weekStart,Integer weekEnd,Integer age);
50	50	}

...	...	@@ -1822,16 +1822,28 @@
1822	1822	@Override
1823	1823	public BaseResponse getXtStatisticsList(Integer userId,
1824	1824	String startTime, String endTime, Integer id,
1825		- Integer page,Integer limit) {
	1825	+ Integer page,Integer limit,String key, String vcCardNo, Integer weekStart, Integer weekEnd, Integer age) {
1826	1826	String hospitalId= autoMatchFacade.getHospitalId(userId);
1827	1827	Criteria criteria = Criteria.where("hospitalId").is(hospitalId);
1828	1828	criteria.and("yn").is(1);
	1829	+ boolean flag = false;
	1830	+ if (StringUtils.isNotEmpty(key) \|\| StringUtils.isNotEmpty(vcCardNo) \|\| weekEnd != null \|\| weekStart != null \|\| age != null) {
	1831	+ flag = true;
	1832	+ }
	1833	+ //List<String> hospitalIds = groupsFacade.findGroupHospital(userId, false);
	1834	+ List<String> hids = new ArrayList<>();
	1835	+ hids.add(hospitalId);
	1836	+
1829	1837	if (id!=null){
1830	1838	//1正常血糖管理、2低血糖管理、3高血糖管理
1831	1839	criteria.and("sugarType").is(id);
1832	1840	}
1833	1841	if (startTime!=null && endTime!=null){
1834	1842	criteria.and("created").gte(DateUtil.parseYMDHMS(startTime+" 00:00:00")).lte(DateUtil.parseYMDHMS(endTime+" 23:59:59"));
	1843	+ }
	1844	+ if (flag) {
	1845	+ List<String> pids = mongoUtil.getPidsByCondition2(hids, key, vcCardNo, weekStart, weekEnd, age);
	1846	+ criteria.and("pid").in(pids);
1835	1847	}
1836	1848	Query query = Query.query(criteria).with(new Sort(Sort.Direction.DESC, "created"));
1837	1849	PageResult pageResult = findMongoPage(BloodSugarStatistics.class, query, page, limit);