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

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

@@ -427,13 +427,13 @@ public class PatientInfoController extends BaseController {
            if (StringUtils.isNotEmpty(oldMobile)) {
                keyword = "原关联手机号码"+oldMobile+"变更为"+keyword;
            }
            String reg = "^1[34578][0-9]{9}$";
            Pattern pattern = Pattern.compile(reg);
            Matcher matcher = pattern.matcher(newMobile);
            Boolean flag = matcher.matches();
            if (!flag){
                return error(-1, "新手机号格式不正确！");
            }
//            String reg = "^1[34578][0-9]{9}$";
//            Pattern pattern = Pattern.compile(reg);
//            Matcher matcher = pattern.matcher(newMobile);
//            Boolean flag = matcher.matches();
//            if (!flag){
//                return error(-1, "新手机号格式不正确！");
//            }
            Patient patient1 = patientDao.findByCode(patient);
            String patientName = patient1.getName();
            String openid = patient1.getOpenid();