From 43b73aa8ccba3fc1dd47777ee8c36fea5285ad7b Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Fri, 6 Feb 2026 16:53:58 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3PC=E7=AB=AF=20=E7=9B=91?= =?UTF-8?q?=E6=8A=A4=E4=BA=BA=E5=8E=86=E5=8F=B2=E5=AF=B9=E6=AF=94=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=B1=95=E7=A4=BA=E4=B8=8D=E6=AD=A3=E7=A1=AE=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/nu/modules/elderinfo/entity/ElderInfo.java | 3 +++ .../modules/elderinfo/service/impl/ElderInfoServiceImpl.java | 1 + 2 files changed, 4 insertions(+) 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 73049bf0..1c138461 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 @@ -421,5 +421,8 @@ public class ElderInfo implements Serializable { @TableField(exist = false) private String modifyStatus; + @TableField(exist = false) + private String pkId; + } 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 40ba5bc0..8e0ec0c5 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 @@ -157,6 +157,7 @@ public class ElderInfoServiceImpl extends ServiceImpl beforeUseQW = new QueryWrapper<>(); //首次入住信息 或者 （小于数据审批时间 且 是长者/监护人（根据当前查询的数据类型） 且 已审核通过的） + beforeUseQW.eq("pk_id",modifyData.getPkId()); beforeUseQW.eq("modify_status", "0").or(c -> c.and(inner -> inner.lt("update_time", modifyData.getUpdateTime()).eq("modify_type", modifyData.getModifyType()).eq("modify_status", "2"))); beforeUseQW.orderByDesc("update_time"); ElderModifyInfo usingData = elderModifyInfoService.list(beforeUseQW).get(0);