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

svr/svr-patient/src/main/java/com/yihu/jw/patient/service/myFamily/MyFamilyService.java

@@ -357,10 +357,12 @@ public class MyFamilyService {
        BasePatientDO family = patientService.findByIdAndDel(familyPatient);
        Integer converRole = familyRelationTrans(familyBindRole,apply.getSex());
        BasePatientFamilyMemberDO familyMemberDO = patientFamilyMemberService.findByPatientAndFamilyMemberAndDel(applyPatient,familyPatient);
        map.put("applySex",apply.getSex());
        map.put("applyPhoto",apply.getPhoto());
        map.put("applyMobile",apply.getMobile());
        map.put("applyToFamilyRole",familyBindRole);
        map.put("applyNonage",this.nonageByIdcard(apply.getIdcard()));//1成年，2未成年
        map.put("familySex",family.getSex());
        map.put("familyPhoto",family.getPhoto());
        map.put("familyMobile",family.getMobile());
        map.put("familyToApplyRole",converRole);
@@ -463,6 +465,7 @@ public class MyFamilyService {
            }
            map.put("nonage",this.nonageByIdcard(basePatientDO.getIdcard()));//1成年，2未成年
            map2.put("photo",basePatientDO.getPhoto());//头像
            map.put("sex",basePatientDO.getSex());//性别
            map2.put("role",role.get(one.getFamilyRelation()-1));//角色
            //判断家人是否授权
            BasePatientFamilyMemberDO o = patientFamilyMemberService.findByPatientAndFamilyMemberAndDel(one.getFamilyMember(),one.getPatient());
@@ -481,6 +484,7 @@ public class MyFamilyService {
            Map<String,Object> map = new HashedMap();
            BasePatientDO familyMember = patientService.findByIdAndDel(one.getFamilyMember());
            map.put("photo",familyMember.getPhoto());//头像
            map.put("sex",familyMember.getSex());//性别
            map.put("nonage",this.nonageByIdcard(familyMember.getIdcard()));//1成年，2未成年
            map.put("name",familyMember.getName());//姓名
            map.put("roleName",role.get(one.getFamilyRelation()-1));//角色名称
@@ -498,6 +502,7 @@ public class MyFamilyService {
            Map<String,Object> map = new HashedMap();
            BasePatientDO familyMember = patientService.findByIdAndDel(one.get("family_member_code")+"");
            map.put("photo",familyMember.getPhoto());//头像
            map.put("sex",familyMember.getSex());//性别
            map.put("nonage",this.nonageByIdcard(familyMember.getIdcard()));//1成年，2未成年
            map.put("name",familyMember.getName());//姓名
            map.put("roleName",role.get(Integer.valueOf(one.get("family_bind_role")+"")-1));//角色名称
@@ -569,9 +574,11 @@ public class MyFamilyService {
            BasePatientDO createPatient = patientService.findByIdAndDel(createUser);//绑定人
            Integer converRole = familyRelationTrans(bindRole,createPatient.getSex());//转换后的角色
            map.put("messageId",Integer.valueOf(one.get("id")+""));
            map.put("patientSex",patientDO.getSex());
            map.put("patientApplyLogId",relationData);
            map.put("patientPhoto",patientDO.getPhoto());
            map.put("patientNonage",this.nonageByIdcard(patientDO.getIdcard()));//1成年，2未成年
            map.put("applySex",createPatient.getSex());
            map.put("applyPatientPhoto",createPatient.getPhoto());
            map.put("applyPatientNonage",this.nonageByIdcard(createPatient.getIdcard()));//1成年，2未成年
            map.put("explain","您的"+role.get(converRole-1)+createPatient.getName()+"邀请您绑定家人账号");