| 
					
				 | 
			
			
				@ -42,8 +42,8 @@ public class PatientLableService extends BaseJpaService<WlyyPatientLabelDO, Wlyy 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "LEFT JOIN (SELECT DISTINCT l.id,l.label_code  " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "from base_service_package_sign_record sr,base_service_package_record r  " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "                ,base_patient p,wlyy_patient_label l " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "                WHERE sr.id = r.sign_id and sr.status=1 and r.team_code = '"+teamCode+"' " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "                and sr.patient = p.id and p.id = l.patient and l.label_type = 1) " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "                WHERE sr.id = r.sign_id  and sr.status=1 and r.team_code = '"+teamCode+"' " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "                and sr.patient = p.id and p.id = l.patient and l.label_type = 1 AND p.del=1 ) " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "a on dict.dict_code = a.label_code  " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "where dict.dict_name = '"+ConstantUtil.DICT_SERVICE_TYPE+"' and dict_code<>5  " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "GROUP BY labelCode,labelName "; 
			 |