From 63711347c202830127ddf19ae9cfcb4b3288087f Mon Sep 17 00:00:00 2001
From: "1378012178@qq.com" <1378012178@qq.com>
Date: Wed, 29 Oct 2025 16:24:48 +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 +++++++++++-
 .../modules/elderinfo/entity/ElderInfo.java   | 24 ++++++++++++----
 .../entity/ElderModifyInfo.java               | 28 +++++++++++++++----
 3 files changed, 58 insertions(+), 12 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 7020539b..f2ba200d 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-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 356f520d..58866510 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
@@ -202,11 +202,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/eldermofifyinfo/entity/ElderModifyInfo.java b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldermofifyinfo/entity/ElderModifyInfo.java
index 4f697b86..f596c3b7 100644
--- a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldermofifyinfo/entity/ElderModifyInfo.java
+++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldermofifyinfo/entity/ElderModifyInfo.java
@@ -152,12 +152,28 @@ public class ElderModifyInfo implements Serializable {
 	@Excel(name = "联系电话", width = 15)
     @ApiModelProperty(value = "联系电话")
     private String guardianPhone;
-	/**监护人出生日期*/
-	@Excel(name = "监护人出生日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value = "监护人出生日期")
-    private 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;
 	/**监护人家庭住址*/
 	@Excel(name = "监护人家庭住址", width = 15)
     @ApiModelProperty(value = "监护人家庭住址")