Merge branch 'dev' of chinawu123/wlyy2.0 into dev

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/family/PatientFamilyMemberService.java

@@ -250,6 +250,11 @@ public class PatientFamilyMemberService extends BaseJpaService<BasePatientFamily
        BasePatientDO patientDO = patientDao.findById(relatives);
        boolean register=false;
        if(null == patientDO){
            result.put(ResponseContant.resultFlag,ResponseContant.fail);
            result.put(ResponseContant.resultMsg,"添加失败,账号不存在!");
            return result;
        }
        if (StringUtils.isNotBlank(relativesName)){
            patientDO.setName(relativesName);
            register=true;

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/patient/CarePatientService.java

@@ -519,8 +519,8 @@ public class CarePatientService extends BaseJpaService<BasePatientDO, BasePatien
        JSONObject result = new JSONObject();
        BasePatientDO patientDO = patientDao.findById(patient);
        if (patientDO==null){
            result.put(ResponseContant.resultFlag,ResponseContant.fail);
            result.put(ResponseContant.resultMsg,"账号不存在");
            result.put(ResponseContant.resultFlag,ResponseContant.success);
            result.put(ResponseContant.resultMsg,"操作成功");
            return result;
        }
        if (StringUtils.isNotBlank(patientDO.getIdcard())){