| 
					
				 | 
			
			
				@ -6,6 +6,7 @@ import java.util.List; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				import java.util.Map; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				import java.util.concurrent.TimeUnit; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				import com.yihu.wlyy.aop.ObserverRequired; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				import com.yihu.wlyy.entity.consult.ConsultTeam; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				import com.yihu.wlyy.entity.doctor.team.sign.SignPatientLabel; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				import com.yihu.wlyy.entity.organization.Hospital; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -506,6 +507,7 @@ public class DoctorController extends BaseController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    @RequestMapping(value = "updatepwd") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    @ResponseBody 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    @ObserverRequired 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    public String updatepwd(String oldpwd, String newpwd) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        try { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            Doctor doctor = doctorInfoService.findDoctorByCode(getUID()); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -669,6 +671,7 @@ public class DoctorController extends BaseController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    @RequestMapping(value = "save") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    @ResponseBody 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    @ObserverRequired 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    public String save( 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            @RequestParam(required = false) String photo, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            @RequestParam(required = false) Integer sex, 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -1224,6 +1227,7 @@ public class DoctorController extends BaseController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    @RequestMapping(value = "/doctor_1_Toteam") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    @ResponseBody 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    @ObserverRequired 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    public String doctor_1_Toteam( 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            @RequestParam(required = false) String teamCode, //没用 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            @RequestParam(required = true) String parientCode, 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -1465,6 +1469,7 @@ public class DoctorController extends BaseController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    @RequestMapping(value = "/idcard_update") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    @ResponseBody 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    @ObserverRequired 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    public String updateIdcard(String idcard) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        try { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            if (StringUtils.isEmpty(idcard)) { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -1490,6 +1495,7 @@ public class DoctorController extends BaseController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    @RequestMapping(value = "/sex_update") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    @ResponseBody 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    @ObserverRequired 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    public String updateSex(int sex) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        try { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            if (doctorInfoService.updateSex(sex, getUID())) { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -1510,6 +1516,7 @@ public class DoctorController extends BaseController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    @RequestMapping(value = "/introduce_update") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    @ResponseBody 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    @ObserverRequired 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    public String updateIntroduce(String introduce) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        try { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            if (StringUtils.isEmpty(introduce)) { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -1534,6 +1541,7 @@ public class DoctorController extends BaseController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    @RequestMapping(value = "/expertise_update") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    @ResponseBody 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    @ObserverRequired 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    public String updateExpertise(String expertise) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        try { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            if (StringUtils.isEmpty(expertise)) { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -1558,6 +1566,7 @@ public class DoctorController extends BaseController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    @RequestMapping(value = "/setFamous") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    @ResponseBody 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    @ObserverRequired 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    public String setFamous(String doctorCode, Integer status) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        try { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            doctorInfoService.setFamous(doctorCode, status); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -1578,6 +1587,7 @@ public class DoctorController extends BaseController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    @RequestMapping(value = "/updateTeamHealthDoctors") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    @ResponseBody 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    @ObserverRequired 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    public String updateTeamHealthDoctors(String newDoctorCode, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                          @RequestParam(required = false) String oldDoctorCode, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                          @RequestParam(required = false) String patients, 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -1632,6 +1642,7 @@ public class DoctorController extends BaseController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    @RequestMapping(value = "/updateTeamDoctors") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    @ResponseBody 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    @ObserverRequired 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    public String updateTeamDoctors(String newDoctorCode, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                    String oldDoctorCode, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                    String patients) { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -1668,6 +1679,7 @@ public class DoctorController extends BaseController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    @RequestMapping(value = "/mobile_update", method = RequestMethod.POST) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    @ResponseBody 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    @ObserverRequired 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    public String changeDoctorMobile(String mobile, String captcha, int type) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        try { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            if (StringUtils.isEmpty(mobile)) { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -1733,6 +1745,7 @@ public class DoctorController extends BaseController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    @RequestMapping(value = "/updatePassword", method = RequestMethod.POST) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    @ResponseBody 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    @ObserverRequired 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    public String updatePassword(String newPassword1, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                 String newPassword2, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                 String oldPassword, 
			 |