| 
					
				 | 
			
			
				@@ -44,8 +44,8 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             count(distinct a.id)  'total', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             'DYY' as 'orderStatus', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             '待预约' as 'orderStatusText' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        from pg_order_base a 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        where appointment_time is null 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        from pg_order_base 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        where appointment_time is null a.order_status not in ('YWG','GCSZX','WDWG','YWGO','YQX','FWZT','YCGB','FWQX','FL','YJS','LRCD') 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         <include refid="orderBaseSqlWhere"></include> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         <if test="orderSmallType != null and orderSmallType != ''"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             and a.order_small_type = #{orderSmallType} 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -115,7 +115,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             count(if(order_status in ('DJD'),1,null)) as 'djs', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             count(if(order_status in ('DQD'),1,null)) as 'dqd', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             count(if(order_status in ('FWZ'),1,null)) as 'fwz', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            count(if(appointment_time is null and a.order_status in('DYY','DSHPG','DWDPG','DJD'),1,null)) as 'dyy', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            count(if(appointment_time is null and and a.order_status not in ('YWG','GCSZX','WDWG','YWGO','YQX','FWZT','YCGB','FWQX','FL','YJS','LRCD'),1,null)) as 'dyy', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             count(if(is_exception = 1 and a.order_status not in  ('YWG','YWGO','YJS'),1,null)) as 'ycdcl', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             count(if(appraise_status in ('C'),1,null)) as 'cp' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         from pg_order_base a 
			 |