From 6b39d4f15a0c2016c30157865471b3d80fb67128 Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Fri, 6 Feb 2026 17:39:44 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=9B=91=E6=8A=A4=E4=BA=BA?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=8E=86=E5=8F=B2=E8=AF=A6=E6=83=85=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E4=B8=8D=E6=AD=A3=E7=A1=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ElderInfoServiceImpl.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) 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 8e0ec0c5..15d36a47 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,9 +157,18 @@ 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"); + beforeUseQW.eq("pk_id", modifyData.getPkId()) + .and(wrapper -> wrapper + .eq("modify_status", "0") + .or() + .or(inner -> inner + .lt("update_time", modifyData.getUpdateTime()) + .eq("modify_type", modifyData.getModifyType()) + .eq("modify_status", "2") + ) + ) + .orderByDesc("update_time"); + List list = elderModifyInfoService.list(beforeUseQW); ElderModifyInfo usingData = elderModifyInfoService.list(beforeUseQW).get(0); // 2. 查询变更后数据 ：就是传进来的记录