From d222704c974494749acc0fdb8e2f1a0cac067030 Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Wed, 29 Oct 2025 16:27:04 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E6=8A=A4=E4=BA=BA=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E8=AF=81=E6=AD=A3=E9=9D=A2=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E5=AD=98=E5=82=A8=EF=BC=8C=E8=B0=83=E6=95=B4=E7=9B=B8=E5=BA=94?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/nu/dto/ElderInfoMQDto.java | 18 +++++++++++++- .../java/com/nu/entity/ElderInfoEntity.java | 18 +++++++++++++- .../modules/elderinfo/entity/ElderInfo.java | 24 +++++++++++++++---- .../service/impl/ElderInfoServiceImpl.java | 4 ++-- 4 files changed, 55 insertions(+), 9 deletions(-) diff --git a/nursing-unit-common/src/main/java/com/nu/dto/ElderInfoMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/ElderInfoMQDto.java index 7020539..f2ba200 100644 --- a/nursing-unit-common/src/main/java/com/nu/dto/ElderInfoMQDto.java +++ b/nursing-unit-common/src/main/java/com/nu/dto/ElderInfoMQDto.java @@ -140,7 +140,23 @@ public class ElderInfoMQDto implements Serializable { */ @JsonFormat(timezone = "GMT+8", pattern = "yyyy年MM月dd日") @DateTimeFormat(pattern = "yyyy年MM月dd日") - private Date guardianDateOfBirth; + private java.util.Date guardianBirthDate; + /** + * 监护人性别 + */ + private String guardianSex; + /** + * 监护人民族 + */ + private String guardianNational; + /** + * 监护人身份证住址 + */ + private String guardianCardHome; + /** + * 监护人身份证正面 + */ + private String guardianIdCardPositive; /** * 监护人家庭住址 */ diff --git a/nursing-unit-common/src/main/java/com/nu/entity/ElderInfoEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/ElderInfoEntity.java index 25dc686..910552c 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/ElderInfoEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/ElderInfoEntity.java @@ -140,7 +140,23 @@ public class ElderInfoEntity implements Serializable { */ @JsonFormat(timezone = "GMT+8", pattern = "yyyy年MM月dd日") @DateTimeFormat(pattern = "yyyy年MM月dd日") - private java.util.Date guardianDateOfBirth; + private java.util.Date guardianBirthDate; + /** + * 监护人性别 + */ + private String guardianSex; + /** + * 监护人民族 + */ + private String guardianNational; + /** + * 监护人身份证住址 + */ + private String guardianCardHome; + /** + * 监护人身份证正面 + */ + private String guardianIdCardPositive; /** * 监护人家庭住址 */ diff --git a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/entity/ElderInfo.java b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/entity/ElderInfo.java index 0acac39..ce568b5 100644 --- a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/entity/ElderInfo.java +++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/entity/ElderInfo.java @@ -205,11 +205,25 @@ public class ElderInfo implements Serializable { /** * 监护人出生日期 */ - @Excel(name = "监护人出生日期", width = 20, format = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @ApiModelProperty(value = "出生日期") - private java.util.Date guardianDateOfBirth; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy年MM月dd日") + @DateTimeFormat(pattern = "yyyy年MM月dd日") + private java.util.Date guardianBirthDate; + /** + * 监护人性别 + */ + private String guardianSex; + /** + * 监护人民族 + */ + private String guardianNational; + /** + * 监护人身份证住址 + */ + private String guardianCardHome; + /** + * 监护人身份证正面 + */ + private String guardianIdCardPositive; /** * 监护人家庭住址 */ diff --git a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/service/impl/ElderInfoServiceImpl.java b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/service/impl/ElderInfoServiceImpl.java index 356f38f..6a365e2 100644 --- a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/service/impl/ElderInfoServiceImpl.java +++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/service/impl/ElderInfoServiceImpl.java @@ -117,9 +117,9 @@ public class ElderInfoServiceImpl extends ServiceImpl