Merge branch 'dev' of chenyongxing/patient-co-management into dev

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/service/manager/family/FamilyMemberService.java

@@ -109,7 +109,10 @@ public class FamilyMemberService extends BaseService {
                map1.put("sex", map.get("sex"));
                map1.put("isAuthorize", map.get("is_authorize"));//0:未授权,1:已授权
                map1.put("birthday", map.get("birthday"));
                map1.put("idcard", StringUtils.isEmpty(String.valueOf(map.get("idcard"))) ? "" : map.get("idcard").toString());
                String idCard = StringUtils.isEmpty(String.valueOf(map.get("idcard"))) ? "" : String.valueOf(map.get("idcard"));
                map1.put("idcard", CommonUtil.getIdcardEncode(idCard));
                map1.put("idcardAll", idCard);
                map1.put("photo", map.get("photo"));
                map1.put("mobile", map.get("mobile"));
                map1.put("address", StringUtils.isEmpty(String.valueOf(map.get("address"))) ? "" : map.get("address"));