diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BirthResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BirthResult.java index 308e5c7..fa4ee22 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BirthResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BirthResult.java @@ -128,7 +128,7 @@ public class BirthResult { private String babyVillageId; public Integer getHmarriageAge() { - return DateUtil.getAge(husbandBirth); + return husbandBirth!=null?DateUtil.getAge(husbandBirth):hmarriageAge; } public void setHmarriageAge(Integer hmarriageAge) {