| 
															
																@ -122,6 +122,9 @@ public class JMJkEduArticleService extends BaseService { 
															 | 
														
													
												
													
														
															| 
															 | 
															
																        HealthEduArticlePatientModel heapm = null; 
															 | 
															
															 | 
															
																        HealthEduArticlePatientModel heapm = null; 
															 | 
														
													
												
													
														
															| 
															 | 
															
																        com.alibaba.fastjson.JSONObject article = null; 
															 | 
															
															 | 
															
																        com.alibaba.fastjson.JSONObject article = null; 
															 | 
														
													
												
													
														
															| 
															 | 
															
																        Doctor doctor = null; 
															 | 
															
															 | 
															
																        Doctor doctor = null; 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																     
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																        List<HealthEduArticlePatientModel> resultList = new ArrayList<>(); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																         
															 | 
														
													
												
													
														
															| 
															 | 
															
																        for (HealthEduArticlePatient one : esList) { 
															 | 
															
															 | 
															
																        for (HealthEduArticlePatient one : esList) { 
															 | 
														
													
												
													
														
															| 
															 | 
															
																            article = thirdJkEduArticleService.getArticalById(one.getArticleId(),""); 
															 | 
															
															 | 
															
																            article = thirdJkEduArticleService.getArticalById(one.getArticleId(),""); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																            if (result.get(one.getArticleId()) != null) { 
															 | 
															
															 | 
															
																            if (result.get(one.getArticleId()) != null) { 
															 | 
														
													
												
											
												
													
														
															 | 
															
																@ -160,12 +163,9 @@ public class JMJkEduArticleService extends BaseService { 
															 | 
														
													
												
													
														
															| 
															 | 
															
																            heapm.setPhoto(doctor.getPhoto()); 
															 | 
															
															 | 
															
																            heapm.setPhoto(doctor.getPhoto()); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																            heapm.setOperatorName(article.getString("operatorName")); 
															 | 
															
															 | 
															
																            heapm.setOperatorName(article.getString("operatorName")); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																            // heapm.setTime();//时间  xx小时前  2017-10-11 
															 | 
															
															 | 
															
																            // heapm.setTime();//时间  xx小时前  2017-10-11 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																            resultList.add(heapm); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																            result.put(one.getArticleId(), heapm); 
															 | 
															
															 | 
															
																            result.put(one.getArticleId(), heapm); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																        } 
															 | 
															
															 | 
															
																        } 
															 | 
														
													
												
													
														
															| 
															 | 
															
																        List<HealthEduArticlePatientModel> resultList = new ArrayList<>(); 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																//        for (Map.Entry<String, HealthEduArticlePatientModel> entry : result.entrySet()) { 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																//            resultList.add(entry.getValue()); 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																//        } 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																        return resultList; 
															 | 
															
															 | 
															
																        return resultList; 
															 | 
														
													
												
													
														
															| 
															 | 
															
																    } 
															 | 
															
															 | 
															
																    } 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																 
															 |