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

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

@@ -61,7 +61,13 @@ public class PatientFamilyMemberService extends BaseJpaService<BasePatientFamily
     */
    public int familyRelationTrans(BasePatientDO patient, int relation) throws Exception {
        int relationTrans = 0;
        if(patient.getSex()==null&&StringUtils.isNoneBlank(patient.getIdcard())){
            try {
                patient.setSex(Integer.valueOf(IdCardUtil.getSexForIdcard_new(patient.getIdcard())));
            }catch (Exception e){
                e.printStackTrace();
            }
        }
        switch (relation) {
            case 1:
            case 2: