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

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

@@ -140,7 +140,12 @@ public class MyFamilyService {
            messageDO.setSenderPhoto(patientDO.getPhoto());
            messageDO.setTitle("家人绑定");
            messageDO.setMsgDigest("");
            String msgContent = familyPatient.getName()+",您好！"+patientDO.getName()+"向您发起添加家人申请，添加成功后，对方可使用您的账号，为您处理各类健康服务。";
            String msgContent = "";
            if(familyPatient.getName()==null){
                msgContent = "您好！"+patientDO.getName()+"向您发起添加家人申请，添加成功后，对方可使用您的账号，为您处理各类健康服务。";
            }else{
                msgContent = familyPatient.getName()+",您好！"+patientDO.getName()+"向您发起添加家人申请，添加成功后，对方可使用您的账号，为您处理各类健康服务。";
            }
            messageDO.setMsgContent(msgContent);
            messageDO.setMsgTypeCode("010801");
            messageDO.setMsgTypeName("系统消息-添加家人申请");
@@ -393,8 +398,11 @@ public class MyFamilyService {
        }else{
            map.put("isBinding",0);
        }
        map.put("explain","您的"+role.get(converRole-1)+apply.getName()+"邀请您绑定家人账号");
        if(apply.getName()==null){
            map.put("explain","您的"+role.get(converRole-1)+"邀请您绑定家人账号");
        }else{
            map.put("explain","您的"+role.get(converRole-1)+apply.getName()+"邀请您绑定家人账号");
        }
        return map;
    }
@@ -413,7 +421,11 @@ public class MyFamilyService {
        Integer converRole = familyRelationTrans(patientApplyLog.getFamilyBindRole(),apply.getSex());
        if(patientApplyLog.getFailureTime().getTime()<System.currentTimeMillis()) {
            map.put("overdue", "1");//过期
            map.put("explain", "您的" + role.get(converRole - 1) + apply.getName() + "向您发起的绑定邀请已过期");
            if(apply.getName()==null){
                map.put("explain", "您的" + role.get(converRole - 1)  + "向您发起的绑定邀请已过期");
            }else{
                map.put("explain", "您的" + role.get(converRole - 1) + apply.getName() + "向您发起的绑定邀请已过期");
            }
        }else {
            map.put("overdue", "0");
        }
@@ -605,7 +617,11 @@ public class MyFamilyService {
            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()+"邀请您绑定家人账号");
            if(createPatient.getName()==null){
                map.put("explain","您的"+role.get(converRole-1)+"邀请您绑定家人账号");
            }else{
                map.put("explain","您的"+role.get(converRole-1)+createPatient.getName()+"邀请您绑定家人账号");
            }
            result.add(map);
//            BaseMessageDO msg = messageService.findById(Integer.valueOf(one.get("id")+""));
//            msg.setReadState(1);