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 031c192f..696d4f76 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 @@ -12,6 +12,7 @@ import com.nu.modules.servicepackage.IDirectivePackageApi; import lombok.extern.slf4j.Slf4j; import org.apache.commons.compress.utils.Lists; import org.apache.commons.lang.StringUtils; +import org.apache.ibatis.annotations.Param; import org.jeecg.common.api.vo.Result; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; @@ -49,9 +50,19 @@ public class CareDirectiveApi { * * @return */ + @GetMapping(value = "/getInstructionTag") + public Result> getInstructionTag() { + return Result.OK(directiveConfigApi.getInstructionTag()); + } + + /** + * 获取服务指令树-配置数据 + * + * @return + */ @GetMapping(value = "/getServiceTree") - public Result> getServiceTree() { - return Result.OK(directiveConfigApi.getServiceTree("1")); + public Result> getServiceTree(@Param("insTag") String insTags) { + return Result.OK(directiveConfigApi.getServiceTree(insTags)); } /** @@ -62,6 +73,11 @@ public class CareDirectiveApi { */ @GetMapping(value = "/getNclist") public Result> getPlanList(CareDirectiveEntity careDirectiveEntity) { + if(StringUtils.isBlank(careDirectiveEntity.getInstructionTagId())){ + Map errorResult = Maps.newHashMap(); + errorResult.put("msg","未知类型"); + return Result.ok(errorResult); + } Map pageList = careDirectivePlanApi.getPlanList(careDirectiveEntity); return Result.OK(pageList); } @@ -126,6 +142,21 @@ public class CareDirectiveApi { return Result.OK("操作成功"); } + /** + * PAD端编排护理流程-删除服务指令集 + * + * @param careDirectiveEntity + * @return + */ + @PostMapping(value = "/deleteDirectiveSet") + public Result deleteDirectiveSet(@RequestBody CareDirectiveEntity careDirectiveEntity) { + if(StringUtils.isBlank(careDirectiveEntity.getPositioning()) || StringUtils.isBlank(careDirectiveEntity.getPositioningLong()) || StringUtils.isBlank(careDirectiveEntity.getInstructionTagId())){ + return Result.error("操作失败"); + } + careDirectivePlanApi.deleteDirectiveSet(careDirectiveEntity); + return Result.OK("操作成功"); + } + /** * 获取护理单元+老人 当天服务指令 *

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 46e491a6..ca1a1954 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 @@ -30,6 +30,8 @@ public class CareDirectiveEntity implements Serializable { private String elderId; /**长者姓名*/ private String elderName; + /**分类标签id*/ + private String instructionTagId; /**服务指令id*/ private String directiveId; /**指令类型ID*/ @@ -83,10 +85,6 @@ public class CareDirectiveEntity implements Serializable { private String queryType; /**长者标签列表**/ private List tagList; - /** - * 1 护理类 2医疗类 3仓库类 5后勤类 - */ - private String instructionTagId; /** * 查询哪些类型 diff --git a/nursing-unit-common/src/main/java/com/nu/entity/DirectiveInstructionTagEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/DirectiveInstructionTagEntity.java new file mode 100644 index 00000000..5d1af6ee --- /dev/null +++ b/nursing-unit-common/src/main/java/com/nu/entity/DirectiveInstructionTagEntity.java @@ -0,0 +1,53 @@ +package com.nu.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.jeecg.common.aspect.annotation.Dict; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; + +/** + * @Description: 服务指令-分类标签 + * @Author: jeecg-boot + * @Date: 2025-07-10 + * @Version: V1.0 + */ +@Data +public class DirectiveInstructionTagEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + private String id; + /**分类标签名称*/ + private String instructionName; + private String instructionType; + /**排序*/ + private Integer sort; + /**状态 0已授权 1未授权*/ + private String status; + /**是否启用 Y启用 N未启用*/ + private String izEnabled; + /**是否删除 0未删除 1删除*/ + private String delFlag; + /**创建人*/ + private String createBy; + /**创建日期*/ + private Date createTime; + /**更新人*/ + private String updateBy; + /**更新日期*/ + private Date updateTime; + /**所属部门*/ + private String sysOrgCode; + private String icon; +} diff --git a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/mapper/xml/ElderInfoMapper.xml b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/mapper/xml/ElderInfoMapper.xml index 9142a43c..01400a88 100644 --- a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/mapper/xml/ElderInfoMapper.xml +++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/mapper/xml/ElderInfoMapper.xml @@ -15,7 +15,7 @@ diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/xml/DirectiveDataPoolMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/xml/DirectiveDataPoolMapper.xml index 185cac76..bc4944ce 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/xml/DirectiveDataPoolMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/xml/DirectiveDataPoolMapper.xml @@ -72,7 +72,7 @@ CREATE TABLE IF NOT EXISTS ${tableName} ( id varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID', pool_type varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '数据池类型 1护理;2医疗:3仓库;4行政', - biz_id varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务指令计划ID,nu_biz_nu_care_directive_plan.id;即时指令计划ID,nu_biz_nu_care_directive_plan_instant.id', + biz_id varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务指令计划ID,nu_biz_directive_plan.id;即时指令计划ID,nu_biz_nu_care_directive_plan_instant.id', nu_id varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '护理单元ID，nu_base_info.id', directive_id varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务指令ID，nu_config_service_directive.id', cycle_type_id varchar(3) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '指令类型ID', diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderServiceImpl.java index de31c2ed..ce6c3fd9 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderServiceImpl.java @@ -721,7 +721,7 @@ public class DirectiveOrderServiceImpl extends ServiceImpl { List queryFuture( @Param("dto") CareDirectiveEntity dto); + int deleteDirectiveSet(@Param("dto") CareDirectiveEntity careDirectiveEntity); } 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 fafec6c1..243fbef4 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 @@ -103,13 +103,21 @@ delete - from nu_biz_nu_care_directive_plan + from nu_biz_directive_plan where id = #{id} + + delete + from nu_biz_directive_plan + where positioning = #{dto.positioning} + and positioning_long = #{dto.positioningLong} + and instruction_tag_id = #{dto.instructionTagId} + +