jiangjiazhi / regional-platform

Authored by jiangjiazhi almost 9 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 15 additions and 2 deletions

...	...	@@ -273,7 +273,7 @@
273	273	AreaCodeModel areaCode = null;
274	274
275	275
276		- String groupId= groupsFacade.findByCurrentUserId(autoMatchFacade.getHospitalId(userId));
	276	+ String groupId= groupsFacade.findItemIdByCurrentUserId(autoMatchFacade.getHospitalId(userId));
277	277	if(org.apache.commons.lang.StringUtils.isNotEmpty(groupId)){
278	278	OrganizationGroupsItems groupsItems = groupsFacade.findById(groupId);
279	279	if(null!=groupsItems){

...	...	@@ -107,6 +107,19 @@
107	107	return findAllGroup(groupId);
108	108	}
109	109
	110	+ public String findItemIdByCurrentUserId(String hospital) {
	111	+ OrganizationGroupsItemQuery organizationGroupsItemQuery = new OrganizationGroupsItemQuery();
	112	+ List<Integer> hId = new ArrayList<>();
	113	+ hId.add(Integer.valueOf(hospital));
	114	+ organizationGroupsItemQuery.sethId(hId);
	115	+ List<OrganizationGroupsItems> groupsItemses = groupsItemService.queryList(organizationGroupsItemQuery);
	116	+ if (CollectionUtils.isNotEmpty(groupsItemses)) {
	117	+ return groupsItemses.get(0).getId();
	118	+ }
	119	+ return null;
	120	+ }
	121	+
	122	+
110	123	/**
111	124	* 获取当前医院所在组
112	125	*

...	...	@@ -211,7 +211,7 @@
211	211	return;
212	212	}
213	213
214		- String groupId = groupsFacade.findByCurrentUserId(p.getHospitalId());
	214	+ String groupId = groupsFacade.findItemIdByCurrentUserId(p.getHospitalId());
215	215	if (org.apache.commons.lang.StringUtils.isNotEmpty(groupId))
216	216	{
217	217	OrganizationGroupsItems groupsItems = groupsFacade.findById(groupId);