jiangjiazhi / regional-platform

Authored by liquanyu almost 4 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 15 additions and 6 deletions

...	...	@@ -87,8 +87,8 @@
87	87	@ResponseBody
88	88	@RequestMapping(method = RequestMethod.GET)
89	89	@TokenRequired
90		- public BaseResponse list(String key, String vcCardNo, Integer weekStart, Integer weekEnd, Integer age, Integer page, Integer limit, HttpServletRequest request) {
91		- return bloodSugarService.list(key, vcCardNo, weekStart, weekEnd, age, page, limit, getUserId(request));
	90	+ public BaseResponse list(String isAll,String key, String vcCardNo, Integer weekStart, Integer weekEnd, Integer age, Integer page, Integer limit, HttpServletRequest request) {
	91	+ return bloodSugarService.list(isAll,key, vcCardNo, weekStart, weekEnd, age, page, limit, getUserId(request));
92	92	}
93	93
94	94	@ResponseBody

...	...	@@ -12,7 +12,7 @@
12	12
13	13	BaseResponse add(Integer userId, BloodSugar bloodSugar);
14	14
15		- BaseResponse list(String key, String vcCardNo, Integer weekStart, Integer weekEnd, Integer age, Integer page, Integer limit, Integer userId);
	15	+ BaseResponse list(String isAll,String key, String vcCardNo, Integer weekStart, Integer weekEnd, Integer age, Integer page, Integer limit, Integer userId);
16	16
17	17	BaseResponse info(String parentId, Integer type, Date time);
18	18

...	...	@@ -129,15 +129,24 @@
129	129	}
130	130
131	131	@Override
132		- public BaseResponse list(String key, String vcCardNo, Integer weekStart, Integer weekEnd, Integer age, Integer page, Integer limit, Integer userId) {
	132	+ public BaseResponse list(String isAll,String key, String vcCardNo, Integer weekStart, Integer weekEnd, Integer age, Integer page, Integer limit, Integer userId) {
133	133	boolean flag = false;
134	134	if (StringUtils.isNotEmpty(key) \|\| StringUtils.isNotEmpty(vcCardNo) \|\| weekEnd != null \|\| weekStart != null \|\| age != null) {
135	135	flag = true;
136	136	}
137		-// List<String> hospitalIds = accessPermissionFacade.getCurrentUserHospPermissions(userId);
138	137	List<String> hospitalIds = groupsFacade.findGroupHospital(userId, false);
	138	+ List<String> hids = new ArrayList<>();
	139	+ if (!StringUtils.isNotEmpty(isAll) \|\| "1".equals(isAll))
	140	+ {
	141	+ String hospitalId = autoMatchFacade.getHospitalId(userId);
	142	+ hids.add(hospitalId);
	143	+ }
	144	+ else
	145	+ {
	146	+ hids.addAll(hospitalIds);
	147	+ }
139	148	Criteria criteria = Criteria.where("yn").is(1);
140		- criteria.and("hospitalId").in(hospitalIds);
	149	+ criteria.and("hospitalId").in(hids);
141	150	if (flag) {
142	151	List<String> pids = mongoUtil.getPidsByCondition2(hospitalIds, key, vcCardNo, weekStart, weekEnd, age);
143	152	criteria.and("pid").in(pids);