|  | @ -73,6 +73,17 @@ public class BaseServiceNewsService {
 | 
	
		
			
				|  |  |         Map<String, List<DevicePatientDevice>> byDept1 = feeDetail.stream()
 | 
	
		
			
				|  |  |                 .collect(Collectors.groupingBy(DevicePatientDevice::getUser));
 | 
	
		
			
				|  |  |         for (Map<String,Object> map:list){
 | 
	
		
			
				|  |  |             String patient = map.get("id").toString();
 | 
	
		
			
				|  |  |             sql = "select label_code,label_name from wlyy_patient_label where label_type=1 and patient='"+patient+"' ";
 | 
	
		
			
				|  |  |             List<Map<String,Object>> labels = jdbcTemplate.queryForList(sql);
 | 
	
		
			
				|  |  |             if (labels.size()>0){
 | 
	
		
			
				|  |  |                 map.put("label_code",labels.get(0).get("label_code"));
 | 
	
		
			
				|  |  |                 map.put("label_name",labels.get(0).get("label_name"));
 | 
	
		
			
				|  |  |             }
 | 
	
		
			
				|  |  |             else {
 | 
	
		
			
				|  |  |                 map.put("label_code",null);
 | 
	
		
			
				|  |  |                 map.put("label_name",null);
 | 
	
		
			
				|  |  |             }
 | 
	
		
			
				|  |  |             String idcard = map.get("idcard").toString();
 | 
	
		
			
				|  |  |             String devices= deviceService.getPatientDeviceCategoryCode(map.get("id").toString());
 | 
	
		
			
				|  |  |             if ("0".equals(devices)){
 |