| 
					
				 | 
			
			
				@ -1595,18 +1595,14 @@ public class ImService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
									"d.id as patientId," + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
									"d.idcard as patientIdcard," + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
									"d.sex as patientsex," + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
									"op.id as outpatientid," + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
									"op.type as consultType," + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
									"op.general_doctor as generalDoctor," + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
									"op.icd10_name as icd10Name," + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
									"d.photo AS patientphoto " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
									"FROM wlyy_consult a," + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
									"wlyy_consult_team b," + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
									"base_patient d, " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
									"wlyy_outpatient op " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
									"base_patient d " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
									"WHERE a.id=b.consult " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
									"AND b.patient=d.id AND b.doctor='"+doctor+"' AND a.relation_code = op.id "; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
									"AND b.patient=d.id AND b.doctor='"+doctor+"'"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
						}else{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
							 
			 | 
		
	
		
			
				 | 
				 | 
			
			
							sql = "SELECT " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
									"a.id AS id," + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
									"a.type AS type," + 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -1619,12 +1615,18 @@ public class ImService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
									"d.id as patientId," + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
									"d.idcard as patientIdcard," + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
									"d.sex as patientsex," + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
									"op.id as outpatientid," + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
									"op.type as consultType," + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
									"op.general_doctor as generalDoctor," + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
									"op.icd10_name as icd10Name," + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
									"d.photo AS patientphoto " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
									"FROM wlyy_consult a," + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
									"wlyy_consult_team b," + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
									"base_patient d " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
									"base_patient d, " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
									"wlyy_outpatient op " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
									"WHERE a.id=b.consult " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
									"AND b.patient=d.id AND b.doctor='"+doctor+"'"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
									"AND b.patient=d.id AND b.doctor='"+doctor+"' AND a.relation_code = op.id "; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
						} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
						 
			 | 
		
	
		
			
				 | 
				 | 
			
			
						 
			 |