|  | @ -2103,36 +2103,26 @@ public class BusinessOrderService extends BaseJpaService<BusinessOrderDO,Busines
 | 
	
		
			
				|  |  |             }
 | 
	
		
			
				|  |  |         }
 | 
	
		
			
				|  |  |         if (StringUtils.isNoneBlank(orderNo)){
 | 
	
		
			
				|  |  |             sql+=" and t.order_no ='%"+orderNo+"%'";
 | 
	
		
			
				|  |  |             sql+=" and t.order_no like '%"+orderNo+"%'";
 | 
	
		
			
				|  |  |         }
 | 
	
		
			
				|  |  |         if (StringUtils.isNoneBlank(yktOrderNo)){
 | 
	
		
			
				|  |  |             sql+=" and t.yk_order_no ='%"+yktOrderNo+"%'";
 | 
	
		
			
				|  |  |             sql+=" and t.yk_order_no like '%"+yktOrderNo+"%'";
 | 
	
		
			
				|  |  |         }
 | 
	
		
			
				|  |  |         if (StringUtils.isNoneBlank(patientName)){
 | 
	
		
			
				|  |  |             sql+=" and t.patient_name  like '%"+patientName+"%'";
 | 
	
		
			
				|  |  |         }
 | 
	
		
			
				|  |  |         if (StringUtils.isNoneBlank(idCard)){
 | 
	
		
			
				|  |  |             sql+=" and b.idcard ='%"+idCard+"%'";
 | 
	
		
			
				|  |  |         }
 | 
	
		
			
				|  |  |         if (StringUtils.isNoneBlank(medicard)){
 | 
	
		
			
				|  |  |             sql+=" and t.relation_code ='%"+medicard+"%'";
 | 
	
		
			
				|  |  |             sql+=" and b.idcard like '%"+idCard+"%'";
 | 
	
		
			
				|  |  |         }
 | 
	
		
			
				|  |  |         if (status!=null){
 | 
	
		
			
				|  |  |             sql+=" and t.status ="+status+"";
 | 
	
		
			
				|  |  |         }
 | 
	
		
			
				|  |  |         if (StringUtils.isNoneBlank(orderType)){
 | 
	
		
			
				|  |  |             sql+=" and t.order_type ="+orderType+"";
 | 
	
		
			
				|  |  |         }
 | 
	
		
			
				|  |  |         if (StringUtils.isNoneBlank(yktOrderNo)){
 | 
	
		
			
				|  |  |             sql+=" and t.yk_order_no =" + yktOrderNo + "";
 | 
	
		
			
				|  |  |         }
 | 
	
		
			
				|  |  |         if (StringUtils.isNoneBlank(medicard)){
 | 
	
		
			
				|  |  |             sql+=" and t.relation_code =" + medicard + "";
 | 
	
		
			
				|  |  |         }
 | 
	
		
			
				|  |  |         if (StringUtils.isNoneBlank(idCard)){
 | 
	
		
			
				|  |  |             sql+=" and b.idcard =" + idCard + "";
 | 
	
		
			
				|  |  |             sql+=" and t.order_type like %"+orderType+"%";
 | 
	
		
			
				|  |  |         }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |         if (StringUtils.isNoneBlank(orderCategory)){
 | 
	
		
			
				|  |  |             if (orderCategory.equalsIgnoreCase("2")){
 | 
	
		
			
				|  |  |                 sql+=" and t.order_category IN ('2','3') ";
 |