| 
					
				 | 
			
			
				@ -1905,6 +1905,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "date_format(room.reservation_time ,'%Y-%m-%d %H:%i:%S' ) AS time," + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "outpatient.disease_img AS disease_img," + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "outpatient.description AS description," + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "room.reservation_type AS reservation_type," + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "outpatient.origin_con_no AS origin_con_no " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "FROM " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "wlyy_hospital_waiting_room room," + 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -2174,7 +2175,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    public List<Map<String,Object>> findDoctorByHospitalAndDiseaseAndDept(String orgCode, String dept, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                                                          String diseaseKey, String doctorNameKey, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                                                          String jobTitleNameKey, String outpatientType, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                                                          String keyName, String workingTime, String consutlSort,Integer page,Integer pagesize) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                                                          String keyName, String workingTime, String consultStatus,String consutlSort,Integer page,Integer pagesize) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        if(page >=1){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            page --; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -2233,6 +2234,11 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            sql+=" AND wk.date = '"+workingTime+"' "; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        if(StringUtils.isNotBlank(consultStatus)){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            sql+=" AND d.consult_status = '"+consultStatus+"' "; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        sql += " order by a.total "+ consutlSort +" limit "+page * pagesize +","+pagesize; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        List<Map<String,Object>> list = jdbcTemplate.queryForList(sql); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -2572,7 +2578,8 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "room.reservation_type AS reservation_type," + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "outpatient.disease_img AS disease_img," + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "outpatient.description AS description," + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "outpatient.origin_con_no AS origin_con_no " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "outpatient.origin_con_no AS origin_con_no, " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "room.reservation_type AS reservation_type " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "FROM " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "wlyy_hospital_waiting_room room," + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "base_patient patient," + 
			 |