jiangjiazhi / regional-platform

Authored by liquanyu almost 6 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 20 additions and 0 deletions

...	...	@@ -266,6 +266,11 @@
266	266	if(StringUtils.isNotBlank(applyDoctorName)){
267	267	condition=condition.and("applyDoctorName",applyDoctorName,MongoOper.IS);
268	268	}
	269	+
	270	+ if(StringUtils.isNotBlank(hospitalId)){
	271	+ condition=condition.and("hospitalId",hospitalId,MongoOper.IS);
	272	+ }
	273	+
269	274	if(null!=status){
270	275	condition=condition.and("status",status,MongoOper.IS);
271	276	}

...	...	@@ -10,6 +10,7 @@
10	10	import com.lyms.platform.common.result.BaseResponse;
11	11	import com.lyms.platform.common.result.CommonResult;
12	12	import com.lyms.platform.common.utils.*;
	13	+import com.lyms.platform.operate.web.facade.AutoMatchFacade;
13	14	import com.lyms.platform.pojo.LisCrisisItem;
14	15	import com.lyms.platform.pojo.LisCrisisNotify;
15	16	import com.lyms.platform.pojo.Patients;
16	17
...	...	@@ -43,7 +44,11 @@
43	44	@Autowired
44	45	private PatientsService patientsService;
45	46
	47	+ @Autowired
	48	+ private AutoMatchFacade autoMatchFacade;
46	49
	50	+
	51	+
47	52	/**
48	53	* 更新通知状态为已经查看
49	54	* @param request
...	...	@@ -245,6 +250,8 @@
245	250	patientses = patientsService.queryPatient1(patientsQuery, "modified");
246	251	}
247	252
	253	+
	254	+
248	255	LisCrisisItemQuery query = new LisCrisisItemQuery();
249	256	query.setPage(page);
250	257	query.setLimit(limit);
...	...	@@ -259,6 +266,14 @@
259	266	query.setStatus(status);
260	267	query.setItemName(refer);
261	268	query.setApplyDoctorName(doctor);
	269	+
	270	+ Integer userId = getUserId(request);
	271	+ if (userId != null)
	272	+ {
	273	+ String hospitalId = autoMatchFacade.getHospitalId(userId);
	274	+ query.setHospitalId(hospitalId);
	275	+ }
	276	+
262	277
263	278	if (CollectionUtils.isNotEmpty(patientses)) {
264	279	List<String> parentIds = new LinkedList<>();