监护人增加身份证正面内容存储，调整相应接口代码

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;
     /**
      * 监护人家庭住址
      */

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;
     /**
      * 监护人家庭住址
      */

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日")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy年MM月dd日")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private java.util.Date guardianBirthDate;
-    @ApiModelProperty(value = "出生日期")
+    /**
-    private java.util.Date guardianDateOfBirth;
+     * 监护人性别
+     */
+    private String guardianSex;
+    /**
+     * 监护人民族
+     */
+    private String guardianNational;
+    /**
+     * 监护人身份证住址
+     */
+    private String guardianCardHome;
+    /**
+     * 监护人身份证正面
+     */
+    private String guardianIdCardPositive;
     /**
      * 监护人家庭住址
      */

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<ElderInfoMapper, ElderInfo
                             Objects.equals(dbRecord.getRelationship(), inputRecord.getRelationship()) &&
                             Objects.equals(dbRecord.getGuardianIdCard(), inputRecord.getGuardianIdCard()) &&
                             Objects.equals(dbRecord.getGuardianPhone(), inputRecord.getGuardianPhone()) &&
-                            Objects.equals(dbRecord.getGuardianDateOfBirth(), inputRecord.getGuardianDateOfBirth()) &&
                             Objects.equals(dbRecord.getGuardianHomeAddress(), inputRecord.getGuardianHomeAddress()) &&
-                            Objects.equals(dbRecord.getGuardianWorkUnit(), inputRecord.getGuardianWorkUnit())
+                            Objects.equals(dbRecord.getGuardianWorkUnit(), inputRecord.getGuardianWorkUnit()) &&
+                            Objects.equals(dbRecord.getGuardianIdCardPositive(), inputRecord.getGuardianIdCardPositive())
             );
         }
 //        if("jhr".equals(elderInfoEntity.getModifyType())){