From b5bcecc194d460bb887c65ac508524046ea25f6b Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Wed, 7 Jan 2026 15:24:40 +0800 Subject: [PATCH] =?UTF-8?q?pad=E6=96=B0=E5=A2=9E=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=EF=BC=9A=E6=9F=A5=E8=AF=A2=E6=8A=A4=E7=90=86=E5=8D=95=E5=85=83?= =?UTF-8?q?=E4=B8=8B=E9=95=BF=E8=80=85=E5=B8=B8=E7=94=A8=E6=8A=A4=E7=90=86?= =?UTF-8?q?=E7=B1=BB=E3=80=81=E8=A1=8C=E6=94=BF=E7=B1=BB=E3=80=81=E4=BB=93?= =?UTF-8?q?=E5=BA=93=E7=B1=BB=E5=8D=B3=E6=97=B6=E6=8C=87=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DirectivePlanInstantController.java | 82 +++++++++++++++++++ .../CareDirectivePlanInstantMapper.java | 3 +- .../xml/CareDirectivePlanInstantMapper.xml | 4 +- .../ICareDirectivePlanInstantService.java | 1 + .../CareDirectivePlanInstantServiceImpl.java | 3 +- 5 files changed, 90 insertions(+), 3 deletions(-) create mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/controller/DirectivePlanInstantController.java diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/controller/DirectivePlanInstantController.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/controller/DirectivePlanInstantController.java new file mode 100644 index 00000000..182dfd9c --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/controller/DirectivePlanInstantController.java @@ -0,0 +1,82 @@ +package com.nu.modules.biz.plan.care.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.beust.jcommander.internal.Maps; +import com.nu.modules.biz.plan.care.entity.CareDirectivePlanInstant; +import com.nu.modules.biz.plan.care.service.ICareDirectivePlanInstantService; +import com.nu.modules.biz.plan.invoicing.entity.InvoicingDirectivePlanInstant; +import com.nu.modules.biz.plan.invoicing.service.IInvoicingDirectivePlanInstantService; +import com.nu.modules.biz.plan.logistics.entity.LogisticsDirectivePlanInstant; +import com.nu.modules.biz.plan.logistics.service.LogisticsDirectivePlanInstantService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.system.base.controller.JeecgController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +/** + * @Description: 长者常用即时指令 + * @Author: 张明远 + * @Date: 2025-03-13 + * @Version: V1.0 + */ +@Api(tags = "长者常用即时指令") +@RestController +@RequestMapping("/services/directivePlanInstant") +@Slf4j +public class DirectivePlanInstantController extends JeecgController { + + @Autowired + private ICareDirectivePlanInstantService careDirectivePlanInstantService; + @Autowired + private IInvoicingDirectivePlanInstantService invoicingDirectivePlanInstantService; + @Autowired + private LogisticsDirectivePlanInstantService logisticsDirectivePlanInstantService; + + /** + * 查询长者常用即时指令 按照 分类标签分类后数据 + * + * @return + */ + @ApiOperation(value = "查询长者常用即时指令，按照分类标签分类后数据", notes = "查询长者常用即时指令，按照分类标签分类后数据") + @GetMapping(value = "/queryAll") + public Result> queryAll(@RequestParam("nuId") String nuId, @RequestParam("elderId") String elderId) { + Map result = Maps.newHashMap(); + + //护理类即时指令 + QueryWrapper careQW = new QueryWrapper<>(); + careQW.eq("nu_id", nuId); + careQW.eq("elder_id", elderId); + List careList = careDirectivePlanInstantService.list(careQW); + result.put("care", careList); + + //医疗类即时指令 + //TODO 待完成 现在没有表 +// result.put("invoicing", careList); + + //仓库类即时指令 + QueryWrapper invoicingQW = new QueryWrapper<>(); + invoicingQW.eq("nu_id", nuId); + List invoicingList = invoicingDirectivePlanInstantService.list(invoicingQW); + result.put("invoicing", invoicingList); + + //行政类即时指令 + QueryWrapper logisticsQW = new QueryWrapper<>(); + logisticsQW.eq("nu_id", nuId); + logisticsQW.eq("elder_id", elderId); + List logisticsList = logisticsDirectivePlanInstantService.list(logisticsQW); + result.put("logistics", logisticsList); + + + return Result.OK(result); + } + +} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/mapper/CareDirectivePlanInstantMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/mapper/CareDirectivePlanInstantMapper.java index 457f4406..fe14558a 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/mapper/CareDirectivePlanInstantMapper.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/mapper/CareDirectivePlanInstantMapper.java @@ -7,9 +7,10 @@ import org.apache.ibatis.annotations.Param; /** * @Description: 护理单元客户配置服务指令即时指令 * @Author: caolei - * @Date: 2025-10-13 + * @Date: 2025-10-13 * @Version: V1.0 */ public interface CareDirectivePlanInstantMapper extends BaseMapper { int deleteByIdPhysic(@Param("id") String id); + } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/mapper/xml/CareDirectivePlanInstantMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/mapper/xml/CareDirectivePlanInstantMapper.xml index 75829ad5..3949a025 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/mapper/xml/CareDirectivePlanInstantMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/mapper/xml/CareDirectivePlanInstantMapper.xml @@ -3,6 +3,8 @@ - delete from nu_biz_nu_care_directive_plan_instant where id = #{id} + delete + from nu_biz_nu_care_directive_plan_instant + where id = #{id} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/service/ICareDirectivePlanInstantService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/service/ICareDirectivePlanInstantService.java index 88eb006d..83ab8a33 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/service/ICareDirectivePlanInstantService.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/service/ICareDirectivePlanInstantService.java @@ -12,4 +12,5 @@ import com.nu.modules.biz.plan.care.entity.CareDirectivePlanInstant; public interface ICareDirectivePlanInstantService extends IService { int deleteByIdPhysic(String id); + } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/service/impl/CareDirectivePlanInstantServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/service/impl/CareDirectivePlanInstantServiceImpl.java index b7d8425c..697be993 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/service/impl/CareDirectivePlanInstantServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/service/impl/CareDirectivePlanInstantServiceImpl.java @@ -9,7 +9,7 @@ import org.springframework.stereotype.Service; /** * @Description: 护理单元客户配置服务指令即时指令 * @Author: caolei - * @Date: 2025-10-13 + * @Date: 2025-10-13 * @Version: V1.0 */ @Service @@ -19,4 +19,5 @@ public class CareDirectivePlanInstantServiceImpl extends ServiceImpl