Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

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

@@ -224,9 +224,12 @@ public class DoctorFamilyContractController extends WeixinBaseController {
            if (StringUtils.isEmpty(ssc)) {
                return error(-1, "社保卡号不允许为空！");
            }
//            if (StringUtils.isEmpty(mobile)) {
//                return error(-1, "手机号不允许为空！");
//            }
            if (!StringUtils.isEmpty(mobile)) {
                Patient patient = patientService.findByMobile(mobile);
                if (patient != null && !StringUtils.equals(patient.getIdcard(), idcard)) {
                    return error(-1, "该手机号已绑定其他身份证号！");
                }
            }
            if (StringUtils.isEmpty(healthLabel)) {
                return error(-1, "健康情况标签不能为空！");
            }
@@ -237,10 +240,7 @@ public class DoctorFamilyContractController extends WeixinBaseController {
            if (StringUtils.isNotEmpty(images)) {
                images = CommonUtil.copyTempImage(images);
            }
            Patient patient = patientService.findByMobile(mobile);
            if (patient != null && !StringUtils.equals(patient.getIdcard(), idcard)) {
                return error(-1, "该手机号已绑定其他身份证号！");
            }
            Doctor cDoctor = doctorService.findDoctorByCode(getUID());
            SignFamily sf = familyContractService.agent(getAccessToken(), name, doctor, doctorName,
                    healthDoctor, healthDoctorName, majorDoctor, majorDoctorName, cDoctor.getHospital(), cDoctor.getHosptialName(),