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

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/sign/DoctorFamilyContractController.java

@@ -312,10 +312,12 @@ public class DoctorFamilyContractController extends WeixinBaseController {
                }
            }
            if (StringUtils.isEmpty(doctor) && StringUtils.isEmpty(healthDoctor)) {
            if (StringUtils.isEmpty(doctor) && StringUtils.isEmpty(healthDoctor) && type != 2) {
                return error(-1, "全科医生或健管师不能为空！");
            }
            if (adminTeamCode <= 0 && type != 2) {
                return error(-1, "团队不能为空！");
            }
            if (StringUtils.isEmpty(healthLabel) && type != 2) {
                return error(-1, "健康情况标签不能为空！");
            }