| 
					
				 | 
			
			
				@@ -502,9 +502,7 @@ public interface YiZhuLuRuDao { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "where inpatient_no = #{patNo} " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "  and admiss_times = #{times} " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "  and status_flag in ('1', '2') " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            "  and act_order_no <> #{orderNo} " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            "  and act_order_no < #{orderNo}" + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            "  AND (end_time IS NULL ) ") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            "  and act_order_no <> #{orderNo} ") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     void stopNotConfirmedOrder(String patNo, Integer times, Date date, String userCode, BigDecimal orderNo); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @Update("update yz_act_order " + 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -516,7 +514,6 @@ public interface YiZhuLuRuDao { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "  and status_flag in ('3', '4') " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "  and frequ_code != 'ONCE' " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "  and act_order_no <> #{orderNo} " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            "  and act_order_no < #{orderNo} " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             "  AND (end_time IS NULL or end_time < #{date}) ") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     void stopOrder(String patNo, Integer times, Date date, String userCode, BigDecimal orderNo); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 |