| 
					
				 | 
			
			
				@ -132,10 +132,10 @@ public class BaseDoctorService extends BaseJpaService<BaseDoctorDO, BaseDoctorDa 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                " e.req_fee AS \"money\" " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                " FROM " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                " base_doctor a " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                " JOIN base_doctor_hospital b ON a.id = b.doctor_code " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                " JOIN base_doctor_mapping c ON a.id = c.doctor " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                " JOIN wlyy_doctor_special_disease d ON a.id = d.doctor_code " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                " JOIN wlyy_charge_dict e ON a.charge_type = e.charge_type " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                " LEFT JOIN base_doctor_hospital b ON a.id = b.doctor_code " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                " LEFT JOIN base_doctor_mapping c ON a.id = c.doctor " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                " LEFT JOIN wlyy_doctor_special_disease d ON a.id = d.doctor_code " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                " LEFT JOIN wlyy_charge_dict e ON a.charge_type = e.charge_type " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                " WHERE 1=1 "; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        if(StringUtils.isNotBlank(doctorId)){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            sql+=" AND a.id =:id"; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -148,20 +148,25 @@ public class BaseDoctorService extends BaseJpaService<BaseDoctorDO, BaseDoctorDa 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        StringBuilder disease = new StringBuilder(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        StringBuilder code = new StringBuilder(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        if (null != list && list.size() > 0){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            for (int i=0;i<list.size();i++){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                if (i == 0 ){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                    disease.append(list.get(i).get("diseaseName")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                    code.append(list.get(i).get("diseaseCode")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                }else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                    disease.append(","+list.get(i).get("diseaseName")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                    code.append(","+list.get(i).get("diseaseCode")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            if (list.size() == 1){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                return  list.get(0); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            }else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                for (int i=0;i<list.size();i++){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                    if (i == 0 ){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                        disease.append(list.get(i).get("diseaseName")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                        code.append(list.get(i).get("diseaseCode")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                    }else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                        disease.append(","+list.get(i).get("diseaseName")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                        code.append(","+list.get(i).get("diseaseCode")); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                list.get(0).put("diseaseName",disease); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                list.get(0).put("diseaseCode",code); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                return  list.get(0); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            list.get(0).put("diseaseName",disease); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            list.get(0).put("diseaseCode",code); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        return  list.get(0); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        return null; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 |