|  | @ -57,7 +57,7 @@ public class BaseDoctorService extends BaseJpaService<BaseDoctorDO, BaseDoctorDa
 | 
	
		
			
				|  |  |                 " FROM " +
 | 
	
		
			
				|  |  |                 " base_doctor a " +
 | 
	
		
			
				|  |  |                 " JOIN base_doctor_hospital b ON a.id = b.doctor_code " +
 | 
	
		
			
				|  |  |                 " LEFT JOIN wlyy_charge_dict e ON a.charge_type = e.charge_type " +
 | 
	
		
			
				|  |  |                 " LEFT JOIN (SELECT * FROM wlyy_charge_dict t WHERE t.dept_type_code ='6') e ON a.charge_type = e.charge_type " +
 | 
	
		
			
				|  |  |                 " LEFT JOIN base_doctor_mapping c ON a.id = c.doctor " +
 | 
	
		
			
				|  |  |                 " WHERE " +
 | 
	
		
			
				|  |  |                 " 1 = 1";
 | 
	
	
		
			
				|  | @ -110,7 +110,7 @@ public class BaseDoctorService extends BaseJpaService<BaseDoctorDO, BaseDoctorDa
 | 
	
		
			
				|  |  |                 " FROM " +
 | 
	
		
			
				|  |  |                 " base_doctor a " +
 | 
	
		
			
				|  |  |                 " JOIN base_doctor_hospital b ON a.id = b.doctor_code " +
 | 
	
		
			
				|  |  |                 " LEFT JOIN wlyy_charge_dict e ON a.charge_type = e.charge_type " +
 | 
	
		
			
				|  |  |                 " LEFT JOIN (SELECT * FROM wlyy_charge_dict t WHERE t.dept_type_code ='6') e ON a.charge_type = e.charge_type " +
 | 
	
		
			
				|  |  |                 " LEFT JOIN base_doctor_mapping c ON a.id = c.doctor " +
 | 
	
		
			
				|  |  |                 " WHERE 1=1";
 | 
	
		
			
				|  |  |         if (StringUtils.isNotBlank(city)){
 | 
	
	
		
			
				|  | @ -210,7 +210,7 @@ public class BaseDoctorService extends BaseJpaService<BaseDoctorDO, BaseDoctorDa
 | 
	
		
			
				|  |  |             for(int i=0;i<jsonArray.size();i++){
 | 
	
		
			
				|  |  |                 JSONObject doctor = jsonArray.getJSONObject(i);
 | 
	
		
			
				|  |  |                 try {
 | 
	
		
			
				|  |  |                     update(doctor);
 | 
	
		
			
				|  |  |                     updateInfo(doctor);
 | 
	
		
			
				|  |  |                 }catch (Exception e){
 | 
	
		
			
				|  |  |                     logger.info("update doctor error:"+e.toString());
 | 
	
		
			
				|  |  |                 }
 | 
	
	
		
			
				|  | @ -265,6 +265,17 @@ public class BaseDoctorService extends BaseJpaService<BaseDoctorDO, BaseDoctorDa
 | 
	
		
			
				|  |  |         return true;
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     public Boolean updateInfo(JSONObject jsonObject)throws Exception{
 | 
	
		
			
				|  |  |         //取出数据
 | 
	
		
			
				|  |  |         String doctorId = jsonObject.get("doctorId").toString();
 | 
	
		
			
				|  |  |         String introduce = jsonObject.get("introduce").toString();
 | 
	
		
			
				|  |  |         String expertise = jsonObject.get("expertise").toString();
 | 
	
		
			
				|  |  |         String photo = jsonObject.get("photo").toString();
 | 
	
		
			
				|  |  |         String outpatientType = jsonObject.get("outpatientType").toString();
 | 
	
		
			
				|  |  |         baseDoctorDao.update(doctorId,introduce,expertise,photo,outpatientType);
 | 
	
		
			
				|  |  |         return true;
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     /**
 | 
	
		
			
				|  |  |      * 修改医生状态
 |