|  |  |  | @ -51,7 +51,7 @@ | 
			
		
	
		
			
				
					|  |  |  |  |     select p.uuid, p.nameCode,p.ylqxzcrbarmc, p.cpmctymc,p.ggxh,p.cpms,p.deviceRecordKey,m.deliveryGoodId,m.medicalCode from productinfo as p | 
			
		
	
		
			
				
					|  |  |  |  |         left join udplat_goods_match as m on p.deviceRecordKey = m.deviceRecordKey where p.isNewest =1 and p.diType=1 | 
			
		
	
		
			
				
					|  |  |  |  |         <if test="name != null and name != ''"> | 
			
		
	
		
			
				
					|  |  |  |  |           and p.cpmctymc like concat(#{name},'%') | 
			
		
	
		
			
				
					|  |  |  |  |           and (p.cpmctymc like concat(#{name},'%') or p.ylqxzcrbarmc like concat(#{name},'%')) | 
			
		
	
		
			
				
					|  |  |  |  |         </if> | 
			
		
	
		
			
				
					|  |  |  |  |         <if test="goodsMatchType == 1"> | 
			
		
	
		
			
				
					|  |  |  |  |           and m.deliveryGoodId is not null and m.deliveryGoodId != '' | 
			
		
	
	
		
			
				
					|  |  |  | 
 |