| 
					
				 | 
			
			
				@@ -70,7 +70,7 @@ public interface TriageDao { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "serial_no, gh_no, req_type,reqName=(select rtrim(name) from mzy_zd_charge_type where code=a.req_type), " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "fz_no, slow_flag, status_flag, status_time,call_time, req_order, ampm, " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "socialNo=(select rtrim(d.social_no) from mz_patient_mi d where d.patient_id=a.patient_id) " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            "from mzfz_patient_order a where datediff(day, visit_date, getdate())=0 and status_flag in ('1','3') " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            "from mzfz_patient_order a where datediff(day, visit_date, getdate())=0 and status_flag in ('1','2','3') " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "and dept_code in " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "<foreach collection='deptCodes' item='deptCode' open='(' separator=',' close=')'>" + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "#{deptCode}" + 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -111,7 +111,7 @@ public interface TriageDao { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "serial_no, gh_no, req_type,reqName=(select rtrim(name) from mzy_zd_charge_type where code=a.req_type), " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "fz_no, slow_flag, status_flag, status_time,call_time, req_order, ampm " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "from mzfz_patient_order a where datediff(day, visit_date, getdate())=0 " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            "and status_flag in ('1','3') " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            "and status_flag in ('1','2','3') " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "and dept_code in " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "<foreach collection='deptCodes' item='deptCode' open='(' separator=',' close=')'>" + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "#{deptCode}" + 
			 |