jiangjiazhi / regional-platform

Authored by jiangjiazhi over 8 years ago

Exists in master and in 7 other branches

Showing 1 changed file with 4 additions and 3 deletions

...	...	@@ -106,7 +106,6 @@
106	106	stopWatch.start("query matdeliver");
107	107	List<MaternalDeliverModel> maternalDeliverModels = matDeliverService.query(matDeliverQuery);
108	108	if (CollectionUtils.isNotEmpty(maternalDeliverModels)) {
109		-// chanResult.setDueWeek(maternalDeliverModels.get(0).getDueDate());
110	109	chanResult.setTireNumber(TaiShuEnums.getTitle(maternalDeliverModels.get(0).getTireNumber() + ""));
111	110	try {
112	111	chanResult.setfCh(organizationService.getOrganization(Integer.valueOf(maternalDeliverModels.get(0).getHospitalId())).getName());
113	112
...	...	@@ -121,10 +120,12 @@
121	120	postReviewQuery.setYn(YnEnums.YES.getId());
122	121	stopWatch.start("query postreview list");
123	122	List<PostReviewModel> withList = postReviewService.findWithList(postReviewQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created"));
124		- if (StringUtils.isNotEmpty(patients.getLastCheckEmployeeId())) {
125		- Users users = usersService.getUsers(NumberUtils.toInt(patients.getLastCheckEmployeeId()));
	123	+ if (CollectionUtils.isNotEmpty(withList)) {
	124	+ Users users = usersService.getUsers(NumberUtils.toInt(withList.get(0).getProdDoctor()));
126	125	if (null != users) {
127	126	chanResult.setCheckDoctor(users.getName());
	127	+ }else{
	128	+ chanResult.setCheckDoctor(withList.get(0).getProdDoctor());
128	129	}
129	130	}
130	131	String nextCheckTime = "";