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);