|  | @ -2035,7 +2035,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.STATUS=1 " +
 |  | 
 | 
												
													
														
															|  | 
 |  |                 "AND consult.status=0 " +
 | 
												
													
														
															|  |                 "AND room.consult_type=2 " +
 |  |                 "AND room.consult_type=2 " +
 | 
												
													
														
															|  |                 "AND room.reservation_time>='"+date+" 00:00:00' AND room.reservation_time<='"+date+" 23:59:59' " +
 |  |                 "AND room.reservation_time>='"+date+" 00:00:00' AND room.reservation_time<='"+date+" 23:59:59' " +
 | 
												
													
														
															|  |                 "GROUP BY room.doctor";
 |  |                 "GROUP BY room.doctor";
 | 
												
											
												
													
														
															|  | @ -2459,7 +2459,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.status = 1 " +
 |  | 
 | 
												
													
														
															|  | 
 |  |                 "AND consult.status = 0 " +
 | 
												
													
														
															|  |                 "AND room.doctor='"+doctor+"' " +
 |  |                 "AND room.doctor='"+doctor+"' " +
 | 
												
													
														
															|  |                 "AND room.consult_type= 2";
 |  |                 "AND room.consult_type= 2";
 | 
												
													
														
															|  |     
 |  |     
 |