| 
															
																@ -63,10 +63,10 @@ public class BaseServiceNewsService { 
															 | 
														
													
												
													
														
															| 
															 | 
															
																            String idcard = map.get("idcard").toString(); 
															 | 
															
															 | 
															
																            String idcard = map.get("idcard").toString(); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																            String devices= deviceService.getPatientDeviceCategoryCode(map.get("id").toString()); 
															 | 
															
															 | 
															
																            String devices= deviceService.getPatientDeviceCategoryCode(map.get("id").toString()); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																            if ("0".equals(devices)){ 
															 | 
															
															 | 
															
																            if ("0".equals(devices)){ 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                map.put("devices",new ArrayList<>()); 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																                map.put("category",new ArrayList<>()); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																            }else { 
															 | 
															
															 | 
															
																            }else { 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                String[] ss = devices.split(","); 
															 | 
															
															 | 
															
																                String[] ss = devices.split(","); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                map.put("devices",ss); 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																                map.put("category",ss); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																            } 
															 | 
															
															 | 
															
																            } 
															 | 
														
													
												
													
														
															| 
															 | 
															
																            map.put("age", IdCardUtil.getAgeForIdcard(idcard)); 
															 | 
															
															 | 
															
																            map.put("age", IdCardUtil.getAgeForIdcard(idcard)); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																            List<DevicePatientDevice> patientDevices = byDept1.get(map.get("id")); 
															 | 
															
															 | 
															
																            List<DevicePatientDevice> patientDevices = byDept1.get(map.get("id")); 
															 |