云照护修改

common/common-util/src/main/java/com/yihu/jw/util/common/IdCardUtil.java

@@ -250,6 +250,13 @@ public class IdCardUtil {
        }
        return age;
    }
    public static int getAgeByBirthdayStrOrIdcard(String idcard,String birthday){
        int age = getAgeByBirthdayStr(birthday);
        if(age<=0){
            return getAgeForIdcard(idcard);
        }
        return age;
    }
    public static int getAgeByBirthday(Date birthday){
        int age = 0;
        if(birthday!=null){
@@ -267,6 +274,23 @@ public class IdCardUtil {
        }
        return age;
    }
    public static int getAgeByBirthdayStr(String birthday){
        int age = 0;
        if(!StringUtils.isEmpty(birthday)&&!"null".equals(birthday)){
            Calendar calendar = Calendar.getInstance();
            calendar.setTime(DateUtil.strToDate(birthday));
            int year = calendar.get(Calendar.YEAR);
            int month = calendar.get(Calendar.MONTH);
            int day = calendar.get(Calendar.DATE);
            Calendar cal = Calendar.getInstance();
            age = cal.get(Calendar.YEAR) - year;
            //周岁计算
            if (cal.get(Calendar.MONTH) < (month - 1) || (cal.get(Calendar.MONTH) == (month - 1) && cal.get(Calendar.DATE) < day)) {
                age--;
            }
        }
        return age;
    }
    public static String getSexNameForIdcard_new(String idCard){
        String sex = getSexForIdcard_new(idCard);