From 769da2fa5f90e7f1765d7eea77cda25eb8a96a1e Mon Sep 17 00:00:00 2001
From: "1378012178@qq.com" <1378012178@qq.com>
Date: Wed, 3 Dec 2025 08:58:30 +0800
Subject: [PATCH] =?UTF-8?q?=E9=95=BF=E8=80=85=E5=85=A5=E4=BD=8F=E4=B8=BB?=
 =?UTF-8?q?=E8=A1=A8=E8=AE=B0=E5=BD=95=E5=85=A5=E4=BD=8F=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/nu/modules/wechat/elder/api/ElderApi.java    | 2 ++
 .../src/main/java/com/nu/dto/ElderInfoMQDto.java          | 7 +++++++
 .../src/main/java/com/nu/entity/ElderInfoEntity.java      | 7 +++++++
 .../java/com/nu/modules/elderinfo/entity/ElderInfo.java   | 8 ++++++++
 4 files changed, 24 insertions(+)

diff --git a/nursing-unit-api/src/main/java/com/nu/modules/wechat/elder/api/ElderApi.java b/nursing-unit-api/src/main/java/com/nu/modules/wechat/elder/api/ElderApi.java
index eb86747..7ef17aa 100644
--- a/nursing-unit-api/src/main/java/com/nu/modules/wechat/elder/api/ElderApi.java
+++ b/nursing-unit-api/src/main/java/com/nu/modules/wechat/elder/api/ElderApi.java
@@ -28,6 +28,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -320,6 +321,7 @@ public class ElderApi {
 
         elderInfoEntity.setOrgCode(elderInfoEntity.getSysOrgCode());
         elderInfoEntity.setCurrentState("1");//状态：入住
+        elderInfoEntity.setCheckinTime(new Date());
         ElderInfoMQDto mqdto = new ElderInfoMQDto();
         BeanUtils.copyProperties(elderInfoEntity, mqdto);
         mqdto.setId(id);
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 f2ba200..760dc23 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
@@ -267,4 +267,11 @@ public class ElderInfoMQDto implements Serializable {
     //变更审批结果
     private String upAuditResut;
 
+    /**
+     * 长者入住时间
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date checkinTime;
+
 }
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 910552c..f4fa713 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
@@ -263,4 +263,11 @@ public class ElderInfoEntity implements Serializable {
 
     //需要变更谁的信息 zz长者 jhr监护人
     private String modifyType;
+
+    /**
+     * 长者入住时间
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date checkinTime;
 }
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 ce568b5..43d6b6b 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
@@ -1,6 +1,7 @@
 package com.nu.modules.elderinfo.entity;
 
 import java.io.Serializable;
+import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -349,4 +350,11 @@ public class ElderInfo implements Serializable {
     @ApiModelProperty(value = "长者变更信息对应子表id nu_biz_elder_modify_info.id")
     private String elderModifyId;
 
+    /**
+     * 长者入住时间
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date checkinTime;
+
 }