Merge branch 'dev' of lyr/patient-co-management into dev

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/account/DoctorController.java

@@ -1569,7 +1569,7 @@ public class DoctorController extends BaseController {
                redisTemplate.opsForValue().set("jianguanshifenpei:" + getUID(),"1");
                redisTemplate.expire("jianguanshifenpei:" + getUID(), 20, TimeUnit.MINUTES);
            } else {
                return error(-1,"正在分配，请勿重复操作");
                return error(-2,"正在分配，请勿重复操作");
            }
            if (StringUtils.isNotEmpty(isAll) && isAll.equals("1")) {
                int result = doctorInfoService.updateTeamHealthDoctorsAll(newDoctorCode, getUID());
@@ -1617,7 +1617,7 @@ public class DoctorController extends BaseController {
                redisTemplate.opsForValue().set("quankeyishengfenpei:" + getUID(),"1");
                redisTemplate.expire("quankeyishengfenpei:" + getUID(), 20, TimeUnit.MINUTES);
            } else {
                return error(-1,"正在分配，请勿重复操作");
                return error(-2,"正在分配，请勿重复操作");
            }
            doctorInfoService.updateTeamDoctors(newDoctorCode, oldDoctorCode, patients, getUID());
            redisTemplate.opsForValue().set("quankeyishengfenpei:" + getUID(), "0");