|  | @ -4025,6 +4025,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
 | 
												
													
														
															|  |                 "room.patient_id=patient.id " +
 |  |                 "room.patient_id=patient.id " +
 | 
												
													
														
															|  |                 "AND room.outpatient_id=outpatient.id " +
 |  |                 "AND room.outpatient_id=outpatient.id " +
 | 
												
													
														
															|  |                 "AND consult.relation_code=outpatient.id " +
 |  |                 "AND consult.relation_code=outpatient.id " +
 | 
												
													
														
															|  | 
 |  |                 "AND outpatient.pay_status=1 " +
 | 
												
													
														
															|  |                 "AND consult.status = 0 ";
 |  |                 "AND consult.status = 0 ";
 | 
												
													
														
															|  |         if(StringUtils.isNoneBlank(doctor)){
 |  |         if(StringUtils.isNoneBlank(doctor)){
 | 
												
													
														
															|  |             sql = sql +"AND room.doctor='"+doctor+"' " +
 |  |             sql = sql +"AND room.doctor='"+doctor+"' " +
 | 
												
											
												
													
														
															|  | @ -4091,6 +4092,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
 | 
												
													
														
															|  |                 "room.patient_id=patient.id " +
 |  |                 "room.patient_id=patient.id " +
 | 
												
													
														
															|  |                 "AND room.outpatient_id=outpatient.id " +
 |  |                 "AND room.outpatient_id=outpatient.id " +
 | 
												
													
														
															|  |                 "AND outpatient.status = 0 " +
 |  |                 "AND outpatient.status = 0 " +
 | 
												
													
														
															|  | 
 |  |                 "AND outpatient.pay_status = 1 " +
 | 
												
													
														
															|  |                 "AND room.doctor='"+doctor+"' " +
 |  |                 "AND room.doctor='"+doctor+"' " +
 | 
												
													
														
															|  |                 "AND room.reservation_time is not null " +
 |  |                 "AND room.reservation_time is not null " +
 | 
												
													
														
															|  |                 "AND room.consult_type= 2 ";/* +
 |  |                 "AND room.consult_type= 2 ";/* +
 |