| 
					
				 | 
			
			
				@ -4,6 +4,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				import com.fasterxml.jackson.databind.node.ObjectNode; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				import com.yihu.wlyy.entity.patient.prescription.PrescriptionDispensaryCode; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				import com.yihu.wlyy.entity.patient.prescription.PrescriptionInfo; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				import com.yihu.wlyy.entity.patient.prescription.PrescriptionLog; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				import com.yihu.wlyy.repository.prescription.PrescriptionDispensaryCodeDao; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				import com.yihu.wlyy.repository.prescription.PrescriptionInfoDao; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				import com.yihu.wlyy.service.BaseService; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -78,7 +79,10 @@ public class PrescriptionDispensaryCodeService extends BaseService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            precriptionSql += " and p1.status = ? "; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            params.add(status); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        }else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            precriptionSql += " and p1.status in (20,21,100)" ; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            precriptionSql += " and p1.status in (?,?,?)" ; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            params.add(PrescriptionLog.PrescriptionLogStatus.wait_expressage.getValue()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            params.add(PrescriptionLog.PrescriptionLogStatus.pay_success.getValue()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            params.add(PrescriptionLog.PrescriptionLogStatus.finish.getValue()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        if(timeType!=null){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            precriptionSql +=  "and TIMESTAMPDIFF(SECOND, p2.create_Time, CURRENT_TIME) < ? ORDER BY p1.status desc ,p2.create_Time desc "; 
			 |