| 
					
				 | 
			
			
				@ -140,7 +140,7 @@ public class SignPatientLabelInfoService extends BaseService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                        "    AND t1.status > 0 " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                        "    AND t1.admin_team_code = ? limit " + start + "," + pagesize; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                args = new Object[]{doctor, teamCode, labelCode, labelType}; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                args = new Object[]{labelCode, labelType,doctor, teamCode}; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -380,9 +380,9 @@ public class SignPatientLabelInfoService extends BaseService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                (teamCode > 0 ? "    AND t1.admin_team_code = ? " : ""); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                        if (teamCode > 0) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            args = new Object[]{doctor, teamCode, labelType}; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            args = new Object[]{labelType,doctor, teamCode}; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                        } else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            args = new Object[]{doctor, labelType}; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                            args = new Object[]{labelType,doctor}; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                    } else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                        sql = " SELECT " + 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -634,9 +634,9 @@ public class SignPatientLabelInfoService extends BaseService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "    wlyy_sign_patient_label_info t2 " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                " ON t1.patient = t2.patient " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                " WHERE " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                (StringUtils.isNotEmpty(labelCode) ? " t2.label = ? " : "") + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                (StringUtils.isNotEmpty(labelType) ? " and t2.label_type = ? " : "") + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "    AND t2.status = 1 " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "    t2.status = 1 " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                (StringUtils.isNotEmpty(labelCode) ? " AND t2.label = ? " : "") + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                (StringUtils.isNotEmpty(labelType) ? " AND t2.label_type = ? " : "") + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "    AND t1." + (doc.getLevel() == 2 ? "doctor" : "doctor_health") + " = ? " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "    AND t1.status > 0 " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "    AND (t1.name like ? OR t2.label_name like ?) " + 
			 |