From 77eabd7616932df889dd9dbd8a47c966fd9ae620 Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Thu, 8 Jan 2026 16:54:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Epad=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=EF=BC=9A=E5=8F=AF=E6=8C=89=E5=A4=A9=E6=9F=A5=E8=AF=A2=EF=BC=88?= =?UTF-8?q?=E4=BB=85=E5=8F=AF=E4=BB=8A=E5=A4=A9=E6=88=96=E5=8E=86=E5=8F=B2?= =?UTF-8?q?=EF=BC=89=E5=B7=B2=E4=B8=8B=E5=8F=91=E6=9C=8D=E5=8A=A1=E6=8C=87?= =?UTF-8?q?=E4=BB=A4=E5=B7=A5=E5=8D=95=E3=80=81=E6=89=A7=E8=A1=8C=E4=B8=AD?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4=E5=B7=A5=E5=8D=95=E3=80=81?= =?UTF-8?q?=E5=BE=85=E6=89=A7=E8=A1=8C=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4?= =?UTF-8?q?=E5=B7=A5=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../directiveplan/api/CareDirectiveApi.java | 92 ++++-- .../com/nu/entity/CareDirectiveEntity.java | 6 + .../care/api/ICareDirectivePlanApi.java | 7 +- .../modules/order/api/IDirectiveOrderApi.java | 4 + .../order/mapper/DirectiveOrderMapper.java | 5 + .../order/mapper/xml/DirectiveOrderMapper.xml | 173 ++++++++++++ .../impl/DirectiveOrderPadServiceImpl.java | 13 + .../care/mapper/CareDirectivePlanMapper.java | 5 + .../mapper/xml/CareDirectivePlanMapper.xml | 264 ++++++++++++++++-- .../impl/CareDirectivePlanServiceImpl.java | 10 +- 10 files changed, 525 insertions(+), 54 deletions(-) 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 83d77e64..0aff6562 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 @@ -1,24 +1,29 @@ package com.nu.modules.pad.directiveplan.api; -import com.nu.entity.CareDirectiveEntity; -import com.nu.entity.CareDirectiveInstantEntity; -import com.nu.entity.CareDirectivePackageEntity; +import cn.hutool.core.date.DateUtil; +import com.google.common.collect.Maps; +import com.nu.entity.*; import com.nu.modules.config.IDirectiveConfigApi; 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.jeecg.common.api.vo.Result; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.Map; /** -* @Description: 护理类服务指令计划API -* @Author: caolei -* @Date: 2025-11-26 -* @Version: V1.0 -*/ + * @Description: 护理类服务指令计划API + * @Author: caolei + * @Date: 2025-11-26 + * @Version: V1.0 + */ @RestController @RequestMapping("/api/pad/care/directive") @@ -27,9 +32,10 @@ public class CareDirectiveApi { @Autowired private IDirectiveConfigApi directiveConfigApi; - @Autowired private ICareDirectivePlanApi careDirectivePlanApi; + @Autowired + private IDirectiveOrderApi directiveOrderApi; /** * 获取护理类服务指令树-配置数据 @@ -37,22 +43,22 @@ public class CareDirectiveApi { * @return */ @GetMapping(value = "/getServiceTree") - public Result>> getServiceTree() { - List> treeList = directiveConfigApi.getServiceTree("1"); + public Result>> getServiceTree() { + List> treeList = directiveConfigApi.getServiceTree("1"); return Result.OK(treeList); } - /** - * PAD端获取服务指令计划表格数据 - * - * @param careDirectiveEntity - * @return - */ - @GetMapping(value = "/getNclist") - public Result> getPlanList(CareDirectiveEntity careDirectiveEntity) { - Map pageList = careDirectivePlanApi.getPlanList(careDirectiveEntity); - return Result.OK(pageList); - } + /** + * PAD端获取服务指令计划表格数据 + * + * @param careDirectiveEntity + * @return + */ + @GetMapping(value = "/getNclist") + public Result> getPlanList(CareDirectiveEntity careDirectiveEntity) { + Map pageList = careDirectivePlanApi.getPlanList(careDirectiveEntity); + return Result.OK(pageList); + } /** * 获取指令包集合数据 @@ -235,4 +241,46 @@ public class CareDirectiveApi { // return Result.OK("操作成功"); // } + /** + * 获取护理单元+老人 当天服务指令 + *

+ * 入参 + * dto.nuId + * elderId + * startTime + * endTime + * + * @return history 已结束指令 + * current 正在执行指令 + * future 将来待执行指令 + * all 所有 + * @return + */ + @GetMapping(value = "/getDirectiveOrders") + public Result> getDirectiveOrders(CareDirectiveEntity dto) { + Map result = Maps.newHashMap(); + List history = Lists.newArrayList(); + List current = Lists.newArrayList(); + List future = Lists.newArrayList(); + List all = Lists.newArrayList(); + + //历史 + history = directiveOrderApi.queryHistory(dto); + if (DateUtil.isSameDay(new Date(), dto.getQueryDate())) { + //正在执行 + current = directiveOrderApi.queryCurrent(dto); + //将来 + future = careDirectivePlanApi.queryFuture(dto); + } + //所有 + all.addAll(history); + all.addAll(current); + all.addAll(future); + + result.put("history", history); + result.put("current", current); + result.put("future", future); + result.put("all", all); + return Result.OK(result); + } } diff --git a/nursing-unit-common/src/main/java/com/nu/entity/CareDirectiveEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/CareDirectiveEntity.java index 5d55ceea..977dc370 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/CareDirectiveEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/CareDirectiveEntity.java @@ -108,4 +108,10 @@ public class CareDirectiveEntity implements Serializable { /**长者标签列表**/ private List tagList; + /**查询时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + private Date queryDate; + private String orderTimeType; + } diff --git a/nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/care/api/ICareDirectivePlanApi.java b/nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/care/api/ICareDirectivePlanApi.java index 3c946c77..f565e48c 100644 --- a/nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/care/api/ICareDirectivePlanApi.java +++ b/nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/care/api/ICareDirectivePlanApi.java @@ -1,9 +1,6 @@ package com.nu.modules.care.api; -import com.nu.entity.CareDirectiveEntity; -import com.nu.entity.CareDirectiveInstantEntity; -import com.nu.entity.CareDirectivePackageEntity; -import com.nu.entity.ElderTagEntity; +import com.nu.entity.*; import java.util.List; import java.util.Map; @@ -22,6 +19,8 @@ public interface ICareDirectivePlanApi { CareDirectiveInstantEntity addInstant(CareDirectiveInstantEntity careDirectiveInstantEntity); void editInstant(CareDirectiveInstantEntity careDirectiveInstantEntity); void deleteInstant(CareDirectiveInstantEntity careDirectiveInstantEntity); + + List queryFuture(CareDirectiveEntity dto); // ElderTagEntity addElderTag(ElderTagEntity elderTagEntity); // void editElderTag(ElderTagEntity elderTagEntity); // void deleteElderTag(ElderTagEntity elderTagEntity); diff --git a/nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/order/api/IDirectiveOrderApi.java b/nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/order/api/IDirectiveOrderApi.java index 8f31a5e1..1ca8d264 100644 --- a/nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/order/api/IDirectiveOrderApi.java +++ b/nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/order/api/IDirectiveOrderApi.java @@ -45,4 +45,8 @@ public interface IDirectiveOrderApi { int queryTodayFinishedTotal(String type,String nuId, String elderId); + List queryHistory(CareDirectiveEntity dto); + + List queryCurrent(CareDirectiveEntity dto); + } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/DirectiveOrderMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/DirectiveOrderMapper.java index eb6992e3..352a3e1b 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/DirectiveOrderMapper.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/DirectiveOrderMapper.java @@ -1,6 +1,9 @@ package com.nu.modules.biz.order.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.nu.entity.CareDirectiveEntity; +import com.nu.entity.DirectiveOrderEntity; +import com.nu.entity.DirectiveOrderSubEntity; import com.nu.modules.biz.order.entity.DirectiveOrder; import org.apache.ibatis.annotations.Param; @@ -30,4 +33,6 @@ public interface DirectiveOrderMapper extends BaseMapper { int queryTodayFinishedTotal(@Param("type") String type, @Param("nuId") String nuId, @Param("elderId") String elderId); + List queryOrderByTimeType(@Param("dto") CareDirectiveEntity dto); + } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/xml/DirectiveOrderMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/xml/DirectiveOrderMapper.xml index 6ec31daa..89593969 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/xml/DirectiveOrderMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/xml/DirectiveOrderMapper.xml @@ -2,6 +2,112 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderPadServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderPadServiceImpl.java index 990f4698..d45e0a5b 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderPadServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderPadServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.nu.entity.CareDirectiveEntity; import com.nu.entity.DirectiveOrderEntity; import com.nu.entity.DirectiveOrderSubEntity; import com.nu.modules.biz.order.entity.DirectiveOrder; @@ -177,6 +178,18 @@ public class DirectiveOrderPadServiceImpl extends ServiceImpl queryHistory(CareDirectiveEntity dto) { + dto.setOrderTimeType("history"); + return baseMapper.queryOrderByTimeType(dto); + } + + @Override + public List queryCurrent(CareDirectiveEntity dto) { + dto.setOrderTimeType("current"); + return baseMapper.queryOrderByTimeType(dto); + } + @Override public Map editSubMp4(DirectiveOrderSubEntity directiveOrderSubEntity) { DirectiveOrderSub directiveOrderSub = new DirectiveOrderSub(); diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/mapper/CareDirectivePlanMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/mapper/CareDirectivePlanMapper.java index fc4b67b4..c9aedd6b 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/mapper/CareDirectivePlanMapper.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/mapper/CareDirectivePlanMapper.java @@ -1,6 +1,9 @@ package com.nu.modules.biz.plan.care.mapper; import java.util.List; + +import com.nu.entity.CareDirectiveEntity; +import com.nu.entity.DirectiveOrderEntity; import com.nu.modules.biz.plan.care.entity.CareDirectivePlan; import com.nu.modules.biz.plan.care.entity.DirectivePackagePlan; import org.apache.ibatis.annotations.Param; @@ -23,4 +26,6 @@ public interface CareDirectivePlanMapper extends BaseMapper { int deleteByIdPhysic(@Param("id") String id); int queryTotal(@Param("nuId") String nuId, @Param("elderId") String elderId); + + List queryFuture( @Param("dto") CareDirectiveEntity dto); } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/mapper/xml/CareDirectivePlanMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/mapper/xml/CareDirectivePlanMapper.xml index 1e126532..68fbd3a1 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/mapper/xml/CareDirectivePlanMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/mapper/xml/CareDirectivePlanMapper.xml @@ -1,6 +1,113 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + delete from nu_biz_nu_care_directive_plan @@ -41,14 +148,11 @@ +