|  | @@ -82,8 +82,7 @@ public interface YpBaseMapper {
 | 
	
		
			
				|  |  |              "  b.d_code  like '%${searchText}%'  or c.d_code  like '%${searchText}%' or" +
 | 
	
		
			
				|  |  |              "  b.charge_code = #{searchText} or c.charge_code = #{searchText} or" +
 | 
	
		
			
				|  |  |              "  b.print_name like '%${searchText}%' or c.drugname like '%${searchText}%') and" +
 | 
	
		
			
				|  |  | -            "  c.group_no=#{ypBase.groupNo} and" +
 | 
	
		
			
				|  |  | -            "  c.drug_id is not null" +
 | 
	
		
			
				|  |  | +            "  c.group_no=#{ypBase.groupNo} " +
 | 
	
		
			
				|  |  |              "  <when test='ypBase.delFlag!=null'>" +
 | 
	
		
			
				|  |  |              "   and isnull(c.del_flag,0)=#{ypBase.delFlag}" +
 | 
	
		
			
				|  |  |              "  </when>" +
 |