yangjun
/
nursing_unit_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

护嘱类服务指令配置更改路径

This commit is contained in:
曹磊 2025-11-28 16:32:26 +08:00
parent f34560c912
commit c616ee96b9
36 changed files with 277 additions and 254 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nursing-unit-api/src/main/java/com/nu/modules/pad/instruction/care/CareDirectiveApi.java
View File

@ -4,7 +4,7 @@ import com.nu.entity.CareDirectiveEntity;
import com.nu.entity.CareDirectiveInstantEntity;
import com.nu.entity.CareDirectivePackageEntity;
import com.nu.entity.ElderTagEntity;
import com.nu.modules.care.api.ICareDirectiveConfigApi;
import com.nu.modules.care.api.IDirectiveConfigApi;
import com.nu.modules.care.api.ICareDirectivePlanApi;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
@ -27,19 +27,19 @@ import java.util.Map;
public class CareDirectiveApi {
@Autowired
private ICareDirectiveConfigApi careDirectiveConfigApi;
private IDirectiveConfigApi directiveConfigApi;
@Autowired
private ICareDirectivePlanApi careDirectivePlanApi;
/**
* 获取护理类服务器指令树-配置数据
* 获取护理类服务指令树-配置数据
*
* @return
*/
@GetMapping(value = "/getServiceTree")
public Result<List<Map<String,Object>>> getServiceTree() {
List<Map<String,Object>> treeList = careDirectiveConfigApi.getServiceTree();
List<Map<String,Object>> treeList = directiveConfigApi.getServiceTree("1");
return Result.OK(treeList);
}

39
nursing-unit-api/src/main/java/com/nu/modules/pad/instruction/logistics/LogisticsDirectiveApi.java Normal file
View File

@ -0,0 +1,39 @@
package com.nu.modules.pad.instruction.logistics;
import com.nu.modules.care.api.IDirectiveConfigApi;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
/**
* @Description: 后勤类服务指令API
* @Author: caolei
* @Date: 2025-11-28
* @Version: V1.0
*/
@RestController
@RequestMapping("/api/pad/logistics/directive")
@Slf4j
public class LogisticsDirectiveApi {
@Autowired
private IDirectiveConfigApi directiveConfigApi;
/**
* 获取后勤类服务指令树-配置数据
*
* @return
*/
@GetMapping(value = "/getServiceTree")
public Result<List<Map<String,Object>>> getServiceTree() {
List<Map<String,Object>> treeList = directiveConfigApi.getServiceTree("3");
return Result.OK(treeList);
}
}

8
nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/care/api/ICareDirectiveConfigApi.java
View File

@ -1,8 +0,0 @@
package com.nu.modules.care.api;
import java.util.List;
import java.util.Map;
public interface ICareDirectiveConfigApi {
List<Map<String, Object>> getServiceTree();
}

8
nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/care/api/IDirectiveConfigApi.java Normal file
View File

@ -0,0 +1,8 @@
package com.nu.modules.care.api;
import java.util.List;
import java.util.Map;
public interface IDirectiveConfigApi {
List<Map<String, Object>> getServiceTree(String instructionType);
}

14
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/mapper/CareConfigServiceCategoryMapper.java
View File

@ -1,14 +0,0 @@
package com.nu.modules.biz.care.config.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.nu.modules.biz.care.config.entity.CareConfigServiceCategory;
/**
* @Description: 服务类别
* @Author: yangjun
* @Date: 2025-03-28
* @Version: V1.0
*/
public interface CareConfigServiceCategoryMapper extends BaseMapper<CareConfigServiceCategory> {
}

14
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/mapper/CareConfigServiceDirectiveMapper.java
View File

@ -1,14 +0,0 @@
package com.nu.modules.biz.care.config.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.nu.modules.biz.care.config.entity.CareConfigServiceDirective;
/**
* @Description: 服务指令
* @Author: yangjun
* @Date: 2025-03-28
* @Version: V1.0
*/
public interface CareConfigServiceDirectiveMapper extends BaseMapper<CareConfigServiceDirective> {
}

14
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/mapper/CareConfigServiceTypeMapper.java
View File

@ -1,14 +0,0 @@
package com.nu.modules.biz.care.config.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.nu.modules.biz.care.config.entity.CareConfigServiceType;
/**
* @Description: 服务类型
* @Author: yangjun
* @Date: 2025-03-28
* @Version: V1.0
*/
public interface CareConfigServiceTypeMapper extends BaseMapper<CareConfigServiceType> {
}

14
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/mapper/CareInstructionTagMapper.java
View File

@ -1,14 +0,0 @@
package com.nu.modules.biz.care.config.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.nu.modules.biz.care.config.entity.CareInstructionTag;
/**
* @Description: 分类标签
* @Author: caolei
* @Date: 2025-10-11
* @Version: V1.0
*/
public interface CareInstructionTagMapper extends BaseMapper<CareInstructionTag> {
}

14
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/service/ICareConfigServiceCategoryService.java
View File

@ -1,14 +0,0 @@
package com.nu.modules.biz.care.config.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.nu.modules.biz.care.config.entity.CareConfigServiceCategory;
/**
* @Description: 服务类别
* @Author: yangjun
* @Date: 2025-03-28
* @Version: V1.0
*/
public interface ICareConfigServiceCategoryService extends IService<CareConfigServiceCategory> {
}

14
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/service/ICareConfigServiceDirectiveService.java
View File

@ -1,14 +0,0 @@
package com.nu.modules.biz.care.config.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.nu.modules.biz.care.config.entity.CareConfigServiceDirective;
/**
* @Description: 服务指令
* @Author: yangjun
* @Date: 2025-03-28
* @Version: V1.0
*/
public interface ICareConfigServiceDirectiveService extends IService<CareConfigServiceDirective> {
}

14
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/service/ICareConfigServiceTypeService.java
View File

@ -1,14 +0,0 @@
package com.nu.modules.biz.care.config.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.nu.modules.biz.care.config.entity.CareConfigServiceType;
/**
* @Description: 服务类型
* @Author: yangjun
* @Date: 2025-03-28
* @Version: V1.0
*/
public interface ICareConfigServiceTypeService extends IService<CareConfigServiceType> {
}

14
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/service/ICareInstructionTagService.java
View File

@ -1,14 +0,0 @@
package com.nu.modules.biz.care.config.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.nu.modules.biz.care.config.entity.CareInstructionTag;
/**
* @Description: 分类标签
* @Author: caolei
* @Date: 2025-10-11
* @Version: V1.0
*/
public interface ICareInstructionTagService extends IService<CareInstructionTag> {
}

18
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/service/impl/CareConfigServiceDirectiveServiceImpl.java
View File

@ -1,18 +0,0 @@
package com.nu.modules.biz.care.config.service.impl;
import com.nu.modules.biz.care.config.entity.CareConfigServiceDirective;
import com.nu.modules.biz.care.config.mapper.CareConfigServiceDirectiveMapper;
import com.nu.modules.biz.care.config.service.ICareConfigServiceDirectiveService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 服务指令
* @Author: yangjun
* @Date: 2025-03-28
* @Version: V1.0
*/
@Service
public class CareConfigServiceDirectiveServiceImpl extends ServiceImpl<CareConfigServiceDirectiveMapper, CareConfigServiceDirective> implements ICareConfigServiceDirectiveService {
}

19
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/service/impl/CareConfigServiceTypeServiceImpl.java
View File

@ -1,19 +0,0 @@
package com.nu.modules.biz.care.config.service.impl;
import com.nu.modules.biz.care.config.entity.CareConfigServiceType;
import com.nu.modules.biz.care.config.mapper.CareConfigServiceTypeMapper;
import com.nu.modules.biz.care.config.service.ICareConfigServiceTypeService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 服务类型
* @Author: yangjun
* @Date: 2025-03-28
* @Version: V1.0
*/
@Service
public class CareConfigServiceTypeServiceImpl extends ServiceImpl<CareConfigServiceTypeMapper, CareConfigServiceType> implements ICareConfigServiceTypeService {
}

18
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/service/impl/CareInstructionTagServiceImpl.java
View File

@ -1,18 +0,0 @@
package com.nu.modules.biz.care.config.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.nu.modules.biz.care.config.entity.CareInstructionTag;
import com.nu.modules.biz.care.config.mapper.CareInstructionTagMapper;
import com.nu.modules.biz.care.config.service.ICareInstructionTagService;
import org.springframework.stereotype.Service;
/**
* @Description: 分类标签
* @Author: caolei
* @Date: 2025-10-11
* @Version: V1.0
*/
@Service
public class CareInstructionTagServiceImpl extends ServiceImpl<CareInstructionTagMapper, CareInstructionTag> implements ICareInstructionTagService {
}

30
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/service/impl/PlanBizNuCustomerServerServiceImpl.java
View File

@ -9,12 +9,12 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.nu.entity.CareDirectiveEntity;
import com.nu.modules.biz.care.config.entity.CareConfigServiceCategory;
import com.nu.modules.biz.care.config.entity.CareConfigServiceDirective;
import com.nu.modules.biz.care.config.entity.CareConfigServiceType;
import com.nu.modules.biz.care.config.service.ICareConfigServiceCategoryService;
import com.nu.modules.biz.care.config.service.ICareConfigServiceDirectiveService;
import com.nu.modules.biz.care.config.service.ICareConfigServiceTypeService;
import com.nu.modules.biz.common.entity.ConfigServiceCategory;
import com.nu.modules.biz.common.entity.ConfigServiceDirective;
import com.nu.modules.biz.common.entity.ConfigServiceType;
import com.nu.modules.biz.common.service.IConfigServiceCategoryService;
import com.nu.modules.biz.common.service.IConfigServiceDirectiveService;
import com.nu.modules.biz.common.service.IConfigServiceTypeService;
import com.nu.modules.biz.care.datapool.service.impl.DataPoolServiceImpl;
import com.nu.modules.biz.care.plan.entity.PlanBizNuCustomerElderTag;
import com.nu.modules.biz.care.plan.entity.PlanBizNuCustomerServer;
@ -42,11 +42,11 @@ import java.util.*;
public class PlanBizNuCustomerServerServiceImpl extends ServiceImpl<PlanBizNuCustomerServerMapper, PlanBizNuCustomerServer> implements IPlanBizNuCustomerServerService, ICareDirectivePlanApi {
@Autowired
private ICareConfigServiceCategoryService careConfigServiceCategoryService;
private IConfigServiceCategoryService careConfigServiceCategoryService;
@Autowired
private ICareConfigServiceTypeService careConfigServiceTypeService;
private IConfigServiceTypeService careConfigServiceTypeService;
@Autowired
private ICareConfigServiceDirectiveService careConfigServiceDirectiveService;
private IConfigServiceDirectiveService careConfigServiceDirectiveService;
@Autowired
private IPlanBizNuCustomerServerInstantService planBizNuCustomerServerInstantService;
@Autowired
@ -234,9 +234,9 @@ public class PlanBizNuCustomerServerServiceImpl extends ServiceImpl<PlanBizNuCus
public CareDirectiveEntity addNuCustomerServer(CareDirectiveEntity careDirectiveEntity) {
PlanBizNuCustomerServer planBizNuCustomerServer = new PlanBizNuCustomerServer();
BeanUtils.copyProperties(careDirectiveEntity, planBizNuCustomerServer);
CareConfigServiceDirective careConfigServiceDirective = careConfigServiceDirectiveService.getById(planBizNuCustomerServer.getDirectiveId());
CareConfigServiceCategory careConfigServiceCategory = careConfigServiceCategoryService.getById(careConfigServiceDirective.getCategoryId());
CareConfigServiceType careConfigServiceType = careConfigServiceTypeService.getById(careConfigServiceDirective.getTypeId());
ConfigServiceDirective careConfigServiceDirective = careConfigServiceDirectiveService.getById(planBizNuCustomerServer.getDirectiveId());
ConfigServiceCategory careConfigServiceCategory = careConfigServiceCategoryService.getById(careConfigServiceDirective.getCategoryId());
ConfigServiceType careConfigServiceType = careConfigServiceTypeService.getById(careConfigServiceDirective.getTypeId());
planBizNuCustomerServer.setCategoryId(careConfigServiceCategory.getId());
planBizNuCustomerServer.setCategoryName(careConfigServiceCategory.getCategoryName());
planBizNuCustomerServer.setTypeId(careConfigServiceType.getId());
@ -250,9 +250,9 @@ public class PlanBizNuCustomerServerServiceImpl extends ServiceImpl<PlanBizNuCus
public CareDirectiveEntity editNuCustomerServer(CareDirectiveEntity careDirectiveEntity) {
PlanBizNuCustomerServer planBizNuCustomerServer = new PlanBizNuCustomerServer();
BeanUtils.copyProperties(careDirectiveEntity, planBizNuCustomerServer);
CareConfigServiceDirective careConfigServiceDirective = careConfigServiceDirectiveService.getById(planBizNuCustomerServer.getDirectiveId());
CareConfigServiceCategory careConfigServiceCategory = careConfigServiceCategoryService.getById(careConfigServiceDirective.getCategoryId());
CareConfigServiceType careConfigServiceType = careConfigServiceTypeService.getById(careConfigServiceDirective.getTypeId());
ConfigServiceDirective careConfigServiceDirective = careConfigServiceDirectiveService.getById(planBizNuCustomerServer.getDirectiveId());
ConfigServiceCategory careConfigServiceCategory = careConfigServiceCategoryService.getById(careConfigServiceDirective.getCategoryId());
ConfigServiceType careConfigServiceType = careConfigServiceTypeService.getById(careConfigServiceDirective.getTypeId());
planBizNuCustomerServer.setCategoryId(careConfigServiceCategory.getId());
planBizNuCustomerServer.setCategoryName(careConfigServiceCategory.getCategoryName());
planBizNuCustomerServer.setTypeId(careConfigServiceType.getId());

5
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/entity/CareInstructionTag.java → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/entity/ConfigInstructionTag.java
View File

@ -1,11 +1,10 @@
package com.nu.modules.biz.care.config.entity;
package com.nu.modules.biz.common.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.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ -27,7 +26,7 @@ import java.util.Date;
@TableName("nu_config_service_instruction_tag")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
public class CareInstructionTag implements Serializable {
public class ConfigInstructionTag implements Serializable {
private static final long serialVersionUID = 1L;
/**id*/

11
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/entity/CareConfigServiceCategory.java → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/entity/ConfigServiceCategory.java
View File

@ -1,21 +1,16 @@
package com.nu.modules.biz.care.config.entity;
package com.nu.modules.biz.common.entity;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableLogic;
import org.jeecg.common.constant.ProvinceCityArea;
import org.jeecg.common.util.SpringContextUtils;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
@ -30,7 +25,7 @@ import lombok.experimental.Accessors;
@TableName("nu_config_service_category")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
public class CareConfigServiceCategory implements Serializable {
public class ConfigServiceCategory implements Serializable {
private static final long serialVersionUID = 1L;
/**id*/

9
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/entity/CareConfigServiceDirective.java → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/entity/ConfigServiceDirective.java
View File

@ -1,19 +1,14 @@
package com.nu.modules.biz.care.config.entity;
package com.nu.modules.biz.common.entity;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.*;
import org.jeecg.common.constant.ProvinceCityArea;
import org.jeecg.common.util.SpringContextUtils;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
@ -28,7 +23,7 @@ import lombok.experimental.Accessors;
@TableName("nu_config_service_directive")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
public class CareConfigServiceDirective implements Serializable {
public class ConfigServiceDirective implements Serializable {
private static final long serialVersionUID = 1L;
/**id*/

11
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/entity/CareConfigServiceType.java → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/entity/ConfigServiceType.java
View File

@ -1,21 +1,16 @@
package com.nu.modules.biz.care.config.entity;
package com.nu.modules.biz.common.entity;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableLogic;
import org.jeecg.common.constant.ProvinceCityArea;
import org.jeecg.common.util.SpringContextUtils;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
@ -30,7 +25,7 @@ import lombok.experimental.Accessors;
@TableName("nu_config_service_type")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
public class CareConfigServiceType implements Serializable {
public class ConfigServiceType implements Serializable {
private static final long serialVersionUID = 1L;
/**id*/

14
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/ConfigInstructionTagMapper.java Normal file
View File

@ -0,0 +1,14 @@
package com.nu.modules.biz.common.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.nu.modules.biz.common.entity.ConfigInstructionTag;
/**
* @Description: 分类标签
* @Author: caolei
* @Date: 2025-10-11
* @Version: V1.0
*/
public interface ConfigInstructionTagMapper extends BaseMapper<ConfigInstructionTag> {
}

14
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/ConfigServiceCategoryMapper.java Normal file
View File

@ -0,0 +1,14 @@
package com.nu.modules.biz.common.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.nu.modules.biz.common.entity.ConfigServiceCategory;
/**
* @Description: 服务类别
* @Author: yangjun
* @Date: 2025-03-28
* @Version: V1.0
*/
public interface ConfigServiceCategoryMapper extends BaseMapper<ConfigServiceCategory> {
}

14
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/ConfigServiceDirectiveMapper.java Normal file
View File

@ -0,0 +1,14 @@
package com.nu.modules.biz.common.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.nu.modules.biz.common.entity.ConfigServiceDirective;
/**
* @Description: 服务指令
* @Author: yangjun
* @Date: 2025-03-28
* @Version: V1.0
*/
public interface ConfigServiceDirectiveMapper extends BaseMapper<ConfigServiceDirective> {
}

14
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/ConfigServiceTypeMapper.java Normal file
View File

@ -0,0 +1,14 @@
package com.nu.modules.biz.common.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.nu.modules.biz.common.entity.ConfigServiceType;
/**
* @Description: 服务类型
* @Author: yangjun
* @Date: 2025-03-28
* @Version: V1.0
*/
public interface ConfigServiceTypeMapper extends BaseMapper<ConfigServiceType> {
}

2
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/mapper/xml/CareInstructionTagMapper.xml → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/xml/ConfigInstructionTagMapper.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.nu.modules.biz.care.config.mapper.CareInstructionTagMapper">
<mapper namespace="com.nu.modules.biz.common.mapper.ConfigInstructionTagMapper">
</mapper>

2
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/mapper/xml/CareConfigServiceTypeMapper.xml → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/xml/ConfigServiceCategoryMapper.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.nu.modules.biz.care.config.mapper.CareConfigServiceTypeMapper">
<mapper namespace="com.nu.modules.biz.common.mapper.ConfigServiceCategoryMapper">
</mapper>

4
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/mapper/xml/CareConfigServiceDirectiveMapper.xml → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/xml/ConfigServiceDirectiveMapper.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.nu.modules.biz.care.config.mapper.CareConfigServiceDirectiveMapper">
<mapper namespace="com.nu.modules.biz.common.mapper.ConfigServiceDirectiveMapper">
<select id="selectList" resultType="com.nu.modules.biz.care.config.entity.CareConfigServiceDirective">
<select id="selectList" resultType="com.nu.modules.biz.common.entity.ConfigServiceDirective">
select * from (
SELECT csd.id AS id,
csd.directive_name,

2
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/mapper/xml/CareConfigServiceCategoryMapper.xml → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/xml/ConfigServiceTypeMapper.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.nu.modules.biz.care.config.mapper.CareConfigServiceCategoryMapper">
<mapper namespace="com.nu.modules.biz.common.mapper.ConfigServiceTypeMapper">
</mapper>

14
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/IConfigInstructionTagService.java Normal file
View File

@ -0,0 +1,14 @@
package com.nu.modules.biz.common.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.nu.modules.biz.common.entity.ConfigInstructionTag;
/**
* @Description: 分类标签
* @Author: caolei
* @Date: 2025-10-11
* @Version: V1.0
*/
public interface IConfigInstructionTagService extends IService<ConfigInstructionTag> {
}

14
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/IConfigServiceCategoryService.java Normal file
View File

@ -0,0 +1,14 @@
package com.nu.modules.biz.common.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.nu.modules.biz.common.entity.ConfigServiceCategory;
/**
* @Description: 服务类别
* @Author: yangjun
* @Date: 2025-03-28
* @Version: V1.0
*/
public interface IConfigServiceCategoryService extends IService<ConfigServiceCategory> {
}

14
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/IConfigServiceDirectiveService.java Normal file
View File

@ -0,0 +1,14 @@
package com.nu.modules.biz.common.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.nu.modules.biz.common.entity.ConfigServiceDirective;
/**
* @Description: 服务指令
* @Author: yangjun
* @Date: 2025-03-28
* @Version: V1.0
*/
public interface IConfigServiceDirectiveService extends IService<ConfigServiceDirective> {
}

14
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/IConfigServiceTypeService.java Normal file
View File

@ -0,0 +1,14 @@
package com.nu.modules.biz.common.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.nu.modules.biz.common.entity.ConfigServiceType;
/**
* @Description: 服务类型
* @Author: yangjun
* @Date: 2025-03-28
* @Version: V1.0
*/
public interface IConfigServiceTypeService extends IService<ConfigServiceType> {
}

18
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/impl/ConfigInstructionTagServiceImpl.java Normal file
View File

@ -0,0 +1,18 @@
package com.nu.modules.biz.common.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.nu.modules.biz.common.entity.ConfigInstructionTag;
import com.nu.modules.biz.common.mapper.ConfigInstructionTagMapper;
import com.nu.modules.biz.common.service.IConfigInstructionTagService;
import org.springframework.stereotype.Service;
/**
* @Description: 分类标签
* @Author: caolei
* @Date: 2025-10-11
* @Version: V1.0
*/
@Service
public class ConfigInstructionTagServiceImpl extends ServiceImpl<ConfigInstructionTagMapper, ConfigInstructionTag> implements IConfigInstructionTagService {
}

58
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/service/impl/CareConfigServiceCategoryServiceImpl.java → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/impl/ConfigServiceCategoryServiceImpl.java
View File

@ -1,18 +1,18 @@
package com.nu.modules.biz.care.config.service.impl;
package com.nu.modules.biz.common.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.nu.modules.biz.care.config.entity.CareConfigServiceCategory;
import com.nu.modules.biz.care.config.entity.CareConfigServiceDirective;
import com.nu.modules.biz.care.config.entity.CareConfigServiceType;
import com.nu.modules.biz.care.config.entity.CareInstructionTag;
import com.nu.modules.biz.care.config.mapper.CareConfigServiceCategoryMapper;
import com.nu.modules.biz.care.config.service.ICareConfigServiceCategoryService;
import com.nu.modules.biz.care.config.service.ICareConfigServiceDirectiveService;
import com.nu.modules.biz.care.config.service.ICareConfigServiceTypeService;
import com.nu.modules.biz.care.config.service.ICareInstructionTagService;
import com.nu.modules.care.api.ICareDirectiveConfigApi;
import com.nu.modules.biz.common.entity.ConfigServiceCategory;
import com.nu.modules.biz.common.entity.ConfigServiceDirective;
import com.nu.modules.biz.common.entity.ConfigServiceType;
import com.nu.modules.biz.common.entity.ConfigInstructionTag;
import com.nu.modules.biz.common.mapper.ConfigServiceCategoryMapper;
import com.nu.modules.biz.common.service.IConfigServiceCategoryService;
import com.nu.modules.biz.common.service.IConfigServiceDirectiveService;
import com.nu.modules.biz.common.service.IConfigServiceTypeService;
import com.nu.modules.biz.common.service.IConfigInstructionTagService;
import com.nu.modules.care.api.IDirectiveConfigApi;
import com.nu.modules.sysconfig.ISysConfigApi;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@ -30,55 +30,55 @@ import java.util.Map;
* @Version: V1.0
*/
@Service
public class CareConfigServiceCategoryServiceImpl extends ServiceImpl<CareConfigServiceCategoryMapper, CareConfigServiceCategory> implements ICareConfigServiceCategoryService, ICareDirectiveConfigApi {
public class ConfigServiceCategoryServiceImpl extends ServiceImpl<ConfigServiceCategoryMapper, ConfigServiceCategory> implements IConfigServiceCategoryService, IDirectiveConfigApi {
@Autowired
private ICareInstructionTagService instructionTagService;
private IConfigInstructionTagService instructionTagService;
@Autowired
private ICareConfigServiceTypeService configServiceTypeService;
private IConfigServiceTypeService configServiceTypeService;
@Autowired
private ICareConfigServiceDirectiveService configServiceDirectiveService;
private IConfigServiceDirectiveService configServiceDirectiveService;
@Autowired
private ISysConfigApi sysConfigApi;
@Override
public List<Map<String, Object>> getServiceTree() {
public List<Map<String, Object>> getServiceTree(String instructionType) {
//缓存媒体地址
String mediaAddress = getOpeMediaAddress();
//查询护理类服务
QueryWrapper<CareInstructionTag> instructionTagQueryWrapper = new QueryWrapper<>();
QueryWrapper<ConfigInstructionTag> instructionTagQueryWrapper = new QueryWrapper<>();
instructionTagQueryWrapper.eq("iz_enabled", "Y");
instructionTagQueryWrapper.eq("del_flag", "0");
instructionTagQueryWrapper.eq("instruction_type", "1");
List<CareInstructionTag> instructionTagList = instructionTagService.list(instructionTagQueryWrapper);
instructionTagQueryWrapper.eq("instruction_type", instructionType);
List<ConfigInstructionTag> instructionTagList = instructionTagService.list(instructionTagQueryWrapper);
Map<String, Object> tagMap = new HashMap<String, Object>();
for (CareInstructionTag par : instructionTagList) {
for (ConfigInstructionTag par : instructionTagList) {
tagMap.put(par.getId(), par.getInstructionName());
}
//查询服务类别数据
QueryWrapper<CareConfigServiceCategory> categoryQueryWrapper = new QueryWrapper<>();
QueryWrapper<ConfigServiceCategory> categoryQueryWrapper = new QueryWrapper<>();
categoryQueryWrapper.eq("iz_enabled", "Y");
categoryQueryWrapper.eq("del_flag", "0");
List<CareConfigServiceCategory> categoryList = baseMapper.selectList(categoryQueryWrapper);
List<ConfigServiceCategory> categoryList = baseMapper.selectList(categoryQueryWrapper);
//查询服务类型数据
QueryWrapper<CareConfigServiceType> typeQueryWrapper = new QueryWrapper<>();
QueryWrapper<ConfigServiceType> typeQueryWrapper = new QueryWrapper<>();
typeQueryWrapper.eq("iz_enabled", "Y");
typeQueryWrapper.eq("del_flag", "0");
List<CareConfigServiceType> typeList = configServiceTypeService.list(typeQueryWrapper);
List<ConfigServiceType> typeList = configServiceTypeService.list(typeQueryWrapper);
//查询服务指令数据
QueryWrapper<CareConfigServiceDirective> directiveQueryWrapper = new QueryWrapper<>();
QueryWrapper<ConfigServiceDirective> directiveQueryWrapper = new QueryWrapper<>();
directiveQueryWrapper.eq("iz_enabled", "Y");
directiveQueryWrapper.eq("del_flag", "0");
List<CareConfigServiceDirective> directiveList = configServiceDirectiveService.list(directiveQueryWrapper);
List<ConfigServiceDirective> directiveList = configServiceDirectiveService.list(directiveQueryWrapper);
//封装服务指令和服务类型tree集合
List<Map<String, Object>> typeMapList = new ArrayList<>();
for (CareConfigServiceType par : typeList) {
for (ConfigServiceType par : typeList) {
Map<String, Object> wllxMap = new HashMap<String, Object>();
List<Map<String, Object>> directiceMapList = new ArrayList<Map<String, Object>>();
for (CareConfigServiceDirective directicePar : directiveList) {
for (ConfigServiceDirective directicePar : directiveList) {
if (StringUtils.equals(directicePar.getTypeId(), par.getId())) {
Map<String, Object> directiceMap = new HashMap<String, Object>();
directiceMap.put("id", directicePar.getId());
@ -161,7 +161,7 @@ public class CareConfigServiceCategoryServiceImpl extends ServiceImpl<CareConfig
//封装服务类别服务类型tree集合
List<Map<String, Object>> treeList = new ArrayList<>();
int index = 0;
for (CareConfigServiceCategory par : categoryList) {
for (ConfigServiceCategory par : categoryList) {
index++;
Map<String, Object> infoMap = new HashMap<String, Object>();
List<Map<String, Object>> wllxMap2List = new ArrayList<Map<String, Object>>();

18
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/impl/ConfigServiceDirectiveServiceImpl.java Normal file
View File

@ -0,0 +1,18 @@
package com.nu.modules.biz.common.service.impl;
import com.nu.modules.biz.common.entity.ConfigServiceDirective;
import com.nu.modules.biz.common.mapper.ConfigServiceDirectiveMapper;
import com.nu.modules.biz.common.service.IConfigServiceDirectiveService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 服务指令
* @Author: yangjun
* @Date: 2025-03-28
* @Version: V1.0
*/
@Service
public class ConfigServiceDirectiveServiceImpl extends ServiceImpl<ConfigServiceDirectiveMapper, ConfigServiceDirective> implements IConfigServiceDirectiveService {
}

19
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/impl/ConfigServiceTypeServiceImpl.java Normal file
View File

@ -0,0 +1,19 @@
package com.nu.modules.biz.common.service.impl;
import com.nu.modules.biz.common.entity.ConfigServiceType;
import com.nu.modules.biz.common.mapper.ConfigServiceTypeMapper;
import com.nu.modules.biz.common.service.IConfigServiceTypeService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 服务类型
* @Author: yangjun
* @Date: 2025-03-28
* @Version: V1.0
*/
@Service
public class ConfigServiceTypeServiceImpl extends ServiceImpl<ConfigServiceTypeMapper, ConfigServiceType> implements IConfigServiceTypeService {
}