Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-05-20 ad0241fd6fe15600dde313cb28c9861be6c8089c

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java

@@ -1546,8 +1546,9 @@

        List<ComMngFamilyInfoVO> listRt = new ArrayList<>();
        sortedList.forEach(rt -> {
            boolean isElders =  rt.getAge()>=80;
            if(isElders){
            int age = IdCard.IdNOToAge(rt.getIdCard());
            boolean isElders = age >= 80;
            if (isElders) {
                listRt.add(rt);
            }
        });
@@ -1583,6 +1584,9 @@
            //根据身份证查询出籍贯 出生日期
            //String domicile = IdCard.domicile(eldersAuthDO.getIdCard());
            String domicile = eldersAuthService.queryDomicile(eldersAuthDO.getIdCard());
            if(StringUtils.isEmpty(domicile)){
                domicile = "暂无";
            }

            Date birthDay = IdCard.birthDay(eldersAuthDO.getIdCard());
            eldersAuthDO.setDomicile(domicile);