jiangjiazhi / regional-platform | GitLab

Commit ff45c9a5affa46c9b35f0cd0c1e14db5a4de78d1

Authored by jiangjiazhi over 7 years ago

1 parent d097ec8d86

Exists in master and in 6 other branches

1

Showing 2 changed files with 5 additions and 5 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AccessPermissionFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TempFacade.java

...	...	@@ -136,14 +136,13 @@
136	136	*/
137	137	public List<String> getCurrentUserHospPermissions(Integer userId)
138	138	{
139		- List<String> hospitalList = new ArrayList<>();
	139	+ //权限所有的医院
	140	+ List<String> allHospitalList = new ArrayList<>();
140	141	String hospital = autoMatchFacade.getHospitalId(userId);
141	142	if (null != hospital) {
142		- hospitalList.add(hospital);
	143	+ allHospitalList.add(hospital);
143	144	}
144	145
145		- //权限所有的医院
146		- List<String> allHospitalList = new ArrayList<>();
147	146	DataPermissionsModelQuery dataPermissionsModelQuery = new DataPermissionsModelQuery();
148	147	dataPermissionsModelQuery.setUserId(userId);
149	148	List<DataPermissionsModel> permissionsModels = dataPermissionService.queryPermission(dataPermissionsModelQuery);

...	...	@@ -120,7 +120,8 @@
120	120	patientsQuery.setLastMensesStart(queryRequest.capEnd());
121	121	patientsQuery.setLastMensesEnd(queryRequest.capStart());
122	122	patientsQuery.setExtEnable(false);
123		-
	123	+ patientsQuery.setYn(YnEnums.YES.getId());
	124	+ patientsQuery.setType(1);
124	125	Date currentDate = DateUtil.formatDate(new Date());
125	126	if (null != queryRequest.getStartAge()) {
126	127	Date date = DateUtil.addYear(currentDate, -queryRequest.getStartAge());