From acede50af23a5ffefd47152f0b192bb7086617e3 Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Fri, 9 Jan 2026 10:55:35 +0800 Subject: [PATCH] =?UTF-8?q?pad=E7=AB=AF=E6=8C=87=E4=BB=A4=E9=A2=84?= =?UTF-8?q?=E8=A7=88=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E5=A4=84=E7=90=86=EF=BC=9A=E5=A6=82=E6=9E=9Cnu=5Fid=20elder=5F?= =?UTF-8?q?id=20=E6=97=B6=E9=97=B4=20=E5=8F=82=E6=95=B0=E7=BC=BA=E5=B0=91?= =?UTF-8?q?=E5=88=99=E8=BF=94=E5=9B=9E=E7=A9=BA=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/pad/directiveplan/api/CareDirectiveApi.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/nursing-unit-api/src/main/java/com/nu/modules/pad/directiveplan/api/CareDirectiveApi.java b/nursing-unit-api/src/main/java/com/nu/modules/pad/directiveplan/api/CareDirectiveApi.java index b9df12e2..ebe9fa94 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/pad/directiveplan/api/CareDirectiveApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/pad/directiveplan/api/CareDirectiveApi.java @@ -8,6 +8,7 @@ import com.nu.modules.care.api.ICareDirectivePlanApi; import com.nu.modules.order.api.IDirectiveOrderApi; import lombok.extern.slf4j.Slf4j; import org.apache.commons.compress.utils.Lists; +import org.apache.commons.lang.StringUtils; import org.jeecg.common.api.vo.Result; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; @@ -264,6 +265,13 @@ public class CareDirectiveApi { List current = Lists.newArrayList(); List future = Lists.newArrayList(); List all = Lists.newArrayList(); + if (StringUtils.isBlank(dto.getElderId()) || StringUtils.isBlank(dto.getNuId()) || dto.getQueryDate() == null) { + result.put("history", history); + result.put("current", current); + result.put("future", future); + result.put("all", all); + return Result.OK(result); + } //历史 history = directiveOrderApi.queryHistory(dto);