|  | @ -725,7 +725,7 @@ public class PrescriptionInfoService extends BaseService {
 | 
	
		
			
				|  |  |                 " wlyy_prescription pr " +
 | 
	
		
			
				|  |  |                 " LEFT JOIN wlyy_patient p ON pr.patient = p.`code` " +
 | 
	
		
			
				|  |  |                 " JOIN wlyy_prescription_expressage e ON pr.code = e.prescription_code " +
 | 
	
		
			
				|  |  |                 " WHERE 1=1 ");
 | 
	
		
			
				|  |  |                 " WHERE 1=1 AND pr.status >="+PrescriptionLog.PrescriptionLogStatus.pay_success.getValue()+" ");
 | 
	
		
			
				|  |  |         List<Object> params = new ArrayList<>();
 | 
	
		
			
				|  |  |         setExpressageSql(pre_sql, params, teamCode, type, doctor, nameKey, startDate, endDate, hospital, state, page, size);
 | 
	
		
			
				|  |  |         List<Map<String, Object>> rs = jdbcTemplate.queryForList(pre_sql.toString(), params.toArray());
 | 
	
	
		
			
				|  | @ -941,7 +941,7 @@ public class PrescriptionInfoService extends BaseService {
 | 
	
		
			
				|  |  |                 " LEFT JOIN wlyy_patient p ON pr.patient = p.`code` " +
 | 
	
		
			
				|  |  |                 " JOIN wlyy_prescription_expressage e ON pr.code = e.prescription_code " +
 | 
	
		
			
				|  |  |                 " JOIN wlyy_prescription_reviewed r ON pr.code = r.prescription_code " +
 | 
	
		
			
				|  |  |                 " WHERE r.status=1 ");
 | 
	
		
			
				|  |  |                 " WHERE r.status=1 AND pr.status >="+PrescriptionLog.PrescriptionLogStatus.pay_success.getValue()+" ");
 | 
	
		
			
				|  |  |         List<Object> params = new ArrayList<>();
 | 
	
		
			
				|  |  |         setDoctorExpressageSql(pre_sql, params, teamCode, nameKey, startDate, endDate, hospital, state, dispensaryType, AllocationType, page, size);
 | 
	
		
			
				|  |  |         List<Map<String, Object>> rs = jdbcTemplate.queryForList(pre_sql.toString(), params.toArray());
 |