Merge branch 'feature-licancan' into 'develop'

Feature licancan

See merge request fangxinjiang/yifu!196

yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/util/IdCardUtil.java

@@ -33,7 +33,6 @@ public class IdCardUtil {
 
 	/**
 	 * 根据身份证号计算周岁
-	 * 例如：当前时间是2022-08-22，那么2007-08-22算15周岁，2007-08-23才算16周岁
 	 *
 	 * @author licancan
 	 * @param idNO
@@ -58,11 +57,12 @@ public class IdCardUtil {
 		int yearBirth = bir.get(Calendar.YEAR);
 		int monthBirth = bir.get(Calendar.MONTH);
 		int dayBirth = bir.get(Calendar.DAY_OF_MONTH);
-		// 大概年龄是当前年减去出生年
-		int age = yearNow - yearBirth;
-		// 如果出当前月大于出生月，或者当前月等于出生月但是当前日大于出生日，那么年龄age就加一岁
-		if (monthNow > monthBirth || (monthNow == monthBirth && dayNow > dayBirth)) {
-			age++;
+		int age;
+		// 如果当前月大于出生月，或者当前月等于出生月但是当前日大于出生日 直接减，否则再减1
+		if ((monthBirth < monthNow) || (monthBirth == monthNow && dayBirth < dayNow)) {
+			age = yearNow - yearBirth;
+		} else {
+			age = yearNow - yearBirth - 1;
 		}
 		return age;
 	}