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

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/account/DoctorInfoService.java

@@ -916,6 +916,11 @@ public class DoctorInfoService extends BaseService {
        if (StringUtils.isEmpty(signFamily.getTeamCode())) {
            return -1;
        }
        if(StringUtils.isNotEmpty(signFamily.getDoctorHealth())){
            return -2;
        }
        Doctor newD = doctorDao.findByCode(newDoctorCode);
        //修改签约中的健康管理师
        signFamily.setDoctorHealth(newD.getCode());

patient-co-wlyy/src/main/resources/system.properties

@@ -163,7 +163,7 @@ template_doctor_change=TNIDMjduVKgVL4-k71umYLpHROvFB8K6mmm8aZC_EH8
##健康教育
#template_healthy_article=a5-ZGf-IUUULsuRNoHWQiBMU6pSYhLgPPqV67SjdLRo
##医生变更
#template_doctor_change=TNIDMjduVKgVL4-k71umYLpHROvFB8K6mmm8aZC_EH8
#template_doctor_change=dtzSHImbPKfwcrjWlJEjAw3lGlvrLjsobSOE8g4adZA
#----------------测试环境(健康之路i厦门)----------------#