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

护嘱类服务指令配置、计划、数据源、工单更改路径

This commit is contained in:
曹磊 2025-11-27 16:18:26 +08:00
parent ebaba471bf
commit c33c50a8f2
170 changed files with 1864 additions and 1871 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nursing-unit-api/pom.xml
View File

@ -63,5 +63,11 @@
<version>2.0.0</version> <version>2.0.0</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency>
<groupId>com.nursingunit.boot</groupId>
<artifactId>nu-services-local-api</artifactId>
<version>2.0.0</version>
<scope>compile</scope>
</dependency>
</dependencies> </dependencies>
</project> </project>

263
nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/controller/NuBizNuCustomerServerController.java
View File

@ -1,263 +0,0 @@
package com.nu.modules.NuBizNuCustomerServer.controller;
import com.nu.modules.NuBizNuCustomerServer.entity.DirectivePackageDto;
import com.nu.modules.NuBizNuCustomerServer.entity.NuBizNuCustomerElderTag;
import com.nu.modules.NuBizNuCustomerServer.entity.NuBizNuCustomerServer;
import com.nu.modules.NuBizNuCustomerServer.entity.NuBizNuCustomerServerInstant;
import com.nu.modules.NuBizNuCustomerServer.service.INuBizNuCustomerServerService;
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.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
/**
* @Description: 护理单元客户配置服务指令
* @Author: yangjun
* @Date: 2025-03-31
* @Version: V1.0
*/
@Api(tags="护理单元客户配置服务指令")
@RestController
@RequestMapping("/nuIpadApi/nuBizNuCustomerServer")
@Slf4j
public class NuBizNuCustomerServerController extends JeecgController<NuBizNuCustomerServer, INuBizNuCustomerServerService> {
@Autowired
private INuBizNuCustomerServerService nuBizNuCustomerServerService;
/**
* PAD端获取服务指令计划表格数据
*
* @param nuBizNuCustomerServer
* @return
*/
//@AutoLog(value = "护理单元客户配置服务指令-分页列表查询")
@ApiOperation(value="护理单元客户配置服务指令-分页列表查询", notes="护理单元客户配置服务指令-分页列表查询")
@GetMapping(value = "/getNclist")
public Result<Map<String,Object>> getNclist(NuBizNuCustomerServer nuBizNuCustomerServer) {
Map<String,Object> pageList = nuBizNuCustomerServerService.getNclist(nuBizNuCustomerServer);
return Result.OK(pageList);
}
/**
* 添加
*
* @param nuBizNuCustomerServer
* @return
*/
@AutoLog(value = "护理单元客户配置服务指令-添加")
@ApiOperation(value="护理单元客户配置服务指令-添加", notes="护理单元客户配置服务指令-添加")
// @RequiresPermissions("NuBizNuCustomerServer:nu_biz_nu_customer_server:add")
@PostMapping(value = "/addNuCustomerServer")
public Result<NuBizNuCustomerServer> addNuCustomerServer(@RequestBody NuBizNuCustomerServer nuBizNuCustomerServer) {
NuBizNuCustomerServer retText = nuBizNuCustomerServerService.addNuCustomerServer(nuBizNuCustomerServer);
return Result.OK(retText);
}
/**
* 编辑
*
* @param nuBizNuCustomerServer
* @return
*/
@AutoLog(value = "护理单元客户配置服务指令-编辑")
@ApiOperation(value="护理单元客户配置服务指令-编辑", notes="护理单元客户配置服务指令-编辑")
// @RequiresPermissions("NuBizNuCustomerServer:nu_biz_nu_customer_server:edit")
@RequestMapping(value = "/editNuCustomerServer", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<NuBizNuCustomerServer> editNuCustomerServer(@RequestBody NuBizNuCustomerServer nuBizNuCustomerServer) {
NuBizNuCustomerServer retJson = nuBizNuCustomerServerService.editNuCustomerServer(nuBizNuCustomerServer);
return Result.OK(retJson);
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "护理单元客户配置服务指令-通过id删除")
@ApiOperation(value="护理单元客户配置服务指令-通过id删除", notes="护理单元客户配置服务指令-通过id删除")
// @RequiresPermissions("NuBizNuCustomerServer:nu_biz_nu_customer_server:delete")
@DeleteMapping(value = "/deleteNuCustomerServer")
public Result<String> delete(@RequestParam(name="id",required=true) String id) {
nuBizNuCustomerServerService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
//@AutoLog(value = "护理单元客户配置服务指令-通过id查询")
@ApiOperation(value="护理单元客户配置服务指令-通过id查询", notes="护理单元客户配置服务指令-通过id查询")
@GetMapping(value = "/queryById")
public Result<NuBizNuCustomerServer> queryById(@RequestParam(name="id",required=true) String id) {
NuBizNuCustomerServer nuBizNuCustomerServer = nuBizNuCustomerServerService.getById(id);
if(nuBizNuCustomerServer==null) {
return Result.error("未找到对应数据");
}
return Result.OK(nuBizNuCustomerServer);
}
/**
* PAD端保存服务指令计划表格数据
*
* @param nuBizNuCustomerServer
* @return
*/
@AutoLog(value = "护理单元客户配置服务指令-添加")
@ApiOperation(value="护理单元客户配置服务指令-添加", notes="护理单元客户配置服务指令-添加")
// @RequiresPermissions("NuBizNuCustomerServer:nu_biz_nu_customer_server:add")
@PostMapping(value = "/addBatch")
public Result<NuBizNuCustomerServer> addBatch(@RequestBody NuBizNuCustomerServer nuBizNuCustomerServer) {
nuBizNuCustomerServerService.addBatch(nuBizNuCustomerServer);
return Result.OK("操作成功");
}
/**
* 获取指令包集合数据
*
* @param DirectivePackageDto
* @return
*/
@ApiOperation(value="获取指令包集合数据", notes="获取指令包集合数据")
@GetMapping(value = "/getNcPackagelist")
public Result<List<DirectivePackageDto>> getNcPackagelist(DirectivePackageDto DirectivePackageDto) {
List<DirectivePackageDto> pageList = nuBizNuCustomerServerService.getNcPackagelist(DirectivePackageDto);
return Result.OK(pageList);
}
/**
* PAD端编排护理流程-新增服务指令
*
* @param nuBizNuCustomerServer
* @return
*/
@AutoLog(value = "编排护理流程-新增服务指令")
@ApiOperation(value="编排护理流程-新增服务指令", notes="编排护理流程-新增服务指令")
@PostMapping(value = "/addDirective")
public Result<NuBizNuCustomerServer> addDirective(@RequestBody NuBizNuCustomerServer nuBizNuCustomerServer) {
return Result.OK(nuBizNuCustomerServerService.addDirective(nuBizNuCustomerServer));
}
/**
* PAD端编排护理流程-新增即时服务指令
*
* @param customerServerInstant
* @return
*/
@AutoLog(value = "编排护理流程-新增即时服务指令")
@ApiOperation(value="编排护理流程-新增即时服务指令", notes="编排护理流程-新增即时服务指令")
@PostMapping(value = "/addInstant")
public Result<?> addDirective(@RequestBody NuBizNuCustomerServerInstant customerServerInstant) {
return Result.OK(nuBizNuCustomerServerService.addInstant(customerServerInstant));
}
/**
* PAD端编排护理流程-新增情绪/体型标签
*
* @param customerElderTag
* @return
*/
@AutoLog(value = "编排护理流程-新增情绪/体型标签")
@ApiOperation(value="编排护理流程-新增情绪/体型标签", notes="编排护理流程-新增情绪/体型标签")
@PostMapping(value = "/addElderTag")
public Result<?> addElderTag(@RequestBody NuBizNuCustomerElderTag customerElderTag) {
return Result.OK(nuBizNuCustomerServerService.addElderTag(customerElderTag));
}
/**
* PAD端编排护理流程-删除服务指令
*
* @param nuBizNuCustomerServer
* @return
*/
@AutoLog(value = "编排护理流程-删除服务指令")
@ApiOperation(value="编排护理流程-删除服务指令", notes="编排护理流程-删除服务指令")
@PostMapping(value = "/deleteDirective")
public Result<NuBizNuCustomerServer> deleteDirective(@RequestBody NuBizNuCustomerServer nuBizNuCustomerServer) {
nuBizNuCustomerServerService.deleteDirective(nuBizNuCustomerServer);
return Result.OK("操作成功");
}
/**
* PAD端编排护理流程-删除即时服务指令
*
* @param customerServerInstant
* @return
*/
@AutoLog(value = "编排护理流程-删除即时服务指令")
@ApiOperation(value="编排护理流程-删除即时服务指令", notes="编排护理流程-删除即时服务指令")
@PostMapping(value = "/deleteInstant")
public Result<?> deleteInstant(@RequestBody NuBizNuCustomerServerInstant customerServerInstant) {
nuBizNuCustomerServerService.deleteInstant(customerServerInstant);
return Result.OK("操作成功");
}
/**
* PAD端编排护理流程-删除情绪/体型标签
*
* @param customerElderTag
* @return
*/
@AutoLog(value = "编排护理流程-删除情绪/体型标签")
@ApiOperation(value="编排护理流程-删除情绪/体型标签", notes="编排护理流程-删除情绪/体型标签")
@PostMapping(value = "/deleteElderTag")
public Result<?> deleteElderTag(@RequestBody NuBizNuCustomerElderTag customerElderTag) {
nuBizNuCustomerServerService.deleteElderTag(customerElderTag);
return Result.OK("操作成功");
}
/**
* PAD端编排护理流程-修改服务指令
*
* @param nuBizNuCustomerServer
* @return
*/
@AutoLog(value = "编排护理流程-修改服务指令")
@ApiOperation(value="编排护理流程-修改服务指令", notes="编排护理流程-修改服务指令")
@PostMapping(value = "/editDirective")
public Result<NuBizNuCustomerServer> editDirective(@RequestBody NuBizNuCustomerServer nuBizNuCustomerServer) {
nuBizNuCustomerServerService.editDirective(nuBizNuCustomerServer);
return Result.OK("操作成功");
}
/**
* PAD端编排护理流程-修改即时服务指令
*
* @param customerServerInstant
* @return
*/
@AutoLog(value = "编排护理流程-修改即时服务指令")
@ApiOperation(value="编排护理流程修改除即时服务指令", notes="编排护理流程-修改即时服务指令")
@PostMapping(value = "/editInstant")
public Result<?> editInstant(@RequestBody NuBizNuCustomerServerInstant customerServerInstant) {
nuBizNuCustomerServerService.editInstant(customerServerInstant);
return Result.OK("操作成功");
}
/**
* PAD端编排护理流程-修改情绪/体型标签
*
* @param customerElderTag
* @return
*/
@AutoLog(value = "编排护理流程-修改情绪/体型标签")
@ApiOperation(value="编排护理流程-修改情绪/体型标签", notes="编排护理流程-修改情绪/体型标签")
@PostMapping(value = "/editElderTag")
public Result<?> editElderTag(@RequestBody NuBizNuCustomerElderTag customerElderTag) {
nuBizNuCustomerServerService.editElderTag(customerElderTag);
return Result.OK("操作成功");
}
}

19
nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/NuBizNuCustomerElderTagMapper.java
View File

@ -1,19 +0,0 @@
package com.nu.modules.NuBizNuCustomerServer.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.nu.modules.NuBizNuCustomerServer.entity.NuBizNuCustomerElderTag;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* @Description: 护理单元客户配置长者标签
* @Author: caolei
* @Date: 2025-10-13
* @Version: V1.0
*/
public interface NuBizNuCustomerElderTagMapper extends BaseMapper<NuBizNuCustomerElderTag> {
List<NuBizNuCustomerElderTag> getElderTags(NuBizNuCustomerElderTag nuBizNuCustomerElderTag);
int deleteByIdPhysic(@Param("id") String id);
}

26
nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/NuBizNuCustomerServerMapper.java
View File

@ -1,26 +0,0 @@
package com.nu.modules.NuBizNuCustomerServer.mapper;
import java.util.List;
import com.nu.modules.NuBizNuCustomerServer.entity.ConfigServiceDirectiveDto;
import com.nu.modules.NuBizNuCustomerServer.entity.DirectivePackageDto;
import org.apache.ibatis.annotations.Param;
import com.nu.modules.NuBizNuCustomerServer.entity.NuBizNuCustomerServer;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 护理单元客户配置服务指令
* @Author: yangjun
* @Date: 2025-03-31
* @Version: V1.0
*/
public interface NuBizNuCustomerServerMapper extends BaseMapper<NuBizNuCustomerServer> {
List<NuBizNuCustomerServer> getGroupPositioning(NuBizNuCustomerServer nuBizNuCustomerServer);
List<DirectivePackageDto> getNcPackagelist(@Param("params") DirectivePackageDto directivePackageDto);
List<NuBizNuCustomerServer> getNcDirectiveList(@Param("params") NuBizNuCustomerServer nuBizNuCustomerServer);
int deleteByIdPhysic(@Param("id") String id);
}

19
nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/INuBizNuCustomerElderTagService.java
View File

@ -1,19 +0,0 @@
package com.nu.modules.NuBizNuCustomerServer.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.nu.modules.NuBizNuCustomerServer.entity.NuBizNuCustomerElderTag;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* @Description: 护理单元客户配置长者标签
* @Author: caolei
* @Date: 2025-10-13
* @Version: V1.0
*/
public interface INuBizNuCustomerElderTagService extends IService<NuBizNuCustomerElderTag> {
List<NuBizNuCustomerElderTag> getElderTags(NuBizNuCustomerElderTag nuBizNuCustomerElderTag);
int deleteByIdPhysic(String id);
}

15
nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/INuBizNuCustomerServerInstantService.java
View File

@ -1,15 +0,0 @@
package com.nu.modules.NuBizNuCustomerServer.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.nu.modules.NuBizNuCustomerServer.entity.NuBizNuCustomerServerInstant;
/**
* @Description: 护理单元客户配置服务指令即时指令
* @Author: caolei
* @Date: 2025-10-13
* @Version: V1.0
*/
public interface INuBizNuCustomerServerInstantService extends IService<NuBizNuCustomerServerInstant> {
int deleteByIdPhysic(String id);
}

47
nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/INuBizNuCustomerServerService.java
View File

@ -1,47 +0,0 @@
package com.nu.modules.NuBizNuCustomerServer.service;
import com.nu.modules.NuBizNuCustomerServer.entity.DirectivePackageDto;
import com.nu.modules.NuBizNuCustomerServer.entity.NuBizNuCustomerElderTag;
import com.nu.modules.NuBizNuCustomerServer.entity.NuBizNuCustomerServer;
import com.baomidou.mybatisplus.extension.service.IService;
import com.nu.modules.NuBizNuCustomerServer.entity.NuBizNuCustomerServerInstant;
import java.util.List;
import java.util.Map;
/**
* @Description: 护理单元客户配置服务指令
* @Author: yangjun
* @Date: 2025-03-31
* @Version: V1.0
*/
public interface INuBizNuCustomerServerService extends IService<NuBizNuCustomerServer> {
Map<String,Object> getNclist(NuBizNuCustomerServer nuBizNuCustomerServer);
NuBizNuCustomerServer addNuCustomerServer(NuBizNuCustomerServer nuBizNuCustomerServer);
NuBizNuCustomerServer editNuCustomerServer(NuBizNuCustomerServer nuBizNuCustomerServer);
void addBatch(NuBizNuCustomerServer nuBizNuCustomerServer);
List<DirectivePackageDto> getNcPackagelist(DirectivePackageDto directivePackageDto);
NuBizNuCustomerServer addDirective(NuBizNuCustomerServer nuBizNuCustomerServer);
NuBizNuCustomerServerInstant addInstant(NuBizNuCustomerServerInstant customerServerInstant);
NuBizNuCustomerElderTag addElderTag(NuBizNuCustomerElderTag customerElderTag);
void deleteDirective(NuBizNuCustomerServer nuBizNuCustomerServer);
void deleteInstant(NuBizNuCustomerServerInstant customerServerInstant);
void deleteElderTag(NuBizNuCustomerElderTag customerElderTag);
void editDirective(NuBizNuCustomerServer nuBizNuCustomerServer);
void editInstant(NuBizNuCustomerServerInstant customerServerInstant);
void editElderTag(NuBizNuCustomerElderTag customerElderTag);
}

28
nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/impl/NuBizNuCustomerElderTagServiceImpl.java
View File

@ -1,28 +0,0 @@
package com.nu.modules.NuBizNuCustomerServer.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.nu.modules.NuBizNuCustomerServer.entity.NuBizNuCustomerElderTag;
import com.nu.modules.NuBizNuCustomerServer.mapper.NuBizNuCustomerElderTagMapper;
import com.nu.modules.NuBizNuCustomerServer.service.INuBizNuCustomerElderTagService;
import com.nu.modules.NuBizNuCustomerServer.service.INuBizNuCustomerServerInstantService;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* @Description: 护理单元客户配置服务指令即时指令
* @Author: caolei
* @Date: 2025-10-13
* @Version: V1.0
*/
@Service
public class NuBizNuCustomerElderTagServiceImpl extends ServiceImpl<NuBizNuCustomerElderTagMapper, NuBizNuCustomerElderTag> implements INuBizNuCustomerElderTagService {
public List<NuBizNuCustomerElderTag> getElderTags(NuBizNuCustomerElderTag nuBizNuCustomerElderTag){
return baseMapper.getElderTags(nuBizNuCustomerElderTag);
}
@Override
public int deleteByIdPhysic(String id) {
return baseMapper.deleteByIdPhysic(id);
}
}

22
nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/impl/NuBizNuCustomerServerInstantServiceImpl.java
View File

@ -1,22 +0,0 @@
package com.nu.modules.NuBizNuCustomerServer.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.nu.modules.NuBizNuCustomerServer.entity.NuBizNuCustomerServerInstant;
import com.nu.modules.NuBizNuCustomerServer.mapper.NuBizNuCustomerServerInstantMapper;
import com.nu.modules.NuBizNuCustomerServer.service.INuBizNuCustomerServerInstantService;
import org.springframework.stereotype.Service;
/**
* @Description: 护理单元客户配置服务指令即时指令
* @Author: caolei
* @Date: 2025-10-13
* @Version: V1.0
*/
@Service
public class NuBizNuCustomerServerInstantServiceImpl extends ServiceImpl<NuBizNuCustomerServerInstantMapper, NuBizNuCustomerServerInstant> implements INuBizNuCustomerServerInstantService {
@Override
public int deleteByIdPhysic(String id) {
return baseMapper.deleteByIdPhysic(id);
}
}

497
nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/impl/NuBizNuCustomerServerServiceImpl.java
View File

@ -1,497 +0,0 @@
package com.nu.modules.NuBizNuCustomerServer.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.nu.modules.NuBizNuCustomerServer.entity.*;
import com.nu.modules.NuBizNuCustomerServer.mapper.NuBizNuCustomerServerMapper;
import com.nu.modules.NuBizNuCustomerServer.service.INuBizNuCustomerElderTagService;
import com.nu.modules.NuBizNuCustomerServer.service.INuBizNuCustomerServerInstantService;
import com.nu.modules.NuBizNuCustomerServer.service.INuBizNuCustomerServerService;
import com.nu.modules.directive.datapool.entity.DataPool;
import com.nu.modules.directive.datapool.service.impl.DataPoolServiceImpl;
import com.nu.modules.nuApiServiceCategory.entity.NuConfigServiceCategory;
import com.nu.modules.nuApiServiceCategory.entity.NuConfigServiceDirective;
import com.nu.modules.nuApiServiceCategory.entity.NuConfigServiceType;
import com.nu.modules.nuApiServiceCategory.service.INuConfigServiceCategoryService;
import com.nu.modules.nuApiServiceCategory.service.INuConfigServiceDirectiveService;
import com.nu.modules.nuApiServiceCategory.service.INuConfigServiceTypeService;
import com.nu.modules.sysconfig.ISysConfigApi;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import java.util.*;
/**
* @Description: 护理单元客户配置服务指令
* @Author: yangjun
* @Date: 2025-03-31
* @Version: V1.0
*/
@Service
public class NuBizNuCustomerServerServiceImpl extends ServiceImpl<NuBizNuCustomerServerMapper, NuBizNuCustomerServer> implements INuBizNuCustomerServerService {
@Autowired
private INuConfigServiceCategoryService nuConfigServiceCategoryService;
@Autowired
private INuConfigServiceTypeService nuConfigServiceTypeService;
@Autowired
private INuConfigServiceDirectiveService nuConfigServiceDirectiveService;
@Autowired
private INuBizNuCustomerServerInstantService nuBizNuCustomerServerInstantService;
@Autowired
private INuBizNuCustomerElderTagService nuBizNuCustomerElderTagService;
@Autowired
private ISysConfigApi sysConfigApi;
@Autowired
private DataPoolServiceImpl dataPoolServiceImpl;
private String serverNetUrl;
@Override
public Map<String, Object> getNclist(NuBizNuCustomerServer nuBizNuCustomerServer) {
Map<String, Object> resMap = new HashMap<>();
//服务指令计划
QueryWrapper<NuBizNuCustomerServer> nuBizNuCustomerServerQueryWrapper = new QueryWrapper<>();
nuBizNuCustomerServerQueryWrapper.eq(StringUtils.isNotEmpty(nuBizNuCustomerServer.getNuId()), "nu_id", nuBizNuCustomerServer.getNuId());
nuBizNuCustomerServerQueryWrapper.eq(StringUtils.isNotEmpty(nuBizNuCustomerServer.getCustomerId()), "customer_id", nuBizNuCustomerServer.getCustomerId());
List<NuBizNuCustomerServer> groupList = baseMapper.selectList(nuBizNuCustomerServerQueryWrapper);
// String groupPositioning[] = {"0","1","2","3","4","5","6","7","8","9","10","11","12","13","14","15","16","17","18","19","20","21","22","23"};
// List<Map<String,Object>> allList = new ArrayList<>();
// for(String groupPositioning1 : groupPositioning){
// Map<String,Object> posMap = new HashMap<>();
// posMap.put("positioning",groupPositioning1);
// List<Map<String,Object>> childrenList = new ArrayList<>();
// for(NuBizNuCustomerServer par : groupList){
// if(StringUtils.equals(groupPositioning1,par.getPositioning())){
// Map<String,Object> map = new HashMap<>();
// map.put("nuId",nuBizNuCustomerServer.getNuId());
// map.put("customerId",nuBizNuCustomerServer.getCustomerId());
// map.put("directiveId",par.getId());
// map.put("directiveName",par.getDirectiveName());
// map.put("typeId",par.getTypeId());
// map.put("typeName",par.getTypeName());
// map.put("categoryId",par.getCategoryId());
// map.put("categoryName",par.getCategoryName());
// map.put("tagName",par.getTagName());
// map.put("startTime",par.getStartTime());
// map.put("endTime",par.getEndTime());
// map.put("cycleTypeId",par.getCycleType());
// map.put("cycleType",par.getCycleType());
// map.put("cycleValue",par.getCycleValue());
// map.put("positioningLong",par.getPositioningLong());
// map.put("positioning",par.getPositioning());
// map.put("izPackage",par.getIzPackage());
// if(par.getImmediateFile()!=null&&!par.getImmediateFile().equals("")){
// String immediateFile = getImageNetUrl(par.getImmediateFile());
// map.put("immediateFile",par.getImmediateFile());
// map.put("netImmediateFile",immediateFile);
// }else{
// map.put("immediateFile","");
// map.put("netImmediateFile","");
// }
// if(par.getImmediateFileFocus()!=null&&!par.getImmediateFile().equals("")){
// String immediateFileFocus = getImageNetUrl(par.getImmediateFileFocus());
// map.put("immediateFileFocus",par.getImmediateFileFocus());
// map.put("netImmediateFileFocus",immediateFileFocus);
// }else{
// map.put("immediateFileFocus","");
// map.put("netImmediateFileFocus","");
// }
// if(par.getPreviewFile()!=null&&!par.getImmediateFile().equals("")){
// String previewFile = getImageNetUrl(par.getPreviewFile());
// map.put("previewFile",par.getPreviewFile());
// map.put("netPreviewFile",previewFile);
// }else{
// map.put("previewFile","");
// map.put("netPreviewFile","");
// }
// if(par.getPreviewFileSmall()!=null&&!par.getImmediateFile().equals("")){
// String previewFileSmall = getImageNetUrl(par.getPreviewFileSmall());
// map.put("previewFileSmall",par.getPreviewFileSmall());
// map.put("netPreviewFileSmall",previewFileSmall);
// }else{
// map.put("previewFileSmall","");
// map.put("netPreviewFileSmall","");
// }
// childrenList.add(map);
// }
// }
// posMap.put("children",childrenList);
// allList.add(posMap);
// }
// resMap.put("serviceList",allList);//服务指令计划
for (NuBizNuCustomerServer par : groupList) {
if (par.getIzPackage().equals("Y")) {
String directiveId = par.getDirectiveId();
if (directiveId != null && !directiveId.equals("")) {
NuBizNuCustomerServer packageDirective = new NuBizNuCustomerServer();
packageDirective.setPackageId(directiveId);
List<NuBizNuCustomerServer> pdList = baseMapper.getNcDirectiveList(packageDirective);
for (NuBizNuCustomerServer pd : pdList) {
getNetImages(pd);
}
par.setDirectivesList(pdList);
}
}
// else {
// getNetImages(par);
// }
}
resMap.put("serviceList", groupList);//服务指令计划
//即时指令
QueryWrapper<NuBizNuCustomerServerInstant> instantQueryWrapper = new QueryWrapper<>();
instantQueryWrapper.eq(StringUtils.isNotEmpty(nuBizNuCustomerServer.getNuId()), "nu_id", nuBizNuCustomerServer.getNuId());
instantQueryWrapper.eq(StringUtils.isNotEmpty(nuBizNuCustomerServer.getCustomerId()), "customer_id", nuBizNuCustomerServer.getCustomerId());
instantQueryWrapper.orderByDesc("create_time");
List<NuBizNuCustomerServerInstant> instantList = nuBizNuCustomerServerInstantService.list(instantQueryWrapper);
// for (NuBizNuCustomerServerInstant pari : instantList) {
// getInstantNetImages(pari);
// }
resMap.put("instantList", instantList);
NuBizNuCustomerElderTag elderTag = new NuBizNuCustomerElderTag();
//体型标签
elderTag.setNuId(nuBizNuCustomerServer.getNuId());
elderTag.setCustomerId(nuBizNuCustomerServer.getCustomerId());
elderTag.setTagType("tx");
List<NuBizNuCustomerElderTag> bodyTagList = nuBizNuCustomerElderTagService.getElderTags(elderTag);
for (NuBizNuCustomerElderTag bt : bodyTagList) {
if (bt.getPic() != null) {
String pic = getImageNetUrl(bt.getPic());
bt.setNetPic(pic);
} else {
bt.setPic("");
bt.setNetPic("");
}
if (bt.getPicFocus() != null) {
String picFocus = getImageNetUrl(bt.getPicFocus());
bt.setNetPicFocus(picFocus);
} else {
bt.setPicFocus("");
bt.setNetPicFocus("");
}
}
resMap.put("bodyTagList", bodyTagList);
//情绪标签
elderTag.setTagType("qx");
List<NuBizNuCustomerElderTag> emotionTagList = nuBizNuCustomerElderTagService.getElderTags(elderTag);
for (NuBizNuCustomerElderTag et : emotionTagList) {
if (et.getPic() != null) {
String pic = getImageNetUrl(et.getPic());
et.setNetPic(pic);
} else {
et.setPic("");
et.setNetPic("");
}
if (et.getPicFocus() != null) {
String picFocus = getImageNetUrl(et.getPicFocus());
et.setNetPicFocus(picFocus);
} else {
et.setPicFocus("");
et.setNetPicFocus("");
}
}
resMap.put("emotionTagList", emotionTagList);
return resMap;
}
private NuBizNuCustomerServer getNetImages(NuBizNuCustomerServer par) {
if (par.getImmediateFile() != null && !par.getImmediateFile().equals("")) {
String immediateFile = getImageNetUrl(par.getImmediateFile());
par.setNetImmediateFile(immediateFile);
} else {
par.setImmediateFile("");
par.setNetImmediateFile("");
}
if (par.getImmediateFileFocus() != null && !par.getImmediateFileFocus().equals("")) {
String immediateFileFocus = getImageNetUrl(par.getImmediateFileFocus());
par.setNetImmediateFileFocus(immediateFileFocus);
} else {
par.setImmediateFileFocus("");
par.setNetImmediateFileFocus("");
}
if (par.getPreviewFile() != null && !par.getPreviewFile().equals("")) {
String previewFile = getImageNetUrl(par.getPreviewFile());
par.setNetPreviewFile(previewFile);
} else {
par.setPreviewFile("");
par.setNetPreviewFile("");
}
if (par.getPreviewFileSmall() != null && !par.getPreviewFileSmall().equals("")) {
String previewFileSmall = getImageNetUrl(par.getPreviewFileSmall());
par.setNetPreviewFileSmall(previewFileSmall);
} else {
par.setPreviewFileSmall("");
par.setNetPreviewFileSmall("");
}
if (par.getMp3File() != null && !par.getMp3File().equals("")) {
String netMp3File = getImageNetUrl(par.getMp3File());
par.setNetMp3File(netMp3File);
} else {
par.setMp3File("");
par.setNetMp3File("");
}
if (par.getMp4File() != null && !par.getMp4File().equals("")) {
String netMp4File = getImageNetUrl(par.getMp4File());
par.setNetMp4File(netMp4File);
} else {
par.setMp4File("");
par.setNetMp4File("");
}
return par;
}
private NuBizNuCustomerServerInstant getInstantNetImages(NuBizNuCustomerServerInstant par) {
if (par.getImmediateFile() != null && !par.getImmediateFile().equals("")) {
String immediateFile = getImageNetUrl(par.getImmediateFile());
par.setNetImmediateFile(immediateFile);
} else {
par.setImmediateFile("");
par.setNetImmediateFile("");
}
if (par.getImmediateFileFocus() != null && !par.getImmediateFileFocus().equals("")) {
String immediateFileFocus = getImageNetUrl(par.getImmediateFileFocus());
par.setNetImmediateFileFocus(immediateFileFocus);
} else {
par.setImmediateFileFocus("");
par.setNetImmediateFileFocus("");
}
if (par.getPreviewFile() != null && !par.getPreviewFile().equals("")) {
String previewFile = getImageNetUrl(par.getPreviewFile());
par.setNetPreviewFile(previewFile);
} else {
par.setPreviewFile("");
par.setNetPreviewFile("");
}
if (par.getPreviewFileSmall() != null && !par.getPreviewFileSmall().equals("")) {
String previewFileSmall = getImageNetUrl(par.getPreviewFileSmall());
par.setNetPreviewFileSmall(previewFileSmall);
} else {
par.setPreviewFileSmall("");
par.setNetPreviewFileSmall("");
}
if (par.getMp3File() != null && !par.getMp3File().equals("")) {
String netMp3File = getImageNetUrl(par.getMp3File());
par.setNetMp3File(netMp3File);
} else {
par.setMp3File("");
par.setNetMp3File("");
}
if (par.getMp4File() != null && !par.getMp4File().equals("")) {
String netMp4File = getImageNetUrl(par.getMp4File());
par.setNetMp4File(netMp4File);
} else {
par.setMp4File("");
par.setNetMp4File("");
}
return par;
}
@Override
public NuBizNuCustomerServer addNuCustomerServer(NuBizNuCustomerServer nuBizNuCustomerServer) {
NuConfigServiceDirective nuConfigServiceDirective = nuConfigServiceDirectiveService.getById(nuBizNuCustomerServer.getDirectiveId());
NuConfigServiceCategory nuConfigServiceCategory = nuConfigServiceCategoryService.getById(nuConfigServiceDirective.getCategoryId());
NuConfigServiceType nuConfigServiceType = nuConfigServiceTypeService.getById(nuConfigServiceDirective.getTypeId());
nuBizNuCustomerServer.setCategoryId(nuConfigServiceCategory.getId());
nuBizNuCustomerServer.setCategoryName(nuConfigServiceCategory.getCategoryName());
nuBizNuCustomerServer.setTypeId(nuConfigServiceType.getId());
nuBizNuCustomerServer.setTypeName(nuConfigServiceType.getTypeName());
baseMapper.insert(nuBizNuCustomerServer);
return nuBizNuCustomerServer;
}
@Override
public NuBizNuCustomerServer editNuCustomerServer(NuBizNuCustomerServer nuBizNuCustomerServer) {
NuConfigServiceDirective nuConfigServiceDirective = nuConfigServiceDirectiveService.getById(nuBizNuCustomerServer.getDirectiveId());
NuConfigServiceCategory nuConfigServiceCategory = nuConfigServiceCategoryService.getById(nuConfigServiceDirective.getCategoryId());
NuConfigServiceType nuConfigServiceType = nuConfigServiceTypeService.getById(nuConfigServiceDirective.getTypeId());
nuBizNuCustomerServer.setCategoryId(nuConfigServiceCategory.getId());
nuBizNuCustomerServer.setCategoryName(nuConfigServiceCategory.getCategoryName());
nuBizNuCustomerServer.setTypeId(nuConfigServiceType.getId());
nuBizNuCustomerServer.setTypeName(nuConfigServiceType.getTypeName());
baseMapper.updateById(nuBizNuCustomerServer);
return nuBizNuCustomerServer;
}
@Override
public void addBatch(NuBizNuCustomerServer nuBizNuCustomerServer) {
//保存服务指令计划
String nuId = nuBizNuCustomerServer.getNuId();
String customerId = nuBizNuCustomerServer.getCustomerId();
// QueryWrapper<NuBizNuCustomerServer> nuBizNuCustomerServerQueryWrapper = new QueryWrapper<>();
// nuBizNuCustomerServerQueryWrapper.eq("nu_id", nuId);
// nuBizNuCustomerServerQueryWrapper.eq("customer_id", customerId);
// baseMapper.delete(nuBizNuCustomerServerQueryWrapper);
// List<NuBizNuCustomerServer> serverList = nuBizNuCustomerServer.getServerList();
// if (serverList.size() > 0) {
// for (NuBizNuCustomerServer par : serverList) {
// par.setNuId(nuId);
// par.setNuName(nuBizNuCustomerServer.getNuName());
// par.setCustomerId(customerId);
// par.setCustomerName(nuBizNuCustomerServer.getCustomerName());
// }
//
// this.saveBatch(serverList);
// }
// QueryWrapper<NuBizNuCustomerServerInstant> instantQueryWrapper = new QueryWrapper<>();
// instantQueryWrapper.eq("nu_id", nuId);
// instantQueryWrapper.eq("customer_id", customerId);
// nuBizNuCustomerServerInstantService.remove(instantQueryWrapper);
// List<NuBizNuCustomerServerInstant> instantList = nuBizNuCustomerServer.getInstantList();
// if (instantList.size() > 0) {
// for (NuBizNuCustomerServerInstant pari : instantList) {
// pari.setNuId(nuId);
// pari.setNuName(nuBizNuCustomerServer.getNuName());
// pari.setCustomerId(customerId);
// pari.setCustomerName(nuBizNuCustomerServer.getCustomerName());
// }
// nuBizNuCustomerServerInstantService.saveBatch(instantList);
// }
QueryWrapper<NuBizNuCustomerElderTag> tagQueryWrapper = new QueryWrapper<>();
tagQueryWrapper.eq("nu_id", nuId);
tagQueryWrapper.eq("customer_id", customerId);
nuBizNuCustomerElderTagService.remove(tagQueryWrapper);
List<NuBizNuCustomerElderTag> tagList = nuBizNuCustomerServer.getTagList();
if (tagList.size() > 0) {
for (NuBizNuCustomerElderTag tg : tagList) {
tg.setNuId(nuId);
tg.setNuName(nuBizNuCustomerServer.getNuName());
tg.setCustomerId(customerId);
tg.setCustomerName(nuBizNuCustomerServer.getCustomerName());
}
nuBizNuCustomerElderTagService.saveBatch(tagList);
}
}
@Override
public List<DirectivePackageDto> getNcPackagelist(DirectivePackageDto directivePackageDto) {
List<DirectivePackageDto> list = baseMapper.getNcPackagelist(directivePackageDto);
List<NuBizNuCustomerServer> directiveList = baseMapper.getNcDirectiveList(new NuBizNuCustomerServer());
for (DirectivePackageDto et : list) {
List<NuBizNuCustomerServer> directivesList = new ArrayList<>();
for (NuBizNuCustomerServer etd : directiveList) {
if (etd.getPackageId().equals(et.getId())) {
getNetImages(etd);
directivesList.add(etd);
}
}
et.setDirectivesList(directivesList);
}
return list;
}
@Override
public NuBizNuCustomerServer addDirective(NuBizNuCustomerServer nuBizNuCustomerServer) {
baseMapper.insert(nuBizNuCustomerServer);
//TODO 增加日志
//单一指令生成到数据池
dataPoolServiceImpl.generateDataPool(nuBizNuCustomerServer);
return nuBizNuCustomerServer;
}
@Override
public NuBizNuCustomerServerInstant addInstant(NuBizNuCustomerServerInstant customerServerInstant) {
nuBizNuCustomerServerInstantService.save(customerServerInstant);
//TODO 增加日志
//生成即时指令到数据池，测试
// DataPool dataPool = new DataPool();
// dataPool.setBizId(customerServerInstant.getId());
// dataPool.setNuId(customerServerInstant.getNuId());
// dataPool.setNuName(customerServerInstant.getNuName());
// dataPool.setCustomerId(customerServerInstant.getCustomerId());
// dataPool.setCustomerName(customerServerInstant.getCustomerName());
// dataPool.setDirectiveId(customerServerInstant.getDirectiveId());
// dataPool.setDirectiveName(customerServerInstant.getDirectiveName());
// dataPool.setServiceDuration(customerServerInstant.getServiceDuration());
// dataPoolServiceImpl.addInstant(dataPool);
return customerServerInstant;
}
@Override
public NuBizNuCustomerElderTag addElderTag(NuBizNuCustomerElderTag customerElderTag) {
nuBizNuCustomerElderTagService.save(customerElderTag);
//TODO 增加日志
return customerElderTag;
}
@Override
public void deleteDirective(NuBizNuCustomerServer nuBizNuCustomerServer) {
String id = nuBizNuCustomerServer.getId();
//调用方法删除数据池中的数据
dataPoolServiceImpl.deleteDataPool(nuBizNuCustomerServer);
baseMapper.deleteByIdPhysic(id);
//TODO 增加日志
}
@Override
public void deleteInstant(NuBizNuCustomerServerInstant customerServerInstant) {
nuBizNuCustomerServerInstantService.deleteByIdPhysic(customerServerInstant.getId());
//TODO 增加日志
}
@Override
public void deleteElderTag(NuBizNuCustomerElderTag customerElderTag) {
nuBizNuCustomerElderTagService.deleteByIdPhysic(customerElderTag.getId());
//TODO 增加日志
}
@Override
public void editDirective(NuBizNuCustomerServer nuBizNuCustomerServer) {
NuBizNuCustomerServer entity = baseMapper.selectById(nuBizNuCustomerServer.getId());
baseMapper.updateById(nuBizNuCustomerServer);
//TODO 增加日志
//调用方法先删除数据池中的数据，再生成数据池中的数据
dataPoolServiceImpl.editDataPool(entity);
}
@Override
public void editInstant(NuBizNuCustomerServerInstant customerServerInstant) {
nuBizNuCustomerServerInstantService.updateById(customerServerInstant);
//TODO 增加日志
}
@Override
public void editElderTag(NuBizNuCustomerElderTag customerElderTag) {
nuBizNuCustomerElderTagService.updateById(customerElderTag);
//TODO 增加日志
}
/**
* 获取管理平台静态资源路径
*
* @return
*/
private void getOpeMediaAddress() {
if (serverNetUrl == null || serverNetUrl.equals("")) {
JSONObject json = sysConfigApi.getByKey("ope_media_address");
if (json != null) {
String configValue = json.getString("configValue");
if (!configValue.endsWith("/")) {
configValue += "/";
}
serverNetUrl = configValue;
}
}
}
private String getImageNetUrl(String imageUrl) {
getOpeMediaAddress();
return serverNetUrl + imageUrl;
}
}

50
nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/controller/DataPoolController.java
View File

@ -1,50 +0,0 @@
package com.nu.modules.directive.datapool.controller;
import com.nu.modules.directive.datapool.entity.DataPool;
import com.nu.modules.directive.datapool.service.IDataPoolService;
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.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* @Description: 服务指令数据池管理
* @Author: caolei
* @Date: 2025-11-07
* @Version: V1.0
*/
@Api(tags = "服务指令数据池管理")
@RestController
@RequestMapping("/nuIpadApi/directive/dataPool")
@Slf4j
public class DataPoolController extends JeecgController<DataPool, IDataPoolService> {
@Autowired
private IDataPoolService service;
/**
* 批量
* @return
*/
@GetMapping(value = "/generateDataPoolBatch")
public Result<?> generateDataPoolBatch() {
return service.generateDataPoolBatch();
}
/**
* 新增即时指令
* @return
*/
@ApiOperation(value="即时服务指令添加", notes="即时服务指令添加")
@PostMapping(value = "/addInstant")
public Result<?> addInstant(DataPool dataPool) {
return service.addInstant(dataPool);
}
}

42
nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/controller/NuConfigServiceCategoryController.java
View File

@ -1,42 +0,0 @@
package com.nu.modules.nuApiServiceCategory.controller;
import com.nu.modules.nuApiServiceCategory.entity.NuConfigServiceCategory;
import com.nu.modules.nuApiServiceCategory.service.INuConfigServiceCategoryService;
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.RestController;
import java.util.List;
import java.util.Map;
/**
* @Description: 服务指令
* @Author: yangjun
* @Date: 2025-03-28
* @Version: V1.0
*/
@RestController
@RequestMapping("/nuIpadApi/nuConfigServiceCategory")
@Slf4j
public class NuConfigServiceCategoryController extends JeecgController<NuConfigServiceCategory, INuConfigServiceCategoryService> {
@Autowired
private INuConfigServiceCategoryService nuConfigServiceCategoryService;
/**
* 获取护理类服务器指令树
*
* @param nuConfigServiceCategory
* @return
*/
//@AutoLog(value = "nu_config_service_category-分页列表查询")
@GetMapping(value = "/getServiceTree")
public Result<List<Map<String,Object>>> getServiceTree(NuConfigServiceCategory nuConfigServiceCategory) {
List<Map<String,Object>> treeList = nuConfigServiceCategoryService.getServiceTree(nuConfigServiceCategory);
return Result.OK(treeList);
}
}

14
nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/mapper/NuConfigServiceCategoryMapper.java
View File

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

17
nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/mapper/NuConfigServiceDirectiveMapper.java
View File

@ -1,17 +0,0 @@
package com.nu.modules.nuApiServiceCategory.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.nu.modules.nuApiServiceCategory.entity.NuConfigServiceDirective;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 服务指令
* @Author: yangjun
* @Date: 2025-03-28
* @Version: V1.0
*/
public interface NuConfigServiceDirectiveMapper extends BaseMapper<NuConfigServiceDirective> {
}

14
nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/mapper/NuConfigServiceTypeMapper.java
View File

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

15
nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/mapper/NuInstructionTagMapper.java
View File

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

18
nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/INuConfigServiceCategoryService.java
View File

@ -1,18 +0,0 @@
package com.nu.modules.nuApiServiceCategory.service;
import com.nu.modules.nuApiServiceCategory.entity.NuConfigServiceCategory;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
import java.util.Map;
/**
* @Description: 服务类别
* @Author: yangjun
* @Date: 2025-03-28
* @Version: V1.0
*/
public interface INuConfigServiceCategoryService extends IService<NuConfigServiceCategory> {
List<Map<String, Object>> getServiceTree(NuConfigServiceCategory nuConfigServiceCategory);
}

14
nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/INuConfigServiceDirectiveService.java
View File

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

14
nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/INuConfigServiceTypeService.java
View File

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

14
nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/INuInstructionTagService.java
View File

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

19
nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/impl/NuConfigServiceDirectiveServiceImpl.java
View File

@ -1,19 +0,0 @@
package com.nu.modules.nuApiServiceCategory.service.impl;
import com.nu.modules.nuApiServiceCategory.entity.NuConfigServiceDirective;
import com.nu.modules.nuApiServiceCategory.mapper.NuConfigServiceDirectiveMapper;
import com.nu.modules.nuApiServiceCategory.service.INuConfigServiceDirectiveService;
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 NuConfigServiceDirectiveServiceImpl extends ServiceImpl<NuConfigServiceDirectiveMapper, NuConfigServiceDirective> implements INuConfigServiceDirectiveService {
}

19
nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/impl/NuConfigServiceTypeServiceImpl.java
View File

@ -1,19 +0,0 @@
package com.nu.modules.nuApiServiceCategory.service.impl;
import com.nu.modules.nuApiServiceCategory.entity.NuConfigServiceType;
import com.nu.modules.nuApiServiceCategory.mapper.NuConfigServiceTypeMapper;
import com.nu.modules.nuApiServiceCategory.service.INuConfigServiceTypeService;
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 NuConfigServiceTypeServiceImpl extends ServiceImpl<NuConfigServiceTypeMapper, NuConfigServiceType> implements INuConfigServiceTypeService {
}

18
nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/impl/NuInstructionTagServiceImpl.java
View File

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

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

@ -0,0 +1,238 @@
package com.nu.modules.pad.instruction.care;
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.ICareDirectivePlanApi;
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-26
* @Version: V1.0
*/
@RestController
@RequestMapping("/api/pad/care/directive")
@Slf4j
public class CareDirectiveApi {
@Autowired
private ICareDirectiveConfigApi careDirectiveConfigApi;
@Autowired
private ICareDirectivePlanApi careDirectivePlanApi;
/**
* 获取护理类服务器指令树-配置数据
*
* @return
*/
@GetMapping(value = "/getServiceTree")
public Result<List<Map<String,Object>>> getServiceTree() {
List<Map<String,Object>> treeList = careDirectiveConfigApi.getServiceTree();
return Result.OK(treeList);
}
/**
* PAD端获取服务指令计划表格数据
*
* @param careDirectiveEntity
* @return
*/
@GetMapping(value = "/getNclist")
public Result<Map<String,Object>> getPlanList(CareDirectiveEntity careDirectiveEntity) {
Map<String,Object> pageList = careDirectivePlanApi.getPlanList(careDirectiveEntity);
return Result.OK(pageList);
}
/**
* 添加
*
* @param careDirectiveEntity
* @return
*/
@PostMapping(value = "/addNuCustomerServer")
public Result<CareDirectiveEntity> addNuCustomerServer(@RequestBody CareDirectiveEntity careDirectiveEntity) {
CareDirectiveEntity retText = careDirectivePlanApi.addNuCustomerServer(careDirectiveEntity);
return Result.OK(retText);
}
/**
* 编辑
*
* @param careDirectiveEntity
* @return
*/
@RequestMapping(value = "/editNuCustomerServer", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<CareDirectiveEntity> editNuCustomerServer(@RequestBody CareDirectiveEntity careDirectiveEntity) {
CareDirectiveEntity retJson = careDirectivePlanApi.editNuCustomerServer(careDirectiveEntity);
return Result.OK(retJson);
}
/**
* 通过id删除
*
* @param id
* @return
*/
@DeleteMapping(value = "/deleteNuCustomerServer")
public Result<String> deleteNuCustomerServer(@RequestParam(name="id",required=true) String id) {
careDirectivePlanApi.deleteNuCustomerServer(id);
return Result.OK("删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
@GetMapping(value = "/queryById")
public Result<CareDirectiveEntity> queryById(@RequestParam(name="id",required=true) String id) {
CareDirectiveEntity careDirectiveEntity = careDirectivePlanApi.getNuCustomerServerById(id);
if(careDirectiveEntity==null) {
return Result.error("未找到对应数据");
}
return Result.OK(careDirectiveEntity);
}
/**
* PAD端保存长者标签
*
* @param careDirectiveEntity
* @return
*/
@PostMapping(value = "/addBatch")
public Result<CareDirectiveEntity> addBatch(@RequestBody CareDirectiveEntity careDirectiveEntity) {
careDirectivePlanApi.addBatch(careDirectiveEntity);
return Result.OK("操作成功");
}
/**
* PAD端编排护理流程-新增服务指令
*
* @param careDirectiveEntity
* @return
*/
@PostMapping(value = "/addDirective")
public Result<CareDirectiveEntity> addDirective(@RequestBody CareDirectiveEntity careDirectiveEntity) {
return Result.OK(careDirectivePlanApi.addDirective(careDirectiveEntity));
}
/**
* PAD端编排护理流程-修改服务指令
*
* @param careDirectiveEntity
* @return
*/
@PostMapping(value = "/editDirective")
public Result<String> editDirective(@RequestBody CareDirectiveEntity careDirectiveEntity) {
careDirectivePlanApi.editDirective(careDirectiveEntity);
return Result.OK("操作成功");
}
/**
* PAD端编排护理流程-删除服务指令
*
* @param careDirectiveEntity
* @return
*/
@PostMapping(value = "/deleteDirective")
public Result<String> deleteDirective(@RequestBody CareDirectiveEntity careDirectiveEntity) {
careDirectivePlanApi.deleteDirective(careDirectiveEntity);
return Result.OK("操作成功");
}
/**
* PAD端编排护理流程-新增即时服务指令
*
* @param careDirectiveInstantEntity
* @return
*/
@PostMapping(value = "/addInstant")
public Result<?> addDirective(@RequestBody CareDirectiveInstantEntity careDirectiveInstantEntity) {
return Result.OK(careDirectivePlanApi.addInstant(careDirectiveInstantEntity));
}
/**
* PAD端编排护理流程-修改即时服务指令
*
* @param careDirectiveInstantEntity
* @return
*/
@PostMapping(value = "/editInstant")
public Result<String> editInstant(@RequestBody CareDirectiveInstantEntity careDirectiveInstantEntity) {
careDirectivePlanApi.editInstant(careDirectiveInstantEntity);
return Result.OK("操作成功");
}
/**
* PAD端编排护理流程-删除即时服务指令
*
* @param careDirectiveInstantEntity
* @return
*/
@PostMapping(value = "/deleteInstant")
public Result<String> deleteInstant(@RequestBody CareDirectiveInstantEntity careDirectiveInstantEntity) {
careDirectivePlanApi.deleteInstant(careDirectiveInstantEntity);
return Result.OK("操作成功");
}
/**
* PAD端编排护理流程-新增情绪/体型标签
*
* @param elderTagEntity
* @return
*/
@PostMapping(value = "/addElderTag")
public Result<?> addElderTag(@RequestBody ElderTagEntity elderTagEntity) {
return Result.OK(careDirectivePlanApi.addElderTag(elderTagEntity));
}
/**
* PAD端编排护理流程-修改情绪/体型标签
*
* @param elderTagEntity
* @return
*/
@PostMapping(value = "/editElderTag")
public Result<String> editElderTag(@RequestBody ElderTagEntity elderTagEntity) {
careDirectivePlanApi.editElderTag(elderTagEntity);
return Result.OK("操作成功");
}
/**
* PAD端编排护理流程-删除情绪/体型标签
*
* @param elderTagEntity
* @return
*/
@PostMapping(value = "/deleteElderTag")
public Result<String> deleteElderTag(@RequestBody ElderTagEntity elderTagEntity) {
careDirectivePlanApi.deleteElderTag(elderTagEntity);
return Result.OK("操作成功");
}
/**
* 获取指令包集合数据
*
* @param careDirectivePackageEntity
* @return
*/
@GetMapping(value = "/getNcPackagelist")
public Result<List<CareDirectivePackageEntity>> getNcPackagelist(CareDirectivePackageEntity careDirectivePackageEntity) {
List<CareDirectivePackageEntity> pageList = careDirectivePlanApi.getNcPackagelist(careDirectivePackageEntity);
return Result.OK(pageList);
}
}

111
nursing-unit-common/src/main/java/com/nu/entity/CareDirectiveEntity.java Normal file
View File

@ -0,0 +1,111 @@
package com.nu.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
/**
* @Description: 护理单元客户配置服务指令
* @Author: yangjun
* @Date: 2025-03-31
* @Version: V1.0
*/
@Data
public class CareDirectiveEntity implements Serializable {
private static final long serialVersionUID = 1L;
/**id*/
private String id;
/**护理单元id*/
private String nuId;
/**护理单元名称*/
private String nuName;
/**客户id*/
private String customerId;
/**客户姓名*/
private String customerName;
/**服务类别id*/
private String categoryId;
/**服务类别名称*/
private String categoryName;
/**服务类型id*/
private String typeId;
/**服务类型名称*/
private String typeName;
/**服务指令id*/
private String directiveId;
/**服务指令名称*/
private String directiveName;
/**周期类型ID*/
private String cycleTypeId;
/**周期类型*/
private String cycleType;
/**周期值*/
private String cycleValue;
/**即时指令图标*/
private String immediateFile;
/**即时指令图标*/
private String netImmediateFile;
/**即时指令焦点图标*/
private String immediateFileFocus;
/**即时指令焦点图标*/
private String netImmediateFileFocus;
/**服务指令图片大图*/
private String previewFile;
/**服务指令图片大图*/
private String netPreviewFile;
/**服务指令图片小图*/
private String previewFileSmall;
/**服务指令图片小图*/
private String netPreviewFileSmall;
/**指令音频文件*/
private String mp3File;
/**指令音频文件-网络地址*/
private String netMp3File;
/**指令视频文件*/
private String mp4File;
/**指令视频文件-网络地址*/
private String netMp4File;
/**服务指令时长*/
private String serviceDuration;
/**服务描述*/
private String serviceContent;
/**定位*/
private String positioning;
/**纵向定位*/
private String positioningLong;
/**PAD端无线循环使用*/
private String tagName;
/**开始时间*/
private String startTime;
/**结束时间*/
private String endTime;
/**创建人*/
private String createBy;
/**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**更新人*/
private String updateBy;
/**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date updateTime;
/**所属部门*/
private String sysOrgCode;
/**是否是服务指令包 N否 Y是*/
private String izPackage;
private String packageId;
/**即时服务指令列表**/
private List<CareDirectiveInstantEntity> instantList;
/**长者标签列表**/
private List<ElderTagEntity> tagList;
}

88
nursing-unit-common/src/main/java/com/nu/entity/CareDirectiveInstantEntity.java Normal file
View File

@ -0,0 +1,88 @@
package com.nu.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
/**
* @Description: 护理单元客户配置服务指令即时指令
* @Author: yangjun
* @Date: 2025-03-31
* @Version: V1.0
*/
@Data
public class CareDirectiveInstantEntity implements Serializable {
private static final long serialVersionUID = 1L;
/**id*/
private String id;
/**护理单元id*/
private String nuId;
/**护理单元名称*/
private String nuName;
/**客户id*/
private String customerId;
/**客户姓名*/
private String customerName;
/**服务类别id*/
private String categoryId;
/**服务类别名称*/
private String categoryName;
/**服务类型id*/
private String typeId;
/**服务类型名称*/
private String typeName;
/**服务指令id*/
private String directiveId;
/**服务指令名称*/
private String directiveName;
/**即时指令图标*/
private String immediateFile;
/**即时指令图标*/
private String netImmediateFile;
/**即时指令焦点图标*/
private String immediateFileFocus;
/**即时指令焦点图标*/
private String netImmediateFileFocus;
/**服务指令图片大图*/
private String previewFile;
/**服务指令图片大图*/
private String netPreviewFile;
/**服务指令图片小图*/
private String previewFileSmall;
/**服务指令图片小图*/
private String netPreviewFileSmall;
/**指令音频文件*/
private String mp3File;
/**指令音频文件-网络地址*/
private String netMp3File;
/**指令视频文件*/
private String mp4File;
/**指令视频文件-网络地址*/
private String netMp4File;
/**服务时长（分钟）*/
private String serviceDuration;
/**服务描述*/
private String serviceContent;
/**创建人*/
private String createBy;
/**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**更新人*/
private String updateBy;
/**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date updateTime;
/**所属部门*/
private String sysOrgCode;
/**是否是服务指令包 N否 Y是*/
private String izPackage;
/**排序*/
private Long sort;
}

56
nursing-unit-common/src/main/java/com/nu/entity/CareDirectivePackageEntity.java Normal file
View File

@ -0,0 +1,56 @@
package com.nu.entity;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.jeecg.common.aspect.annotation.Dict;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.List;
/**
* @Description: 服务指令包
* @Author: 张明远
* @Date: 2025-03-24
* @Version: V1.0
*/
@Data
public class CareDirectivePackageEntity implements Serializable {
private static final long serialVersionUID = 1L;
/**id*/
private String id;
/**服务指令包名称*/
private String packageName;
/**服务指令包总时长*/
private Long serviceDuration;
/**备注*/
private String description;
/**排序*/
private Integer sort;
/**是否启用 Y启用 N未启用*/
private String izEnabled;
/**是否删除 0未删除 1删除*/
private String delFlag;
/**创建人*/
private String createBy;
/**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private java.util.Date createTime;
/**更新人*/
private String updateBy;
/**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private java.util.Date updateTime;
// 开始时间
private String startTimeStr;
// 结束时间
private String endTimeStr;
// 服务指令集合
private List<CareDirectiveEntity> directivesList;
}

59
nursing-unit-common/src/main/java/com/nu/entity/ElderTagEntity.java Normal file
View File

@ -0,0 +1,59 @@
package com.nu.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
/**
* @Description: 护理单元客户配置长者标签
* @Author: caolei
* @Date: 2025-10-13
* @Version: V1.0
*/
@Data
public class ElderTagEntity implements Serializable {
private static final long serialVersionUID = 1L;
/**id*/
private String id;
/**护理单元id*/
private String nuId;
/**护理单元名称*/
private String nuName;
/**客户id*/
private String customerId;
/**客户姓名*/
private String customerName;
/**长者标签ID*/
private String tagId;
/**长者标签名称*/
private String tagName;
/**长者标签类型*/
private String tagType;
/**图标*/
private String pic;
/**图标*/
private String netPic;
/**焦点图标*/
private String picFocus;
/**图标*/
private String netPicFocus;
/**创建人*/
private String createBy;
/**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**更新人*/
private String updateBy;
/**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date updateTime;
/**所属部门*/
private String sysOrgCode;
/**选中状态*/
private String izSelected;
}

6
nursing-unit-services/nu-services-api/nu-services-local-api/pom.xml
View File

@ -7,6 +7,12 @@
<artifactId>nu-services-api</artifactId> <artifactId>nu-services-api</artifactId>
<version>2.0.0</version> <version>2.0.0</version>
</parent> </parent>
<dependencies>
<dependency>
<groupId>com.nursingunit.boot</groupId>
<artifactId>nursing-unit-common</artifactId>
</dependency>
</dependencies>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>nu-services-local-api</artifactId> <artifactId>nu-services-local-api</artifactId>

8
nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/care/api/ICareDirectiveConfigApi.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 ICareDirectiveConfigApi {
List<Map<String, Object>> getServiceTree();
}

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

@ -0,0 +1,29 @@
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 java.util.List;
import java.util.Map;
public interface ICareDirectivePlanApi {
Map<String,Object> getPlanList(CareDirectiveEntity careDirectiveEntity);
CareDirectiveEntity addNuCustomerServer(CareDirectiveEntity careDirectiveEntity);
CareDirectiveEntity editNuCustomerServer(CareDirectiveEntity careDirectiveEntity);
void deleteNuCustomerServer(String id);
CareDirectiveEntity getNuCustomerServerById(String id);
void addBatch(CareDirectiveEntity careDirectiveEntity);
List<CareDirectivePackageEntity> getNcPackagelist(CareDirectivePackageEntity careDirectivePackageEntity);
CareDirectiveEntity addDirective(CareDirectiveEntity careDirectiveEntity);
void editDirective(CareDirectiveEntity careDirectiveEntity);
void deleteDirective(CareDirectiveEntity careDirectiveEntity);
CareDirectiveInstantEntity addInstant(CareDirectiveInstantEntity careDirectiveInstantEntity);
void editInstant(CareDirectiveInstantEntity careDirectiveInstantEntity);
void deleteInstant(CareDirectiveInstantEntity careDirectiveInstantEntity);
ElderTagEntity addElderTag(ElderTagEntity elderTagEntity);
void editElderTag(ElderTagEntity elderTagEntity);
void deleteElderTag(ElderTagEntity elderTagEntity);
}

30
nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/entity/NuConfigServiceCategory.java → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/entity/CareConfigServiceCategory.java
View File

@ -1,4 +1,4 @@
package com.nu.modules.nuApiServiceCategory.entity; package com.nu.modules.biz.care.config.entity;
import java.io.Serializable; import java.io.Serializable;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
@ -30,57 +30,57 @@ import lombok.experimental.Accessors;
@TableName("nu_config_service_category") @TableName("nu_config_service_category")
@Accessors(chain = true) @Accessors(chain = true)
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)
public class NuConfigServiceCategory implements Serializable { public class CareConfigServiceCategory implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/**id*/ /**id*/
@TableId(type = IdType.ASSIGN_ID) @TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "id") @ApiModelProperty(value = "id")
private java.lang.String id; private String id;
/**服务类别名称*/ /**服务类别名称*/
@Excel(name = "服务类别名称", width = 15) @Excel(name = "服务类别名称", width = 15)
@ApiModelProperty(value = "服务类别名称") @ApiModelProperty(value = "服务类别名称")
private java.lang.String categoryName; private String categoryName;
@Excel(name = "分类标签id", width = 15) @Excel(name = "分类标签id", width = 15)
@ApiModelProperty(value = "分类标签id") @ApiModelProperty(value = "分类标签id")
private java.lang.String instructionId; private String instructionId;
/**排序*/ /**排序*/
@Excel(name = "排序", width = 15) @Excel(name = "排序", width = 15)
@ApiModelProperty(value = "排序") @ApiModelProperty(value = "排序")
private java.lang.Integer sort; private Integer sort;
/**是否启用 Y启用 N未启用*/ /**是否启用 Y启用 N未启用*/
@Excel(name = "是否启用 Y启用 N未启用", width = 15) @Excel(name = "是否启用 Y启用 N未启用", width = 15)
@ApiModelProperty(value = "是否启用 Y启用 N未启用") @ApiModelProperty(value = "是否启用 Y启用 N未启用")
private java.lang.String izEnabled; private String izEnabled;
/**是否删除 0未删除 1删除*/ /**是否删除 0未删除 1删除*/
@Excel(name = "是否删除 0未删除 1删除", width = 15) @Excel(name = "是否删除 0未删除 1删除", width = 15)
@ApiModelProperty(value = "是否删除 0未删除 1删除") @ApiModelProperty(value = "是否删除 0未删除 1删除")
@TableLogic @TableLogic
private java.lang.String delFlag; private String delFlag;
/**创建人*/ /**创建人*/
@ApiModelProperty(value = "创建人") @ApiModelProperty(value = "创建人")
private java.lang.String createBy; private String createBy;
/**创建日期*/ /**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建日期") @ApiModelProperty(value = "创建日期")
private java.util.Date createTime; private Date createTime;
/**更新人*/ /**更新人*/
@ApiModelProperty(value = "更新人") @ApiModelProperty(value = "更新人")
private java.lang.String updateBy; private String updateBy;
/**更新日期*/ /**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新日期") @ApiModelProperty(value = "更新日期")
private java.util.Date updateTime; private Date updateTime;
/**所属部门*/ /**所属部门*/
@ApiModelProperty(value = "所属部门") @ApiModelProperty(value = "所属部门")
private java.lang.String sysOrgCode; private String sysOrgCode;
/**网络标记，0为用pad本地静态图片，1为用网络图*/ /**网络标记，0为用pad本地静态图片，1为用网络图*/
@ApiModelProperty(value = "网络标记") @ApiModelProperty(value = "网络标记")
private java.lang.String netFlag; private String netFlag;
/**动画图片*/ /**动画图片*/
@ApiModelProperty(value = "动画图片") @ApiModelProperty(value = "动画图片")
private java.lang.String animationPath; private String animationPath;
} }

64
nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/entity/NuConfigServiceDirective.java → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/entity/CareConfigServiceDirective.java
View File

@ -1,4 +1,4 @@
package com.nu.modules.nuApiServiceCategory.entity; package com.nu.modules.biz.care.config.entity;
import java.io.Serializable; import java.io.Serializable;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
@ -28,136 +28,136 @@ import lombok.experimental.Accessors;
@TableName("nu_config_service_directive") @TableName("nu_config_service_directive")
@Accessors(chain = true) @Accessors(chain = true)
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)
public class NuConfigServiceDirective implements Serializable { public class CareConfigServiceDirective implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/**id*/ /**id*/
@TableId(type = IdType.ASSIGN_ID) @TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "id") @ApiModelProperty(value = "id")
private java.lang.String id; private String id;
/**服务指令名称*/ /**服务指令名称*/
@Excel(name = "服务指令名称", width = 15) @Excel(name = "服务指令名称", width = 15)
@ApiModelProperty(value = "服务指令名称") @ApiModelProperty(value = "服务指令名称")
private java.lang.String directiveName; private String directiveName;
/**服务类别id*/ /**服务类别id*/
@Excel(name = "服务类别id", width = 15) @Excel(name = "服务类别id", width = 15)
@ApiModelProperty(value = "服务类别id") @ApiModelProperty(value = "服务类别id")
private java.lang.String categoryId; private String categoryId;
/**服务类别*/ /**服务类别*/
@Excel(name = "服务类别", width = 15) @Excel(name = "服务类别", width = 15)
@ApiModelProperty(value = "服务类别") @ApiModelProperty(value = "服务类别")
@TableField(exist = false) @TableField(exist = false)
private java.lang.String categoryName; private String categoryName;
/**服务类型id*/ /**服务类型id*/
@Excel(name = "服务类型id", width = 15) @Excel(name = "服务类型id", width = 15)
@ApiModelProperty(value = "服务类型id") @ApiModelProperty(value = "服务类型id")
private java.lang.String typeId; private String typeId;
/**服务类型*/ /**服务类型*/
@Excel(name = "服务类型", width = 15) @Excel(name = "服务类型", width = 15)
@ApiModelProperty(value = "服务类型") @ApiModelProperty(value = "服务类型")
@TableField(exist = false) @TableField(exist = false)
private java.lang.String typeName; private String typeName;
/**指令标签id*/ /**指令标签id*/
@Excel(name = "指令标签id", width = 15) @Excel(name = "指令标签id", width = 15)
@ApiModelProperty(value = "指令标签id") @ApiModelProperty(value = "指令标签id")
private java.lang.String instructionTagId; private String instructionTagId;
/**收费价格*/ /**收费价格*/
@Excel(name = "收费价格", width = 15) @Excel(name = "收费价格", width = 15)
@ApiModelProperty(value = "收费价格") @ApiModelProperty(value = "收费价格")
private java.math.BigDecimal tollPrice; private BigDecimal tollPrice;
/**提成价格*/ /**提成价格*/
@Excel(name = "提成价格", width = 15) @Excel(name = "提成价格", width = 15)
@ApiModelProperty(value = "提成价格") @ApiModelProperty(value = "提成价格")
private java.math.BigDecimal comPrice; private BigDecimal comPrice;
/**是否参与医保报销 0不报销 1报销*/ /**是否参与医保报销 0不报销 1报销*/
@Excel(name = "是否参与医保报销 0不报销 1报销", width = 15) @Excel(name = "是否参与医保报销 0不报销 1报销", width = 15)
@ApiModelProperty(value = "是否参与医保报销 0不报销 1报销") @ApiModelProperty(value = "是否参与医保报销 0不报销 1报销")
private java.lang.String izReimbursement; private String izReimbursement;
/**是否参与机构优惠 0不参与 1参与*/ /**是否参与机构优惠 0不参与 1参与*/
@Excel(name = "是否参与机构优惠 0不参与 1参与", width = 15) @Excel(name = "是否参与机构优惠 0不参与 1参与", width = 15)
@ApiModelProperty(value = "是否参与机构优惠 0不参与 1参与") @ApiModelProperty(value = "是否参与机构优惠 0不参与 1参与")
private java.lang.String izPreferential; private String izPreferential;
/**收费频次 1按次收费 2按天收费*/ /**收费频次 1按次收费 2按天收费*/
@Excel(name = "收费频次 1按次收费 2按天收费", width = 15) @Excel(name = "收费频次 1按次收费 2按天收费", width = 15)
@ApiModelProperty(value = "收费频次 1按次收费 2按天收费") @ApiModelProperty(value = "收费频次 1按次收费 2按天收费")
private java.lang.String chargingFrequency; private String chargingFrequency;
/**周期类型 1日常护理 2周期护理 3即时护理*/ /**周期类型 1日常护理 2周期护理 3即时护理*/
@Excel(name = "周期类型 1日常护理 2周期护理 3即时护理", width = 15) @Excel(name = "周期类型 1日常护理 2周期护理 3即时护理", width = 15)
@ApiModelProperty(value = "周期类型 1日常护理 2周期护理 3即时护理") @ApiModelProperty(value = "周期类型 1日常护理 2周期护理 3即时护理")
private java.lang.String cycleType; private String cycleType;
/**周期类型 1日常护理 2周期护理 3即时护理*/ /**周期类型 1日常护理 2周期护理 3即时护理*/
@Excel(name = "周期类型 1日常护理 2周期护理 3即时护理", width = 15) @Excel(name = "周期类型 1日常护理 2周期护理 3即时护理", width = 15)
@ApiModelProperty(value = "周期类型 1日常护理 2周期护理 3即时护理") @ApiModelProperty(value = "周期类型 1日常护理 2周期护理 3即时护理")
@TableField(exist = false) @TableField(exist = false)
private java.lang.String cycleTypeName; private String cycleTypeName;
/**排序*/ /**排序*/
@Excel(name = "排序", width = 15) @Excel(name = "排序", width = 15)
@ApiModelProperty(value = "排序") @ApiModelProperty(value = "排序")
private java.lang.Integer sort; private Integer sort;
/**服务说明*/ /**服务说明*/
@Excel(name = "服务说明", width = 15) @Excel(name = "服务说明", width = 15)
@ApiModelProperty(value = "服务说明") @ApiModelProperty(value = "服务说明")
private java.lang.String serviceContent; private String serviceContent;
/**服务时长（分钟）*/ /**服务时长（分钟）*/
@Excel(name = "服务时长（分钟）", width = 15) @Excel(name = "服务时长（分钟）", width = 15)
@ApiModelProperty(value = "服务时长（分钟）") @ApiModelProperty(value = "服务时长（分钟）")
private java.lang.String serviceDuration; private String serviceDuration;
/**是否启用 Y启用 N未启用*/ /**是否启用 Y启用 N未启用*/
@Excel(name = "是否启用 Y启用 N未启用", width = 15) @Excel(name = "是否启用 Y启用 N未启用", width = 15)
@ApiModelProperty(value = "是否启用 Y启用 N未启用") @ApiModelProperty(value = "是否启用 Y启用 N未启用")
private java.lang.String izEnabled; private String izEnabled;
/**是否删除 0未删除 1删除*/ /**是否删除 0未删除 1删除*/
@Excel(name = "是否删除 0未删除 1删除", width = 15) @Excel(name = "是否删除 0未删除 1删除", width = 15)
@ApiModelProperty(value = "是否删除 0未删除 1删除") @ApiModelProperty(value = "是否删除 0未删除 1删除")
@TableLogic @TableLogic
private java.lang.String delFlag; private String delFlag;
/**创建人*/ /**创建人*/
@ApiModelProperty(value = "创建人") @ApiModelProperty(value = "创建人")
private java.lang.String createBy; private String createBy;
/**创建日期*/ /**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建日期") @ApiModelProperty(value = "创建日期")
private java.util.Date createTime; private Date createTime;
/**更新人*/ /**更新人*/
@ApiModelProperty(value = "更新人") @ApiModelProperty(value = "更新人")
private java.lang.String updateBy; private String updateBy;
/**更新日期*/ /**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新日期") @ApiModelProperty(value = "更新日期")
private java.util.Date updateTime; private Date updateTime;
/**所属部门*/ /**所属部门*/
@ApiModelProperty(value = "所属部门") @ApiModelProperty(value = "所属部门")
private java.lang.String sysOrgCode; private String sysOrgCode;
/**语音文件*/ /**语音文件*/
@Excel(name = "语音文件", width = 15) @Excel(name = "语音文件", width = 15)
@ApiModelProperty(value = "语音文件") @ApiModelProperty(value = "语音文件")
private java.lang.String mp3File; private String mp3File;
/**视频文件*/ /**视频文件*/
@Excel(name = "视频文件", width = 15) @Excel(name = "视频文件", width = 15)
@ApiModelProperty(value = "视频文件") @ApiModelProperty(value = "视频文件")
private java.lang.String mp4File; private String mp4File;
/** /**
* 即时指令图标 * 即时指令图标
*/ */
@ApiModelProperty(value = "即时指令图标") @ApiModelProperty(value = "即时指令图标")
private java.lang.String immediateFile; private String immediateFile;
/** /**
* 即时指令焦点图标 * 即时指令焦点图标
*/ */
@ApiModelProperty(value = "即时指令图标") @ApiModelProperty(value = "即时指令图标")
private java.lang.String immediateFileFocus; private String immediateFileFocus;
/** /**
* 服务指令图片大图 * 服务指令图片大图
*/ */
@ApiModelProperty(value = "服务指令图片大图") @ApiModelProperty(value = "服务指令图片大图")
private java.lang.String previewFile; private String previewFile;
/** /**
* 服务指令图片小图 * 服务指令图片小图
*/ */
@ApiModelProperty(value = "服务指令图片小图") @ApiModelProperty(value = "服务指令图片小图")
private java.lang.String previewFileSmall; private String previewFileSmall;
//体型标签 //体型标签
@TableField(exist = false) @TableField(exist = false)
private String bodyTagName; private String bodyTagName;

30
nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/entity/NuConfigServiceType.java → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/entity/CareConfigServiceType.java
View File

@ -1,4 +1,4 @@
package com.nu.modules.nuApiServiceCategory.entity; package com.nu.modules.biz.care.config.entity;
import java.io.Serializable; import java.io.Serializable;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
@ -30,57 +30,57 @@ import lombok.experimental.Accessors;
@TableName("nu_config_service_type") @TableName("nu_config_service_type")
@Accessors(chain = true) @Accessors(chain = true)
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)
public class NuConfigServiceType implements Serializable { public class CareConfigServiceType implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/**id*/ /**id*/
@TableId(type = IdType.ASSIGN_ID) @TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "id") @ApiModelProperty(value = "id")
private java.lang.String id; private String id;
/**服务类别id*/ /**服务类别id*/
@Excel(name = "服务类别id", width = 15) @Excel(name = "服务类别id", width = 15)
@ApiModelProperty(value = "服务类别id") @ApiModelProperty(value = "服务类别id")
private java.lang.String categoryId; private String categoryId;
/**服务类型名称*/ /**服务类型名称*/
@Excel(name = "服务类型名称", width = 15) @Excel(name = "服务类型名称", width = 15)
@ApiModelProperty(value = "服务类型名称") @ApiModelProperty(value = "服务类型名称")
private java.lang.String typeName; private String typeName;
/**排序*/ /**排序*/
@Excel(name = "排序", width = 15) @Excel(name = "排序", width = 15)
@ApiModelProperty(value = "排序") @ApiModelProperty(value = "排序")
private java.lang.Integer sort; private Integer sort;
/**是否启用 Y启用 N未启用*/ /**是否启用 Y启用 N未启用*/
@Excel(name = "是否启用 Y启用 N未启用", width = 15) @Excel(name = "是否启用 Y启用 N未启用", width = 15)
@ApiModelProperty(value = "是否启用 Y启用 N未启用") @ApiModelProperty(value = "是否启用 Y启用 N未启用")
private java.lang.String izEnabled; private String izEnabled;
/**是否删除 0未删除 1删除*/ /**是否删除 0未删除 1删除*/
@Excel(name = "是否删除 0未删除 1删除", width = 15) @Excel(name = "是否删除 0未删除 1删除", width = 15)
@ApiModelProperty(value = "是否删除 0未删除 1删除") @ApiModelProperty(value = "是否删除 0未删除 1删除")
@TableLogic @TableLogic
private java.lang.String delFlag; private String delFlag;
/**创建人*/ /**创建人*/
@ApiModelProperty(value = "创建人") @ApiModelProperty(value = "创建人")
private java.lang.String createBy; private String createBy;
/**创建日期*/ /**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建日期") @ApiModelProperty(value = "创建日期")
private java.util.Date createTime; private Date createTime;
/**更新人*/ /**更新人*/
@ApiModelProperty(value = "更新人") @ApiModelProperty(value = "更新人")
private java.lang.String updateBy; private String updateBy;
/**更新日期*/ /**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新日期") @ApiModelProperty(value = "更新日期")
private java.util.Date updateTime; private Date updateTime;
/**所属部门*/ /**所属部门*/
@ApiModelProperty(value = "所属部门") @ApiModelProperty(value = "所属部门")
private java.lang.String sysOrgCode; private String sysOrgCode;
/**网络标记，0为用pad本地静态图片，1为用网络图*/ /**网络标记，0为用pad本地静态图片，1为用网络图*/
@ApiModelProperty(value = "网络标记") @ApiModelProperty(value = "网络标记")
private java.lang.String netFlag; private String netFlag;
/**动画图片*/ /**动画图片*/
@ApiModelProperty(value = "动画图片") @ApiModelProperty(value = "动画图片")
private java.lang.String animationPath; private String animationPath;
} }

4
nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/entity/NuInstructionTag.java → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/entity/CareInstructionTag.java
View File

@ -1,4 +1,4 @@
package com.nu.modules.nuApiServiceCategory.entity; package com.nu.modules.biz.care.config.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
@ -27,7 +27,7 @@ import java.util.Date;
@TableName("nu_config_service_instruction_tag") @TableName("nu_config_service_instruction_tag")
@Accessors(chain = true) @Accessors(chain = true)
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)
public class NuInstructionTag implements Serializable { public class CareInstructionTag implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/**id*/ /**id*/

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

@ -0,0 +1,14 @@
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 Normal file
View File

@ -0,0 +1,14 @@
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 Normal file
View File

@ -0,0 +1,14 @@
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 Normal file
View File

@ -0,0 +1,14 @@
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> {
}

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

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

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

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

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

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

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

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

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

@ -0,0 +1,14 @@
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 Normal file
View File

@ -0,0 +1,14 @@
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 Normal file
View File

@ -0,0 +1,14 @@
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 Normal file
View File

@ -0,0 +1,14 @@
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> {
}

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

@ -1,17 +1,18 @@
package com.nu.modules.nuApiServiceCategory.service.impl; package com.nu.modules.biz.care.config.service.impl;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.nu.modules.nuApiServiceCategory.entity.NuConfigServiceCategory; import com.nu.modules.biz.care.config.entity.CareConfigServiceCategory;
import com.nu.modules.nuApiServiceCategory.entity.NuConfigServiceDirective; import com.nu.modules.biz.care.config.entity.CareConfigServiceDirective;
import com.nu.modules.nuApiServiceCategory.entity.NuConfigServiceType; import com.nu.modules.biz.care.config.entity.CareConfigServiceType;
import com.nu.modules.nuApiServiceCategory.entity.NuInstructionTag; import com.nu.modules.biz.care.config.entity.CareInstructionTag;
import com.nu.modules.nuApiServiceCategory.mapper.NuConfigServiceCategoryMapper; import com.nu.modules.biz.care.config.mapper.CareConfigServiceCategoryMapper;
import com.nu.modules.nuApiServiceCategory.service.INuConfigServiceCategoryService; import com.nu.modules.biz.care.config.service.ICareConfigServiceCategoryService;
import com.nu.modules.nuApiServiceCategory.service.INuConfigServiceDirectiveService; import com.nu.modules.biz.care.config.service.ICareConfigServiceDirectiveService;
import com.nu.modules.nuApiServiceCategory.service.INuConfigServiceTypeService; import com.nu.modules.biz.care.config.service.ICareConfigServiceTypeService;
import com.nu.modules.nuApiServiceCategory.service.INuInstructionTagService; import com.nu.modules.biz.care.config.service.ICareInstructionTagService;
import com.nu.modules.care.api.ICareDirectiveConfigApi;
import com.nu.modules.sysconfig.ISysConfigApi; import com.nu.modules.sysconfig.ISysConfigApi;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -29,59 +30,56 @@ import java.util.Map;
* @Version: V1.0 * @Version: V1.0
*/ */
@Service @Service
public class NuConfigServiceCategoryServiceImpl extends ServiceImpl<NuConfigServiceCategoryMapper, NuConfigServiceCategory> implements INuConfigServiceCategoryService { public class CareConfigServiceCategoryServiceImpl extends ServiceImpl<CareConfigServiceCategoryMapper, CareConfigServiceCategory> implements ICareConfigServiceCategoryService, ICareDirectiveConfigApi {
@Autowired @Autowired
private INuInstructionTagService nuInstructionTagService; private ICareInstructionTagService instructionTagService;
@Autowired @Autowired
private INuConfigServiceTypeService nuConfigServiceTypeService; private ICareConfigServiceTypeService configServiceTypeService;
@Autowired @Autowired
private INuConfigServiceDirectiveService nuConfigServiceDirectiveService; private ICareConfigServiceDirectiveService configServiceDirectiveService;
@Autowired @Autowired
private ISysConfigApi sysConfigApi; private ISysConfigApi sysConfigApi;
@Override @Override
public List<Map<String, Object>> getServiceTree(NuConfigServiceCategory nuConfigServiceCategory) { public List<Map<String, Object>> getServiceTree() {
//缓存媒体地址 //缓存媒体地址
String mediaAddress = getOpeMediaAddress(); String mediaAddress = getOpeMediaAddress();
//查询护理类服务 //查询护理类服务
QueryWrapper<NuInstructionTag> instructionTagQueryWrapper = new QueryWrapper<>(); QueryWrapper<CareInstructionTag> instructionTagQueryWrapper = new QueryWrapper<>();
instructionTagQueryWrapper.eq("iz_enabled", "Y"); instructionTagQueryWrapper.eq("iz_enabled", "Y");
instructionTagQueryWrapper.eq("del_flag", "0"); instructionTagQueryWrapper.eq("del_flag", "0");
instructionTagQueryWrapper.eq("instruction_type", "1"); instructionTagQueryWrapper.eq("instruction_type", "1");
List<NuInstructionTag> instructionTagList = nuInstructionTagService.list(instructionTagQueryWrapper); List<CareInstructionTag> instructionTagList = instructionTagService.list(instructionTagQueryWrapper);
Map<String, Object> tagMap = new HashMap<String, Object>(); Map<String, Object> tagMap = new HashMap<String, Object>();
for (NuInstructionTag par : instructionTagList) { for (CareInstructionTag par : instructionTagList) {
tagMap.put(par.getId(), par.getInstructionName()); tagMap.put(par.getId(), par.getInstructionName());
} }
//查询服务类别数据 //查询服务类别数据
QueryWrapper<NuConfigServiceCategory> categoryQueryWrapper = new QueryWrapper<>(); QueryWrapper<CareConfigServiceCategory> categoryQueryWrapper = new QueryWrapper<>();
categoryQueryWrapper.eq("iz_enabled", "Y"); categoryQueryWrapper.eq("iz_enabled", "Y");
categoryQueryWrapper.eq("del_flag", "0"); categoryQueryWrapper.eq("del_flag", "0");
List<NuConfigServiceCategory> categoryList = baseMapper.selectList(categoryQueryWrapper); List<CareConfigServiceCategory> categoryList = baseMapper.selectList(categoryQueryWrapper);
//查询服务类型数据 //查询服务类型数据
QueryWrapper<NuConfigServiceType> typeQueryWrapper = new QueryWrapper<>(); QueryWrapper<CareConfigServiceType> typeQueryWrapper = new QueryWrapper<>();
typeQueryWrapper.eq("iz_enabled", "Y"); typeQueryWrapper.eq("iz_enabled", "Y");
typeQueryWrapper.eq("del_flag", "0"); typeQueryWrapper.eq("del_flag", "0");
List<NuConfigServiceType> typeList = nuConfigServiceTypeService.list(typeQueryWrapper); List<CareConfigServiceType> typeList = configServiceTypeService.list(typeQueryWrapper);
//查询服务指令数据 //查询服务指令数据
QueryWrapper<NuConfigServiceDirective> directiveQueryWrapper = new QueryWrapper<>(); QueryWrapper<CareConfigServiceDirective> directiveQueryWrapper = new QueryWrapper<>();
directiveQueryWrapper.eq("iz_enabled", "Y"); directiveQueryWrapper.eq("iz_enabled", "Y");
directiveQueryWrapper.eq("del_flag", "0"); directiveQueryWrapper.eq("del_flag", "0");
List<NuConfigServiceDirective> directiveList = nuConfigServiceDirectiveService.list(directiveQueryWrapper); List<CareConfigServiceDirective> directiveList = configServiceDirectiveService.list(directiveQueryWrapper);
//封装服务指令和服务类型tree集合 //封装服务指令和服务类型tree集合
List<Map<String, Object>> typeMapList = new ArrayList<>(); List<Map<String, Object>> typeMapList = new ArrayList<>();
for (NuConfigServiceType par : typeList) { for (CareConfigServiceType par : typeList) {
Map<String, Object> wllxMap = new HashMap<String, Object>(); Map<String, Object> wllxMap = new HashMap<String, Object>();
List<Map<String, Object>> directiceMapList = new ArrayList<Map<String, Object>>(); List<Map<String, Object>> directiceMapList = new ArrayList<Map<String, Object>>();
for (NuConfigServiceDirective directicePar : directiveList) { for (CareConfigServiceDirective directicePar : directiveList) {
if (StringUtils.equals(directicePar.getTypeId(), par.getId())) { if (StringUtils.equals(directicePar.getTypeId(), par.getId())) {
if(directicePar.getId().equals("10129a2a776db9a44588fdaf4926659b9bc")){
System.out.println("111");
}
Map<String, Object> directiceMap = new HashMap<String, Object>(); Map<String, Object> directiceMap = new HashMap<String, Object>();
directiceMap.put("id", directicePar.getId()); directiceMap.put("id", directicePar.getId());
directiceMap.put("title", directicePar.getDirectiveName()); directiceMap.put("title", directicePar.getDirectiveName());
@ -163,7 +161,7 @@ public class NuConfigServiceCategoryServiceImpl extends ServiceImpl<NuConfigServ
//封装服务类别服务类型tree集合 //封装服务类别服务类型tree集合
List<Map<String, Object>> treeList = new ArrayList<>(); List<Map<String, Object>> treeList = new ArrayList<>();
int index = 0; int index = 0;
for (NuConfigServiceCategory par : categoryList) { for (CareConfigServiceCategory par : categoryList) {
index++; index++;
Map<String, Object> infoMap = new HashMap<String, Object>(); Map<String, Object> infoMap = new HashMap<String, Object>();
List<Map<String, Object>> wllxMap2List = new ArrayList<Map<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/care/config/service/impl/CareConfigServiceDirectiveServiceImpl.java Normal file
View File

@ -0,0 +1,18 @@
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 Normal file
View File

@ -0,0 +1,19 @@
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 Normal file
View File

@ -0,0 +1,18 @@
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 {
}

6
nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/entity/DataPool.java → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/entity/DataPool.java
View File

@ -1,4 +1,4 @@
package com.nu.modules.directive.datapool.entity; package com.nu.modules.biz.care.datapool.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
@ -22,10 +22,10 @@ import java.util.Date;
* @Version: V1.0 * @Version: V1.0
*/ */
@Data @Data
@TableName("nu_biz_nu_directive_data_pool") @TableName("nu_biz_nu_care_directive_data_pool")
@Accessors(chain = true) @Accessors(chain = true)
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)
@ApiModel(value="nu_biz_nu_directive_data_pool对象", description="服务指令数据池主表") @ApiModel(value="nu_biz_nu_care_directive_data_pool对象", description="服务指令数据池主表")
public class DataPool implements Serializable { public class DataPool implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;

6
nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/entity/DataPoolSub.java → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/entity/DataPoolSub.java
View File

@ -1,4 +1,4 @@
package com.nu.modules.directive.datapool.entity; package com.nu.modules.biz.care.datapool.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
@ -19,10 +19,10 @@ import java.util.Date;
* @Version: V1.0 * @Version: V1.0
*/ */
@Data @Data
@TableName("nu_biz_nu_directive_data_pool_sub") @TableName("nu_biz_nu_care_directive_data_pool_sub")
@Accessors(chain = true) @Accessors(chain = true)
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)
@ApiModel(value="nu_biz_nu_directive_data_pool对象", description="服务指令数据池子表") @ApiModel(value="nu_biz_nu_care_directive_data_pool对象", description="服务指令数据池子表")
public class DataPoolSub implements Serializable { public class DataPoolSub implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/**id*/ /**id*/

4
nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/job/DataPoolJob.java → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/job/DataPoolJob.java
View File

@ -1,6 +1,6 @@
package com.nu.modules.directive.datapool.job; package com.nu.modules.biz.care.datapool.job;
import com.nu.modules.directive.datapool.service.IDataPoolService; import com.nu.modules.biz.care.datapool.service.IDataPoolService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
import org.jeecg.common.util.DateUtils; import org.jeecg.common.util.DateUtils;

5
nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/mapper/DataPoolMapper.java → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/mapper/DataPoolMapper.java
View File

@ -1,8 +1,7 @@
package com.nu.modules.directive.datapool.mapper; package com.nu.modules.biz.care.datapool.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.nu.modules.directive.datapool.entity.DataPool; import com.nu.modules.biz.care.datapool.entity.DataPool;
import com.nu.modules.directive.datapool.entity.DataPoolSub;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;

5
nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/mapper/DataPoolSubMapper.java → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/mapper/DataPoolSubMapper.java
View File

@ -1,8 +1,7 @@
package com.nu.modules.directive.datapool.mapper; package com.nu.modules.biz.care.datapool.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.nu.modules.directive.datapool.entity.DataPoolSub; import com.nu.modules.biz.care.datapool.entity.DataPoolSub;
import java.util.List; import java.util.List;
/** /**

34
nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/mapper/xml/DataPoolMapper.xml → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/mapper/xml/DataPoolMapper.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-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"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.nu.modules.directive.datapool.mapper.DataPoolMapper"> <mapper namespace="com.nu.modules.biz.care.datapool.mapper.DataPoolMapper">
<select id="queryPlanList" resultType="com.nu.modules.directive.datapool.entity.DataPool"> <select id="queryPlanList" resultType="com.nu.modules.biz.care.datapool.entity.DataPool">
select select
id as bizId, id as bizId,
nu_id as nuId, nu_id as nuId,
@ -52,7 +52,7 @@
</where> </where>
</select> </select>
<select id="queryPlanById" resultType="com.nu.modules.directive.datapool.entity.DataPool"> <select id="queryPlanById" resultType="com.nu.modules.biz.care.datapool.entity.DataPool">
select select
id as bizId, id as bizId,
nu_id as nuId, nu_id as nuId,
@ -83,7 +83,7 @@
where id = #{id} where id = #{id}
</select> </select>
<select id="queryPoolOne" resultType="com.nu.modules.directive.datapool.entity.DataPool"> <select id="queryPoolOne" resultType="com.nu.modules.biz.care.datapool.entity.DataPool">
select select
id, id,
biz_id, biz_id,
@ -113,7 +113,7 @@
end_time, end_time,
iz_orders, iz_orders,
iz_start iz_start
from nu_biz_nu_directive_data_pool from nu_biz_nu_care_directive_data_pool
<where> <where>
<if test="bizId != null and bizId != ''"> <if test="bizId != null and bizId != ''">
AND biz_id = #{bizId} AND biz_id = #{bizId}
@ -139,7 +139,7 @@
</where> </where>
</select> </select>
<select id="queryInstantOne" resultType="com.nu.modules.directive.datapool.entity.DataPool"> <select id="queryInstantOne" resultType="com.nu.modules.biz.care.datapool.entity.DataPool">
select select
id, id,
biz_id, biz_id,
@ -168,7 +168,7 @@
start_time, start_time,
end_time, end_time,
iz_start iz_start
from nu_biz_nu_directive_data_pool from nu_biz_nu_care_directive_data_pool
<where> <where>
<if test="nuId != null and nuId != ''"> <if test="nuId != null and nuId != ''">
AND nu_id = #{nuId} AND nu_id = #{nuId}
@ -285,7 +285,7 @@
<update id="addDataPoolLog"> <update id="addDataPoolLog">
insert into ${tableName} insert into ${tableName}
select a.*,#{operationFlag} select a.*,#{operationFlag}
from nu_biz_nu_directive_data_pool a from nu_biz_nu_care_directive_data_pool a
<where> <where>
<if test="id != null and id != ''"> <if test="id != null and id != ''">
AND id = #{id} AND id = #{id}
@ -299,7 +299,7 @@
<update id="addDataPoolSubLog"> <update id="addDataPoolSubLog">
insert into ${tableName} insert into ${tableName}
select a.*,#{operationFlag} select a.*,#{operationFlag}
from nu_biz_nu_directive_data_pool_sub a from nu_biz_nu_care_directive_data_pool_sub a
<where> <where>
<if test="id != null and id != ''"> <if test="id != null and id != ''">
AND main_id = #{id} AND main_id = #{id}
@ -311,7 +311,7 @@
</update> </update>
<update id="deleteDataPool"> <update id="deleteDataPool">
delete from nu_biz_nu_directive_data_pool a delete from nu_biz_nu_care_directive_data_pool a
<where> <where>
<if test="id != null and id != ''"> <if test="id != null and id != ''">
AND id = #{id} AND id = #{id}
@ -323,7 +323,7 @@
</update> </update>
<update id="deleteDataPoolSub"> <update id="deleteDataPoolSub">
delete from nu_biz_nu_directive_data_pool_sub a delete from nu_biz_nu_care_directive_data_pool_sub a
<where> <where>
<if test="id != null and id != ''"> <if test="id != null and id != ''">
AND main_id = #{id} AND main_id = #{id}
@ -433,7 +433,7 @@
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '护理单元-服务指令-工单日志子表' ROW_FORMAT = Dynamic; ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '护理单元-服务指令-工单日志子表' ROW_FORMAT = Dynamic;
</update> </update>
<select id="queryOrdersOne" resultType="com.nu.modules.directive.datapool.entity.DataPool"> <select id="queryOrdersOne" resultType="com.nu.modules.biz.care.datapool.entity.DataPool">
select select
id, id,
nu_id, nu_id,
@ -463,7 +463,7 @@
start_time, start_time,
end_time, end_time,
iz_start iz_start
from nu_biz_nu_directive_order from nu_biz_nu_care_directive_order
where pool_id = #{id} where pool_id = #{id}
AND iz_start = #{izStart} AND iz_start = #{izStart}
</select> </select>
@ -471,24 +471,24 @@
<update id="addOrdersLog"> <update id="addOrdersLog">
insert into ${tableName} insert into ${tableName}
select a.*,#{remarks} select a.*,#{remarks}
from nu_biz_nu_directive_order a from nu_biz_nu_care_directive_order a
where id = #{id} where id = #{id}
</update> </update>
<update id="addOrdersSubLog"> <update id="addOrdersSubLog">
insert into ${tableName} insert into ${tableName}
select a.*,#{remarks} select a.*,#{remarks}
from nu_biz_nu_directive_order_sub a from nu_biz_nu_care_directive_order_sub a
where main_id = #{id} where main_id = #{id}
</update> </update>
<update id="deleteOrders"> <update id="deleteOrders">
delete from nu_biz_nu_directive_order delete from nu_biz_nu_care_directive_order
where id = #{id} where id = #{id}
</update> </update>
<update id="deleteOrdersSub"> <update id="deleteOrdersSub">
delete from nu_biz_nu_directive_order_sub a delete from nu_biz_nu_care_directive_order_sub a
where main_id = #{id} where main_id = #{id}
</update> </update>

6
nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/mapper/xml/DataPoolSubMapper.xml → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/mapper/xml/DataPoolSubMapper.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-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"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.nu.modules.directive.datapool.mapper.DataPoolSubMapper"> <mapper namespace="com.nu.modules.biz.care.datapool.mapper.DataPoolSubMapper">
<select id="queryDirectiveOne" resultType="com.nu.modules.directive.datapool.entity.DataPoolSub"> <select id="queryDirectiveOne" resultType="com.nu.modules.biz.care.datapool.entity.DataPoolSub">
select select
a.instruction_tag_id as instructionTagId, a.instruction_tag_id as instructionTagId,
b.instruction_name as instructionTagName, b.instruction_name as instructionTagName,
@ -28,7 +28,7 @@
where a.id = #{directiveId} where a.id = #{directiveId}
</select> </select>
<select id="queryDirectiveList" resultType="com.nu.modules.directive.datapool.entity.DataPoolSub"> <select id="queryDirectiveList" resultType="com.nu.modules.biz.care.datapool.entity.DataPoolSub">
select select
b.instruction_tag_id as instructionTagId, b.instruction_tag_id as instructionTagId,
e.instruction_name as instructionTagName, e.instruction_name as instructionTagName,

18
nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/service/IDataPoolService.java → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/service/IDataPoolService.java
View File

@ -1,8 +1,8 @@
package com.nu.modules.directive.datapool.service; package com.nu.modules.biz.care.datapool.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.nu.modules.NuBizNuCustomerServer.entity.NuBizNuCustomerServer; import com.nu.modules.biz.care.datapool.entity.DataPool;
import com.nu.modules.directive.datapool.entity.DataPool; import com.nu.modules.biz.care.plan.entity.PlanBizNuCustomerServer;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
/** /**
@ -20,21 +20,21 @@ public interface IDataPoolService extends IService<DataPool> {
/** /**
* 单一生成 * 单一生成
* @param nuBizNuCustomerServer * @param planBizNuCustomerServer
*/ */
void generateDataPool(NuBizNuCustomerServer nuBizNuCustomerServer); void generateDataPool(PlanBizNuCustomerServer planBizNuCustomerServer);
/** /**
* 删除 * 删除
* @param nuBizNuCustomerServer * @param planBizNuCustomerServer
*/ */
void deleteDataPool(NuBizNuCustomerServer nuBizNuCustomerServer); void deleteDataPool(PlanBizNuCustomerServer planBizNuCustomerServer);
/** /**
* 修改 * 修改
* @param nuBizNuCustomerServer * @param planBizNuCustomerServer
*/ */
void editDataPool(NuBizNuCustomerServer nuBizNuCustomerServer); void editDataPool(PlanBizNuCustomerServer planBizNuCustomerServer);
/** /**

5
nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/service/IDataPoolSubService.java → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/service/IDataPoolSubService.java
View File

@ -1,8 +1,7 @@
package com.nu.modules.directive.datapool.service; package com.nu.modules.biz.care.datapool.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.nu.modules.directive.datapool.entity.DataPoolSub; import com.nu.modules.biz.care.datapool.entity.DataPoolSub;
import java.util.List; import java.util.List;
/** /**

109
nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/service/impl/DataPoolServiceImpl.java → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/service/impl/DataPoolServiceImpl.java
View File

@ -1,14 +1,13 @@
package com.nu.modules.directive.datapool.service.impl; package com.nu.modules.biz.care.datapool.service.impl;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.nu.modules.NuBizNuCustomerServer.entity.NuBizNuCustomerServer; import com.nu.modules.biz.care.datapool.entity.DataPool;
import com.nu.modules.directive.datapool.entity.DataPool; import com.nu.modules.biz.care.datapool.entity.DataPoolSub;
import com.nu.modules.directive.datapool.entity.DataPoolSub; import com.nu.modules.biz.care.datapool.mapper.DataPoolMapper;
import com.nu.modules.directive.datapool.mapper.DataPoolMapper; import com.nu.modules.biz.care.datapool.service.IDataPoolService;
import com.nu.modules.directive.datapool.service.IDataPoolService; import com.nu.modules.biz.care.datapool.service.IDataPoolSubService;
import com.nu.modules.directive.datapool.service.IDataPoolSubService; import com.nu.modules.biz.care.plan.entity.PlanBizNuCustomerServer;
import com.nu.modules.directive.order.entity.OrdersSub;
import com.nu.modules.sysconfig.ISysConfigApi; import com.nu.modules.sysconfig.ISysConfigApi;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
@ -256,38 +255,38 @@ public class DataPoolServiceImpl extends ServiceImpl<DataPoolMapper, DataPool> i
/** /**
* 单一指令生成到数据池 * 单一指令生成到数据池
* @param nuBizNuCustomerServer * @param planBizNuCustomerServer
*/ */
@Override @Override
public void generateDataPool(NuBizNuCustomerServer nuBizNuCustomerServer){ public void generateDataPool(PlanBizNuCustomerServer planBizNuCustomerServer){
DataPool dataPool = new DataPool(); DataPool dataPool = new DataPool();
dataPool.setBizId(nuBizNuCustomerServer.getId()); dataPool.setBizId(planBizNuCustomerServer.getId());
dataPool.setNuId(nuBizNuCustomerServer.getNuId()); dataPool.setNuId(planBizNuCustomerServer.getNuId());
dataPool.setNuName(nuBizNuCustomerServer.getNuName()); dataPool.setNuName(planBizNuCustomerServer.getNuName());
dataPool.setCustomerId(nuBizNuCustomerServer.getCustomerId()); dataPool.setCustomerId(planBizNuCustomerServer.getCustomerId());
dataPool.setCustomerName(nuBizNuCustomerServer.getCustomerName()); dataPool.setCustomerName(planBizNuCustomerServer.getCustomerName());
if(nuBizNuCustomerServer.getIzPackage().equals("Y")){ if(planBizNuCustomerServer.getIzPackage().equals("Y")){
dataPool.setPackageId(nuBizNuCustomerServer.getDirectiveId()); dataPool.setPackageId(planBizNuCustomerServer.getDirectiveId());
dataPool.setPackageName(nuBizNuCustomerServer.getDirectiveName()); dataPool.setPackageName(planBizNuCustomerServer.getDirectiveName());
}else{ }else{
dataPool.setDirectiveId(nuBizNuCustomerServer.getDirectiveId()); dataPool.setDirectiveId(planBizNuCustomerServer.getDirectiveId());
dataPool.setDirectiveName(nuBizNuCustomerServer.getDirectiveName()); dataPool.setDirectiveName(planBizNuCustomerServer.getDirectiveName());
} }
dataPool.setCycleTypeId(nuBizNuCustomerServer.getCycleTypeId()); dataPool.setCycleTypeId(planBizNuCustomerServer.getCycleTypeId());
dataPool.setCycleType(nuBizNuCustomerServer.getCycleType()); dataPool.setCycleType(planBizNuCustomerServer.getCycleType());
dataPool.setCycleValue(nuBizNuCustomerServer.getCycleValue()); dataPool.setCycleValue(planBizNuCustomerServer.getCycleValue());
dataPool.setPreviewFile(nuBizNuCustomerServer.getPreviewFile()); dataPool.setPreviewFile(planBizNuCustomerServer.getPreviewFile());
dataPool.setNetPreviewFile(nuBizNuCustomerServer.getNetPreviewFile()); dataPool.setNetPreviewFile(planBizNuCustomerServer.getNetPreviewFile());
dataPool.setPreviewFileSmall(nuBizNuCustomerServer.getPreviewFileSmall()); dataPool.setPreviewFileSmall(planBizNuCustomerServer.getPreviewFileSmall());
dataPool.setNetPreviewFileSmall(nuBizNuCustomerServer.getNetPreviewFileSmall()); dataPool.setNetPreviewFileSmall(planBizNuCustomerServer.getNetPreviewFileSmall());
dataPool.setMp3File(nuBizNuCustomerServer.getMp3File()); dataPool.setMp3File(planBizNuCustomerServer.getMp3File());
dataPool.setNetMp3File(nuBizNuCustomerServer.getNetMp3File()); dataPool.setNetMp3File(planBizNuCustomerServer.getNetMp3File());
dataPool.setMp4File(nuBizNuCustomerServer.getMp4File()); dataPool.setMp4File(planBizNuCustomerServer.getMp4File());
dataPool.setNetMp4File(nuBizNuCustomerServer.getNetMp4File()); dataPool.setNetMp4File(planBizNuCustomerServer.getNetMp4File());
dataPool.setIzPackage(nuBizNuCustomerServer.getIzPackage()); dataPool.setIzPackage(planBizNuCustomerServer.getIzPackage());
dataPool.setServiceDuration(nuBizNuCustomerServer.getServiceDuration()); dataPool.setServiceDuration(planBizNuCustomerServer.getServiceDuration());
dataPool.setServiceContent(nuBizNuCustomerServer.getServiceContent()); dataPool.setServiceContent(planBizNuCustomerServer.getServiceContent());
String startTime = nuBizNuCustomerServer.getStartTime(); String startTime = planBizNuCustomerServer.getStartTime();
String[] starts = startTime.split(":"); String[] starts = startTime.split(":");
String hour = starts[0]; String hour = starts[0];
String minute = starts[1]; String minute = starts[1];
@ -297,7 +296,7 @@ public class DataPoolServiceImpl extends ServiceImpl<DataPoolMapper, DataPool> i
c.set(Calendar.SECOND,0); c.set(Calendar.SECOND,0);
c.set(Calendar.MILLISECOND,0); c.set(Calendar.MILLISECOND,0);
dataPool.setStartTime(c.getTime()); dataPool.setStartTime(c.getTime());
String endTime = nuBizNuCustomerServer.getEndTime(); String endTime = planBizNuCustomerServer.getEndTime();
String[] ends = endTime.split(":"); String[] ends = endTime.split(":");
hour = ends[0]; hour = ends[0];
minute = ends[1]; minute = ends[1];
@ -311,11 +310,11 @@ public class DataPoolServiceImpl extends ServiceImpl<DataPoolMapper, DataPool> i
/** /**
* 删除数据池 * 删除数据池
* @param nuBizNuCustomerServer * @param planBizNuCustomerServer
*/ */
@Override @Override
public void deleteDataPool(NuBizNuCustomerServer nuBizNuCustomerServer) { public void deleteDataPool(PlanBizNuCustomerServer planBizNuCustomerServer) {
String startTime = nuBizNuCustomerServer.getStartTime(); String startTime = planBizNuCustomerServer.getStartTime();
String[] starts = startTime.split(":"); String[] starts = startTime.split(":");
String hour = starts[0]; String hour = starts[0];
String minute = starts[1]; String minute = starts[1];
@ -325,17 +324,17 @@ public class DataPoolServiceImpl extends ServiceImpl<DataPoolMapper, DataPool> i
c.set(Calendar.SECOND,0); c.set(Calendar.SECOND,0);
c.set(Calendar.MILLISECOND,0); c.set(Calendar.MILLISECOND,0);
DataPool dataPool = new DataPool(); DataPool dataPool = new DataPool();
dataPool.setBizId(nuBizNuCustomerServer.getId()); dataPool.setBizId(planBizNuCustomerServer.getId());
dataPool.setNuId(nuBizNuCustomerServer.getNuId()); dataPool.setNuId(planBizNuCustomerServer.getNuId());
dataPool.setCustomerId(nuBizNuCustomerServer.getCustomerId()); dataPool.setCustomerId(planBizNuCustomerServer.getCustomerId());
dataPool.setStartTime(c.getTime()); dataPool.setStartTime(c.getTime());
// dataPool.setIzOrders("N"); // dataPool.setIzOrders("N");
dataPool.setIzStart("N"); dataPool.setIzStart("N");
String izPackage = nuBizNuCustomerServer.getIzPackage(); String izPackage = planBizNuCustomerServer.getIzPackage();
if(izPackage.equals("Y")){ if(izPackage.equals("Y")){
dataPool.setPackageId(nuBizNuCustomerServer.getDirectiveId()); dataPool.setPackageId(planBizNuCustomerServer.getDirectiveId());
}else{ }else{
dataPool.setDirectiveId(nuBizNuCustomerServer.getDirectiveId()); dataPool.setDirectiveId(planBizNuCustomerServer.getDirectiveId());
} }
DataPool pool = baseMapper.queryPoolOne(dataPool); DataPool pool = baseMapper.queryPoolOne(dataPool);
if(pool!=null){ if(pool!=null){
@ -367,7 +366,7 @@ public class DataPoolServiceImpl extends ServiceImpl<DataPoolMapper, DataPool> i
* 创建工单日志表 * 创建工单日志表
*/ */
private void addOrdersLog(String dateStr,DataPool dataPool){ private void addOrdersLog(String dateStr,DataPool dataPool){
String tableName = "nu_biz_nu_directive_order_log_"+dateStr.substring(2, 4)+dateStr.substring(5, 7); String tableName = "nu_biz_nu_care_directive_order_log_"+dateStr.substring(2, 4)+dateStr.substring(5, 7);
dataPool.setTableName(tableName); dataPool.setTableName(tableName);
baseMapper.createOrdersLog(dataPool);//创建日志主表 baseMapper.createOrdersLog(dataPool);//创建日志主表
dataPool.setRemarks("计划删除，删除未开始工单"); dataPool.setRemarks("计划删除，删除未开始工单");
@ -379,7 +378,7 @@ public class DataPoolServiceImpl extends ServiceImpl<DataPoolMapper, DataPool> i
* 创建工单日志表 * 创建工单日志表
*/ */
private void addOrdersSubLog(String dateStr,DataPool dataPool){ private void addOrdersSubLog(String dateStr,DataPool dataPool){
String tableName = "nu_biz_nu_directive_order_sub_log_"+dateStr.substring(2, 4)+dateStr.substring(5, 7); String tableName = "nu_biz_nu_care_directive_order_sub_log_"+dateStr.substring(2, 4)+dateStr.substring(5, 7);
dataPool.setTableName(tableName); dataPool.setTableName(tableName);
baseMapper.createOrdersLogSub(dataPool);//创建日志子表 baseMapper.createOrdersLogSub(dataPool);//创建日志子表
dataPool.setRemarks("计划删除，删除未开始工单"); dataPool.setRemarks("计划删除，删除未开始工单");
@ -389,12 +388,12 @@ public class DataPoolServiceImpl extends ServiceImpl<DataPoolMapper, DataPool> i
/** /**
* 编辑数据池 * 编辑数据池
* @param nuBizNuCustomerServer * @param planBizNuCustomerServer
*/ */
@Override @Override
public void editDataPool(NuBizNuCustomerServer nuBizNuCustomerServer) { public void editDataPool(PlanBizNuCustomerServer planBizNuCustomerServer) {
deleteDataPool(nuBizNuCustomerServer); deleteDataPool(planBizNuCustomerServer);
DataPool dataPool = baseMapper.queryPlanById(nuBizNuCustomerServer.getId()); DataPool dataPool = baseMapper.queryPlanById(planBizNuCustomerServer.getId());
DataPool pool = baseMapper.queryPoolOne(dataPool); DataPool pool = baseMapper.queryPoolOne(dataPool);
if(pool==null){ if(pool==null){
addDataPool(dataPool); addDataPool(dataPool);
@ -405,7 +404,7 @@ public class DataPoolServiceImpl extends ServiceImpl<DataPoolMapper, DataPool> i
* 创建日志表 * 创建日志表
*/ */
private void addDataPoolLog(String dateStr,String id){ private void addDataPoolLog(String dateStr,String id){
String tableName = "nu_biz_nu_directive_data_pool_log_"+dateStr.substring(2, 4)+dateStr.substring(5, 7); String tableName = "nu_biz_nu_care_directive_data_pool_log_"+dateStr.substring(2, 4)+dateStr.substring(5, 7);
DataPool dataPool = new DataPool(); DataPool dataPool = new DataPool();
dataPool.setTableName(tableName); dataPool.setTableName(tableName);
baseMapper.createDataPoolLog(dataPool);//创建日志主表 baseMapper.createDataPoolLog(dataPool);//创建日志主表
@ -419,7 +418,7 @@ public class DataPoolServiceImpl extends ServiceImpl<DataPoolMapper, DataPool> i
* 创建日志表 * 创建日志表
*/ */
private void addDataPoolSubLog(String dateStr,String id){ private void addDataPoolSubLog(String dateStr,String id){
String tableName = "nu_biz_nu_directive_data_pool_sub_log_"+dateStr.substring(2, 4)+dateStr.substring(5, 7); String tableName = "nu_biz_nu_care_directive_data_pool_sub_log_"+dateStr.substring(2, 4)+dateStr.substring(5, 7);
DataPool dataPool = new DataPool(); DataPool dataPool = new DataPool();
dataPool.setTableName(tableName); dataPool.setTableName(tableName);
baseMapper.createDataPoolLogSub(dataPool);//创建日志子表 baseMapper.createDataPoolLogSub(dataPool);//创建日志子表
@ -448,7 +447,7 @@ public class DataPoolServiceImpl extends ServiceImpl<DataPoolMapper, DataPool> i
* 创建日志表 * 创建日志表
*/ */
private void addDataPoolLogByClean(String dateStr){ private void addDataPoolLogByClean(String dateStr){
String tableName = "nu_biz_nu_directive_data_pool_log_"+dateStr.substring(2, 4)+dateStr.substring(5, 7); String tableName = "nu_biz_nu_care_directive_data_pool_log_"+dateStr.substring(2, 4)+dateStr.substring(5, 7);
DataPool dataPool = new DataPool(); DataPool dataPool = new DataPool();
dataPool.setTableName(tableName); dataPool.setTableName(tableName);
baseMapper.createDataPoolLog(dataPool);//创建日志主表 baseMapper.createDataPoolLog(dataPool);//创建日志主表
@ -467,7 +466,7 @@ public class DataPoolServiceImpl extends ServiceImpl<DataPoolMapper, DataPool> i
* 创建日志表 * 创建日志表
*/ */
private void addDataPoolSubLogByClean(String dateStr){ private void addDataPoolSubLogByClean(String dateStr){
String tableName = "nu_biz_nu_directive_data_pool_sub_log_"+dateStr.substring(2, 4)+dateStr.substring(5, 7); String tableName = "nu_biz_nu_care_directive_data_pool_sub_log_"+dateStr.substring(2, 4)+dateStr.substring(5, 7);
DataPool dataPool = new DataPool(); DataPool dataPool = new DataPool();
dataPool.setTableName(tableName); dataPool.setTableName(tableName);
baseMapper.createDataPoolLogSub(dataPool);//创建日志子表 baseMapper.createDataPoolLogSub(dataPool);//创建日志子表

9
nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/service/impl/DataPoolSubServiceImpl.java → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/service/impl/DataPoolSubServiceImpl.java
View File

@ -1,12 +1,11 @@
package com.nu.modules.directive.datapool.service.impl; package com.nu.modules.biz.care.datapool.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.nu.modules.directive.datapool.entity.DataPoolSub; import com.nu.modules.biz.care.datapool.entity.DataPoolSub;
import com.nu.modules.directive.datapool.mapper.DataPoolSubMapper; import com.nu.modules.biz.care.datapool.mapper.DataPoolSubMapper;
import com.nu.modules.directive.datapool.service.IDataPoolSubService; import com.nu.modules.biz.care.datapool.service.IDataPoolSubService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
/** /**

6
nursing-unit-api/src/main/java/com/nu/modules/directive/order/entity/Orders.java → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/entity/Orders.java
View File

@ -1,4 +1,4 @@
package com.nu.modules.directive.order.entity; package com.nu.modules.biz.care.order.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
@ -23,10 +23,10 @@ import java.util.Date;
* @Version: V1.0 * @Version: V1.0
*/ */
@Data @Data
@TableName("nu_biz_nu_directive_order") @TableName("nu_biz_nu_care_directive_order")
@Accessors(chain = true) @Accessors(chain = true)
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)
@ApiModel(value="nu_biz_nu_directive_order对象", description="服务指令工单主表") @ApiModel(value="nu_biz_nu_care_directive_order对象", description="服务指令工单主表")
public class Orders implements Serializable { public class Orders implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/**id*/ /**id*/

6
nursing-unit-api/src/main/java/com/nu/modules/directive/order/entity/OrdersSub.java → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/entity/OrdersSub.java
View File

@ -1,4 +1,4 @@
package com.nu.modules.directive.order.entity; package com.nu.modules.biz.care.order.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
@ -21,10 +21,10 @@ import java.util.Date;
* @Version: V1.0 * @Version: V1.0
*/ */
@Data @Data
@TableName("nu_biz_nu_directive_order_sub") @TableName("nu_biz_nu_care_directive_order_sub")
@Accessors(chain = true) @Accessors(chain = true)
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)
@ApiModel(value="nu_biz_nu_directive_order_sub对象", description="服务指令工单子表") @ApiModel(value="nu_biz_nu_care_directive_order_sub对象", description="服务指令工单子表")
public class OrdersSub implements Serializable { public class OrdersSub implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/**id*/ /**id*/

4
nursing-unit-api/src/main/java/com/nu/modules/directive/order/job/OrdersJob.java → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/job/OrdersJob.java
View File

@ -1,6 +1,6 @@
package com.nu.modules.directive.order.job; package com.nu.modules.biz.care.order.job;
import com.nu.modules.directive.order.service.IOrdersService; import com.nu.modules.biz.care.order.service.IOrdersService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
import org.jeecg.common.util.DateUtils; import org.jeecg.common.util.DateUtils;

5
nursing-unit-api/src/main/java/com/nu/modules/directive/order/mapper/OrdersMapper.java → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/mapper/OrdersMapper.java
View File

@ -1,9 +1,8 @@
package com.nu.modules.directive.order.mapper; package com.nu.modules.biz.care.order.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.nu.modules.directive.order.entity.Orders; import com.nu.modules.biz.care.order.entity.Orders;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;

7
nursing-unit-api/src/main/java/com/nu/modules/directive/order/mapper/OrdersSubMapper.java → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/mapper/OrdersSubMapper.java
View File

@ -1,9 +1,8 @@
package com.nu.modules.directive.order.mapper; package com.nu.modules.biz.care.order.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.nu.modules.directive.order.entity.Orders; import com.nu.modules.biz.care.order.entity.Orders;
import com.nu.modules.directive.order.entity.OrdersSub; import com.nu.modules.biz.care.order.entity.OrdersSub;
import java.util.List; import java.util.List;
/** /**

16
nursing-unit-api/src/main/java/com/nu/modules/directive/order/mapper/xml/OrdersMapper.xml → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/mapper/xml/OrdersMapper.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-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"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.nu.modules.directive.order.mapper.OrdersMapper"> <mapper namespace="com.nu.modules.biz.care.order.mapper.OrdersMapper">
<select id="queryDataPoolList" resultType="com.nu.modules.directive.order.entity.Orders"> <select id="queryDataPoolList" resultType="com.nu.modules.biz.care.order.entity.Orders">
select select
a.id as poolId, a.id as poolId,
a.biz_id as bizId, a.biz_id as bizId,
@ -31,13 +31,13 @@
a.start_time as startTime, a.start_time as startTime,
a.end_time as endTime, a.end_time as endTime,
(case when b.orderly is null then 2 else 1 end) as orderEmp (case when b.orderly is null then 2 else 1 end) as orderEmp
from nu_biz_nu_directive_data_pool a from nu_biz_nu_care_directive_data_pool a
left join nu_biz_elder_info b on a.customer_id = b.id left join nu_biz_elder_info b on a.customer_id = b.id
where a.iz_orders = 'N' where a.iz_orders = 'N'
order by a.start_time,orderEmp,a.nu_id order by a.start_time,orderEmp,a.nu_id
</select> </select>
<select id="getEmpPermissionAndOnline" resultType="com.nu.modules.directive.order.entity.Orders"> <select id="getEmpPermissionAndOnline" resultType="com.nu.modules.biz.care.order.entity.Orders">
select select
distinct distinct
a.id as employeeId, a.id as employeeId,
@ -60,14 +60,14 @@
round(sum(ifnull(com_price,0)),4) as totalComPrice, round(sum(ifnull(com_price,0)),4) as totalComPrice,
max(start_time) as maxTime, max(start_time) as maxTime,
sum(case when iz_finish='N' then 1 else 0 end) as ownCn sum(case when iz_finish='N' then 1 else 0 end) as ownCn
from nu_biz_nu_directive_order_sub from nu_biz_nu_care_directive_order_sub
where start_time >=DATE_FORMAT(NOW(), '%Y-%m-%d 00:00:00') where start_time >=DATE_FORMAT(NOW(), '%Y-%m-%d 00:00:00')
and start_time &lt;=DATE_FORMAT(NOW(), '%Y-%m-%d 23:59:59') and start_time &lt;=DATE_FORMAT(NOW(), '%Y-%m-%d 23:59:59')
group by employee_id group by employee_id
) e on a.id = e.employee_id ) e on a.id = e.employee_id
left join ( left join (
select employee_id,sum(case when iz_finish='N' then 1 else 0 end) as orderNum select employee_id,sum(case when iz_finish='N' then 1 else 0 end) as orderNum
from nu_biz_nu_directive_order_sub from nu_biz_nu_care_directive_order_sub
where start_time = #{startTime} where start_time = #{startTime}
or (start_time &lt; #{startTime} and end_time > #{startTime}) or (start_time &lt; #{startTime} and end_time > #{startTime})
group by employee_id group by employee_id
@ -93,13 +93,13 @@
</if> </if>
</select> </select>
<select id="getEmpOrderly" resultType="com.nu.modules.directive.order.entity.Orders"> <select id="getEmpOrderly" resultType="com.nu.modules.biz.care.order.entity.Orders">
select orderly as employeeIds select orderly as employeeIds
from nu_biz_elder_info from nu_biz_elder_info
where id = #{customerId} where id = #{customerId}
</select> </select>
<select id="getPermissionEmps" resultType="com.nu.modules.directive.order.entity.Orders"> <select id="getPermissionEmps" resultType="com.nu.modules.biz.care.order.entity.Orders">
select a.id as employeeId,count(*) as ownCn select a.id as employeeId,count(*) as ownCn
from nu_biz_employees_info a from nu_biz_employees_info a
inner join nu_biz_employees_servcie_tags b on a.id = b.employees_id inner join nu_biz_employees_servcie_tags b on a.id = b.employees_id

6
nursing-unit-api/src/main/java/com/nu/modules/directive/order/mapper/xml/OrdersSubMapper.xml → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/mapper/xml/OrdersSubMapper.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-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"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.nu.modules.directive.order.mapper.OrdersSubMapper"> <mapper namespace="com.nu.modules.biz.care.order.mapper.OrdersSubMapper">
<select id="queryDataPoolSubList" resultType="com.nu.modules.directive.order.entity.OrdersSub"> <select id="queryDataPoolSubList" resultType="com.nu.modules.biz.care.order.entity.OrdersSub">
select select
id as poolSubId, id as poolSubId,
nu_id as nuId, nu_id as nuId,
@ -35,7 +35,7 @@
iz_package as izPackage, iz_package as izPackage,
start_time as startTime, start_time as startTime,
end_time as endTime end_time as endTime
from nu_biz_nu_directive_data_pool_sub from nu_biz_nu_care_directive_data_pool_sub
where main_id = #{poolId} where main_id = #{poolId}
</select> </select>

4
nursing-unit-api/src/main/java/com/nu/modules/directive/order/service/IOrdersService.java → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/service/IOrdersService.java
View File

@ -1,7 +1,7 @@
package com.nu.modules.directive.order.service; package com.nu.modules.biz.care.order.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.nu.modules.directive.order.entity.Orders; import com.nu.modules.biz.care.order.entity.Orders;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
/** /**

7
nursing-unit-api/src/main/java/com/nu/modules/directive/order/service/IOrdersSubService.java → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/service/IOrdersSubService.java
View File

@ -1,9 +1,8 @@
package com.nu.modules.directive.order.service; package com.nu.modules.biz.care.order.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.nu.modules.directive.order.entity.Orders; import com.nu.modules.biz.care.order.entity.Orders;
import com.nu.modules.directive.order.entity.OrdersSub; import com.nu.modules.biz.care.order.entity.OrdersSub;
import java.util.List; import java.util.List;
/** /**

13
nursing-unit-api/src/main/java/com/nu/modules/directive/order/service/impl/OrdersServiceImpl.java → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/service/impl/OrdersServiceImpl.java
View File

@ -1,16 +1,15 @@
package com.nu.modules.directive.order.service.impl; package com.nu.modules.biz.care.order.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.nu.modules.directive.order.entity.Orders; import com.nu.modules.biz.care.order.entity.Orders;
import com.nu.modules.directive.order.entity.OrdersSub; import com.nu.modules.biz.care.order.entity.OrdersSub;
import com.nu.modules.directive.order.mapper.OrdersMapper; import com.nu.modules.biz.care.order.mapper.OrdersMapper;
import com.nu.modules.directive.order.service.IOrdersService; import com.nu.modules.biz.care.order.service.IOrdersService;
import com.nu.modules.directive.order.service.IOrdersSubService; import com.nu.modules.biz.care.order.service.IOrdersSubService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;

11
nursing-unit-api/src/main/java/com/nu/modules/directive/order/service/impl/OrdersSubServiceImpl.java → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/service/impl/OrdersSubServiceImpl.java
View File

@ -1,13 +1,12 @@
package com.nu.modules.directive.order.service.impl; package com.nu.modules.biz.care.order.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.nu.modules.directive.order.entity.Orders; import com.nu.modules.biz.care.order.entity.Orders;
import com.nu.modules.directive.order.entity.OrdersSub; import com.nu.modules.biz.care.order.entity.OrdersSub;
import com.nu.modules.directive.order.mapper.OrdersSubMapper; import com.nu.modules.biz.care.order.mapper.OrdersSubMapper;
import com.nu.modules.directive.order.service.IOrdersSubService; import com.nu.modules.biz.care.order.service.IOrdersSubService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
/** /**

13
nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/entity/NuBizNuCustomerElderTag.java → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/entity/PlanBizNuCustomerElderTag.java
View File

@ -1,4 +1,4 @@
package com.nu.modules.NuBizNuCustomerServer.entity; package com.nu.modules.biz.care.plan.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
@ -15,7 +15,6 @@ import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
import java.util.List;
/** /**
* @Description: 护理单元客户配置长者标签 * @Description: 护理单元客户配置长者标签
@ -28,7 +27,7 @@ import java.util.List;
@Accessors(chain = true) @Accessors(chain = true)
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)
@ApiModel(value="nu_biz_nu_customer_elder_tag对象", description="护理单元客户配置长者标签") @ApiModel(value="nu_biz_nu_customer_elder_tag对象", description="护理单元客户配置长者标签")
public class NuBizNuCustomerElderTag implements Serializable { public class PlanBizNuCustomerElderTag implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/**id*/ /**id*/
@ -67,22 +66,22 @@ public class NuBizNuCustomerElderTag implements Serializable {
@Excel(name = "图标", width = 15) @Excel(name = "图标", width = 15)
@ApiModelProperty(value = "图标") @ApiModelProperty(value = "图标")
@TableField(exist = false) @TableField(exist = false)
private java.lang.String pic; private String pic;
/**图标*/ /**图标*/
@Excel(name = "图标", width = 15) @Excel(name = "图标", width = 15)
@ApiModelProperty(value = "图标") @ApiModelProperty(value = "图标")
@TableField(exist = false) @TableField(exist = false)
private java.lang.String netPic; private String netPic;
/**焦点图标*/ /**焦点图标*/
@Excel(name = "焦点图标", width = 15) @Excel(name = "焦点图标", width = 15)
@ApiModelProperty(value = "焦点图标") @ApiModelProperty(value = "焦点图标")
@TableField(exist = false) @TableField(exist = false)
private java.lang.String picFocus; private String picFocus;
/**图标*/ /**图标*/
@Excel(name = "图标", width = 15) @Excel(name = "图标", width = 15)
@ApiModelProperty(value = "图标") @ApiModelProperty(value = "图标")
@TableField(exist = false) @TableField(exist = false)
private java.lang.String netPicFocus; private String netPicFocus;
/**创建人*/ /**创建人*/
@ApiModelProperty(value = "创建人") @ApiModelProperty(value = "创建人")
private String createBy; private String createBy;

23
nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/entity/NuBizNuCustomerServer.java → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/entity/PlanBizNuCustomerServer.java
View File

@ -1,21 +1,14 @@
package com.nu.modules.NuBizNuCustomerServer.entity; package com.nu.modules.biz.care.plan.entity;
import java.io.Serializable; import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date; import java.util.Date;
import java.math.BigDecimal;
import java.util.List; import java.util.List;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import org.jeecg.common.constant.ProvinceCityArea;
import org.jeecg.common.util.SpringContextUtils;
import lombok.Data; import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat; 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.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
@ -30,7 +23,7 @@ import lombok.experimental.Accessors;
@Accessors(chain = true) @Accessors(chain = true)
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)
@ApiModel(value="nu_biz_nu_customer_server对象", description="护理单元客户配置服务指令") @ApiModel(value="nu_biz_nu_customer_server对象", description="护理单元客户配置服务指令")
public class NuBizNuCustomerServer implements Serializable { public class PlanBizNuCustomerServer implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/**id*/ /**id*/
@ -105,13 +98,13 @@ public class NuBizNuCustomerServer implements Serializable {
/**创建日期*/ /**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private java.util.Date createTime; private Date createTime;
/**更新人*/ /**更新人*/
private String updateBy; private String updateBy;
/**更新日期*/ /**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private java.util.Date updateTime; private Date updateTime;
/**所属部门*/ /**所属部门*/
private String sysOrgCode; private String sysOrgCode;
/**是否是服务指令包 N否 Y是*/ /**是否是服务指令包 N否 Y是*/
@ -121,15 +114,15 @@ public class NuBizNuCustomerServer implements Serializable {
/**服务指令列表**/ /**服务指令列表**/
@TableField(exist = false) @TableField(exist = false)
private List<NuBizNuCustomerServer> serverList; private List<PlanBizNuCustomerServer> serverList;
/**即时服务指令列表**/ /**即时服务指令列表**/
@TableField(exist = false) @TableField(exist = false)
private List<NuBizNuCustomerServerInstant> instantList; private List<PlanBizNuCustomerServerInstant> instantList;
/**长者标签列表**/ /**长者标签列表**/
@TableField(exist = false) @TableField(exist = false)
private List<NuBizNuCustomerElderTag> tagList; private List<PlanBizNuCustomerElderTag> tagList;
/**服务包中的服务列表**/ /**服务包中的服务列表**/
@TableField(exist = false) @TableField(exist = false)
private List<NuBizNuCustomerServer> directivesList; private List<PlanBizNuCustomerServer> directivesList;
} }

25
nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/entity/NuBizNuCustomerServerInstant.java → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/entity/PlanBizNuCustomerServerInstant.java
View File

@ -1,7 +1,6 @@
package com.nu.modules.NuBizNuCustomerServer.entity; package com.nu.modules.biz.care.plan.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
@ -27,7 +26,7 @@ import java.util.Date;
@Accessors(chain = true) @Accessors(chain = true)
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)
@ApiModel(value="nu_biz_nu_customer_server_instant对象", description="护理单元客户配置服务指令即时指令") @ApiModel(value="nu_biz_nu_customer_server_instant对象", description="护理单元客户配置服务指令即时指令")
public class NuBizNuCustomerServerInstant implements Serializable { public class PlanBizNuCustomerServerInstant implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/**id*/ /**id*/
@ -76,28 +75,28 @@ public class NuBizNuCustomerServerInstant implements Serializable {
private String directiveName; private String directiveName;
/**即时指令图标*/ /**即时指令图标*/
@ApiModelProperty(value = "即时指令图标") @ApiModelProperty(value = "即时指令图标")
private java.lang.String immediateFile; private String immediateFile;
/**即时指令图标*/ /**即时指令图标*/
@ApiModelProperty(value = "即时指令图标") @ApiModelProperty(value = "即时指令图标")
private java.lang.String netImmediateFile; private String netImmediateFile;
/**即时指令焦点图标*/ /**即时指令焦点图标*/
@ApiModelProperty(value = "即时指令图标") @ApiModelProperty(value = "即时指令图标")
private java.lang.String immediateFileFocus; private String immediateFileFocus;
/**即时指令焦点图标*/ /**即时指令焦点图标*/
@ApiModelProperty(value = "即时指令图标") @ApiModelProperty(value = "即时指令图标")
private java.lang.String netImmediateFileFocus; private String netImmediateFileFocus;
/**服务指令图片大图*/ /**服务指令图片大图*/
@ApiModelProperty(value = "服务指令图片大图") @ApiModelProperty(value = "服务指令图片大图")
private java.lang.String previewFile; private String previewFile;
/**服务指令图片大图*/ /**服务指令图片大图*/
@ApiModelProperty(value = "服务指令图片大图") @ApiModelProperty(value = "服务指令图片大图")
private java.lang.String netPreviewFile; private String netPreviewFile;
/**服务指令图片小图*/ /**服务指令图片小图*/
@ApiModelProperty(value = "服务指令图片小图") @ApiModelProperty(value = "服务指令图片小图")
private java.lang.String previewFileSmall; private String previewFileSmall;
/**服务指令图片小图*/ /**服务指令图片小图*/
@ApiModelProperty(value = "服务指令图片小图") @ApiModelProperty(value = "服务指令图片小图")
private java.lang.String netPreviewFileSmall; private String netPreviewFileSmall;
/**指令音频文件*/ /**指令音频文件*/
@ApiModelProperty(value = "指令音频文件") @ApiModelProperty(value = "指令音频文件")
private String mp3File; private String mp3File;
@ -135,8 +134,8 @@ public class NuBizNuCustomerServerInstant implements Serializable {
private String sysOrgCode; private String sysOrgCode;
/**是否是服务指令包 N否 Y是*/ /**是否是服务指令包 N否 Y是*/
@ApiModelProperty(value = "是否是服务指令包") @ApiModelProperty(value = "是否是服务指令包")
private java.lang.String izPackage; private String izPackage;
@ApiModelProperty(value = "排序") @ApiModelProperty(value = "排序")
private java.lang.Long sort; private Long sort;
} }

8
nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/entity/ConfigServiceDirectiveDto.java → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/entity/PlanConfigServiceDirective.java
View File

@ -1,12 +1,8 @@
package com.nu.modules.NuBizNuCustomerServer.entity; package com.nu.modules.biz.care.plan.entity;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.common.aspect.annotation.Dict; import org.jeecg.common.aspect.annotation.Dict;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
@ -19,7 +15,7 @@ import java.io.Serializable;
* @Version: V1.0 * @Version: V1.0
*/ */
@Data @Data
public class ConfigServiceDirectiveDto implements Serializable { public class PlanConfigServiceDirective implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**

6
nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/entity/DirectivePackageDto.java → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/entity/PlanDirectivePackage.java
View File

@ -1,4 +1,4 @@
package com.nu.modules.NuBizNuCustomerServer.entity; package com.nu.modules.biz.care.plan.entity;
import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableLogic;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
@ -16,7 +16,7 @@ import java.util.List;
* @Version: V1.0 * @Version: V1.0
*/ */
@Data @Data
public class DirectivePackageDto implements Serializable { public class PlanDirectivePackage implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/**id*/ /**id*/
@ -54,6 +54,6 @@ public class DirectivePackageDto implements Serializable {
// 结束时间 // 结束时间
private String endTimeStr; private String endTimeStr;
// 服务指令集合 // 服务指令集合
private List<NuBizNuCustomerServer> directivesList; private List<PlanBizNuCustomerServer> directivesList;
} }

19
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/mapper/PlanBizNuCustomerElderTagMapper.java Normal file
View File

@ -0,0 +1,19 @@
package com.nu.modules.biz.care.plan.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.nu.modules.biz.care.plan.entity.PlanBizNuCustomerElderTag;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* @Description: 护理单元客户配置长者标签
* @Author: caolei
* @Date: 2025-10-13
* @Version: V1.0
*/
public interface PlanBizNuCustomerElderTagMapper extends BaseMapper<PlanBizNuCustomerElderTag> {
List<PlanBizNuCustomerElderTag> getElderTags(PlanBizNuCustomerElderTag planBizNuCustomerElderTag);
int deleteByIdPhysic(@Param("id") String id);
}

6
nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/NuBizNuCustomerServerInstantMapper.java → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/mapper/PlanBizNuCustomerServerInstantMapper.java
View File

@ -1,7 +1,7 @@
package com.nu.modules.NuBizNuCustomerServer.mapper; package com.nu.modules.biz.care.plan.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.nu.modules.NuBizNuCustomerServer.entity.NuBizNuCustomerServerInstant; import com.nu.modules.biz.care.plan.entity.PlanBizNuCustomerServerInstant;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
/** /**
@ -10,6 +10,6 @@ import org.apache.ibatis.annotations.Param;
* @Date: 2025-10-13 * @Date: 2025-10-13
* @Version: V1.0 * @Version: V1.0
*/ */
public interface NuBizNuCustomerServerInstantMapper extends BaseMapper<NuBizNuCustomerServerInstant> { public interface PlanBizNuCustomerServerInstantMapper extends BaseMapper<PlanBizNuCustomerServerInstant> {
int deleteByIdPhysic(@Param("id") String id); int deleteByIdPhysic(@Param("id") String id);
} }

24
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/mapper/PlanBizNuCustomerServerMapper.java Normal file
View File

@ -0,0 +1,24 @@
package com.nu.modules.biz.care.plan.mapper;
import java.util.List;
import com.nu.modules.biz.care.plan.entity.PlanBizNuCustomerServer;
import com.nu.modules.biz.care.plan.entity.PlanDirectivePackage;
import org.apache.ibatis.annotations.Param;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 护理单元客户配置服务指令
* @Author: yangjun
* @Date: 2025-03-31
* @Version: V1.0
*/
public interface PlanBizNuCustomerServerMapper extends BaseMapper<PlanBizNuCustomerServer> {
List<PlanBizNuCustomerServer> getGroupPositioning(PlanBizNuCustomerServer planBizNuCustomerServer);
List<PlanDirectivePackage> getNcPackagelist(@Param("params") PlanDirectivePackage directivePackageDto);
List<PlanBizNuCustomerServer> getNcDirectiveList(@Param("params") PlanBizNuCustomerServer planBizNuCustomerServer);
int deleteByIdPhysic(@Param("id") String id);
}

4
nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/xml/NuBizNuCustomerElderTagMapper.xml → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/mapper/xml/PlanBizNuCustomerElderTagMapper.xml
View File

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-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"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.nu.modules.NuBizNuCustomerServer.mapper.NuBizNuCustomerElderTagMapper"> <mapper namespace="com.nu.modules.biz.care.plan.mapper.PlanBizNuCustomerElderTagMapper">
<delete id="deleteByIdPhysic"> <delete id="deleteByIdPhysic">
delete from nu_biz_nu_customer_elder_tag where id = #{id} delete from nu_biz_nu_customer_elder_tag where id = #{id}
</delete> </delete>
<select id="getElderTags" resultType="com.nu.modules.NuBizNuCustomerServer.entity.NuBizNuCustomerElderTag"> <select id="getElderTags" resultType="com.nu.modules.biz.care.plan.entity.PlanBizNuCustomerElderTag">
select select
a.id as tagId, a.id as tagId,
a.type as tagType, a.type as tagType,

2
nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/xml/NuBizNuCustomerServerInstantMapper.xml → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/mapper/xml/PlanBizNuCustomerServerInstantMapper.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-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"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.nu.modules.NuBizNuCustomerServer.mapper.NuBizNuCustomerServerInstantMapper"> <mapper namespace="com.nu.modules.biz.care.plan.mapper.PlanBizNuCustomerServerInstantMapper">
<delete id="deleteByIdPhysic"> <delete id="deleteByIdPhysic">
delete from nu_biz_nu_customer_care_server_instant where id = #{id} delete from nu_biz_nu_customer_care_server_instant where id = #{id}

8
nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/xml/NuBizNuCustomerServerMapper.xml → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/mapper/xml/PlanBizNuCustomerServerMapper.xml
View File

@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-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"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.nu.modules.NuBizNuCustomerServer.mapper.NuBizNuCustomerServerMapper"> <mapper namespace="com.nu.modules.biz.care.plan.mapper.PlanBizNuCustomerServerMapper">
<delete id="deleteByIdPhysic"> <delete id="deleteByIdPhysic">
delete from nu_biz_nu_customer_care_server where id = #{id} delete from nu_biz_nu_customer_care_server where id = #{id}
</delete> </delete>
<select id="getGroupPositioning" resultType="com.nu.modules.NuBizNuCustomerServer.entity.NuBizNuCustomerServer"> <select id="getGroupPositioning" resultType="com.nu.modules.biz.care.plan.entity.PlanBizNuCustomerServer">
</select> </select>
<select id="getNcPackagelist" resultType="com.nu.modules.NuBizNuCustomerServer.entity.DirectivePackageDto"> <select id="getNcPackagelist" resultType="com.nu.modules.biz.care.plan.entity.PlanDirectivePackage">
select id, select id,
package_name as packageName, package_name as packageName,
total_duration as serviceDuration, total_duration as serviceDuration,
@ -20,7 +20,7 @@
and iz_enabled = 'Y' and iz_enabled = 'Y'
</select> </select>
<select id="getNcDirectiveList" resultType="com.nu.modules.NuBizNuCustomerServer.entity.NuBizNuCustomerServer"> <select id="getNcDirectiveList" resultType="com.nu.modules.biz.care.plan.entity.PlanBizNuCustomerServer">
select a.package_id,a.cycle_type,a.cycle_value,b.*, select a.package_id,a.cycle_type,a.cycle_value,b.*,
c.category_name AS category_name, c.category_name AS category_name,
d.type_name AS type_name, d.type_name AS type_name,

18
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/service/IPlanBizNuCustomerElderTagService.java Normal file
View File

@ -0,0 +1,18 @@
package com.nu.modules.biz.care.plan.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.nu.modules.biz.care.plan.entity.PlanBizNuCustomerElderTag;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* @Description: 护理单元客户配置长者标签
* @Author: caolei
* @Date: 2025-10-13
* @Version: V1.0
*/
public interface IPlanBizNuCustomerElderTagService extends IService<PlanBizNuCustomerElderTag> {
List<PlanBizNuCustomerElderTag> getElderTags(PlanBizNuCustomerElderTag planBizNuCustomerElderTag);
int deleteByIdPhysic(String id);
}

15
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/service/IPlanBizNuCustomerServerInstantService.java Normal file
View File

@ -0,0 +1,15 @@
package com.nu.modules.biz.care.plan.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.nu.modules.biz.care.plan.entity.PlanBizNuCustomerServerInstant;
/**
* @Description: 护理单元客户配置服务指令即时指令
* @Author: caolei
* @Date: 2025-10-13
* @Version: V1.0
*/
public interface IPlanBizNuCustomerServerInstantService extends IService<PlanBizNuCustomerServerInstant> {
int deleteByIdPhysic(String id);
}

14
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/service/IPlanBizNuCustomerServerService.java Normal file
View File

@ -0,0 +1,14 @@
package com.nu.modules.biz.care.plan.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.nu.modules.biz.care.plan.entity.PlanBizNuCustomerServer;
/**
* @Description: 护理单元客户配置服务指令
* @Author: yangjun
* @Date: 2025-03-31
* @Version: V1.0
*/
public interface IPlanBizNuCustomerServerService extends IService<PlanBizNuCustomerServer> {
}

27
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/service/impl/PlanBizNuCustomerElderTagServiceImpl.java Normal file
View File

@ -0,0 +1,27 @@
package com.nu.modules.biz.care.plan.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.nu.modules.biz.care.plan.entity.PlanBizNuCustomerElderTag;
import com.nu.modules.biz.care.plan.mapper.PlanBizNuCustomerElderTagMapper;
import com.nu.modules.biz.care.plan.service.IPlanBizNuCustomerElderTagService;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* @Description: 护理单元客户配置服务指令即时指令
* @Author: caolei
* @Date: 2025-10-13
* @Version: V1.0
*/
@Service
public class PlanBizNuCustomerElderTagServiceImpl extends ServiceImpl<PlanBizNuCustomerElderTagMapper, PlanBizNuCustomerElderTag> implements IPlanBizNuCustomerElderTagService {
public List<PlanBizNuCustomerElderTag> getElderTags(PlanBizNuCustomerElderTag PlanBizNuCustomerElderTag){
return baseMapper.getElderTags(PlanBizNuCustomerElderTag);
}
@Override
public int deleteByIdPhysic(String id) {
return baseMapper.deleteByIdPhysic(id);
}
}

22
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/service/impl/PlanBizNuCustomerServerInstantServiceImpl.java Normal file
View File

@ -0,0 +1,22 @@
package com.nu.modules.biz.care.plan.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.nu.modules.biz.care.plan.entity.PlanBizNuCustomerServerInstant;
import com.nu.modules.biz.care.plan.mapper.PlanBizNuCustomerServerInstantMapper;
import com.nu.modules.biz.care.plan.service.IPlanBizNuCustomerServerInstantService;
import org.springframework.stereotype.Service;
/**
* @Description: 护理单元客户配置服务指令即时指令
* @Author: caolei
* @Date: 2025-10-13
* @Version: V1.0
*/
@Service
public class PlanBizNuCustomerServerInstantServiceImpl extends ServiceImpl<PlanBizNuCustomerServerInstantMapper, PlanBizNuCustomerServerInstant> implements IPlanBizNuCustomerServerInstantService {
@Override
public int deleteByIdPhysic(String id) {
return baseMapper.deleteByIdPhysic(id);
}
}

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

@ -0,0 +1,441 @@
package com.nu.modules.biz.care.plan.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.nu.entity.CareDirectiveInstantEntity;
import com.nu.entity.CareDirectivePackageEntity;
import com.nu.entity.ElderTagEntity;
import org.springframework.beans.BeanUtils;
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.care.datapool.service.impl.DataPoolServiceImpl;
import com.nu.modules.biz.care.plan.entity.PlanBizNuCustomerElderTag;
import com.nu.modules.biz.care.plan.entity.PlanBizNuCustomerServer;
import com.nu.modules.biz.care.plan.entity.PlanBizNuCustomerServerInstant;
import com.nu.modules.biz.care.plan.entity.PlanDirectivePackage;
import com.nu.modules.biz.care.plan.mapper.PlanBizNuCustomerServerMapper;
import com.nu.modules.biz.care.plan.service.IPlanBizNuCustomerElderTagService;
import com.nu.modules.biz.care.plan.service.IPlanBizNuCustomerServerInstantService;
import com.nu.modules.biz.care.plan.service.IPlanBizNuCustomerServerService;
import com.nu.modules.care.api.ICareDirectivePlanApi;
import com.nu.modules.sysconfig.ISysConfigApi;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import java.util.*;
/**
* @Description: 护理单元客户配置服务指令
* @Author: yangjun
* @Date: 2025-03-31
* @Version: V1.0
*/
@Service
public class PlanBizNuCustomerServerServiceImpl extends ServiceImpl<PlanBizNuCustomerServerMapper, PlanBizNuCustomerServer> implements IPlanBizNuCustomerServerService, ICareDirectivePlanApi {
@Autowired
private ICareConfigServiceCategoryService careConfigServiceCategoryService;
@Autowired
private ICareConfigServiceTypeService careConfigServiceTypeService;
@Autowired
private ICareConfigServiceDirectiveService careConfigServiceDirectiveService;
@Autowired
private IPlanBizNuCustomerServerInstantService planBizNuCustomerServerInstantService;
@Autowired
private IPlanBizNuCustomerElderTagService planBizNuCustomerElderTagService;
@Autowired
private ISysConfigApi sysConfigApi;
@Autowired
private DataPoolServiceImpl dataPoolServiceImpl;
private String serverNetUrl;
@Override
public Map<String, Object> getPlanList(CareDirectiveEntity careDirectiveEntity) {
Map<String, Object> resMap = new HashMap<>();
//服务指令计划
QueryWrapper<PlanBizNuCustomerServer> PlanBizNuCustomerServerQueryWrapper = new QueryWrapper<>();
PlanBizNuCustomerServerQueryWrapper.eq(StringUtils.isNotEmpty(careDirectiveEntity.getNuId()), "nu_id", careDirectiveEntity.getNuId());
PlanBizNuCustomerServerQueryWrapper.eq(StringUtils.isNotEmpty(careDirectiveEntity.getCustomerId()), "customer_id", careDirectiveEntity.getCustomerId());
List<PlanBizNuCustomerServer> groupList = baseMapper.selectList(PlanBizNuCustomerServerQueryWrapper);
for (PlanBizNuCustomerServer par : groupList) {
if (par.getIzPackage().equals("Y")) {
String directiveId = par.getDirectiveId();
if (directiveId != null && !directiveId.equals("")) {
PlanBizNuCustomerServer packageDirective = new PlanBizNuCustomerServer();
packageDirective.setPackageId(directiveId);
List<PlanBizNuCustomerServer> pdList = baseMapper.getNcDirectiveList(packageDirective);
for (PlanBizNuCustomerServer pd : pdList) {
getNetImages(pd);
}
par.setDirectivesList(pdList);
}
}
}
resMap.put("serviceList", groupList);//服务指令计划
//即时指令
QueryWrapper<PlanBizNuCustomerServerInstant> instantQueryWrapper = new QueryWrapper<>();
instantQueryWrapper.eq(StringUtils.isNotEmpty(careDirectiveEntity.getNuId()), "nu_id", careDirectiveEntity.getNuId());
instantQueryWrapper.eq(StringUtils.isNotEmpty(careDirectiveEntity.getCustomerId()), "customer_id", careDirectiveEntity.getCustomerId());
instantQueryWrapper.orderByDesc("create_time");
List<PlanBizNuCustomerServerInstant> instantList = planBizNuCustomerServerInstantService.list(instantQueryWrapper);
// for (PlanBizNuCustomerServerInstant pari : instantList) {
// getInstantNetImages(pari);
// }
resMap.put("instantList", instantList);
PlanBizNuCustomerElderTag elderTag = new PlanBizNuCustomerElderTag();
//体型标签
elderTag.setNuId(careDirectiveEntity.getNuId());
elderTag.setCustomerId(careDirectiveEntity.getCustomerId());
elderTag.setTagType("tx");
List<PlanBizNuCustomerElderTag> bodyTagList = planBizNuCustomerElderTagService.getElderTags(elderTag);
for (PlanBizNuCustomerElderTag bt : bodyTagList) {
if (bt.getPic() != null) {
String pic = getImageNetUrl(bt.getPic());
bt.setNetPic(pic);
} else {
bt.setPic("");
bt.setNetPic("");
}
if (bt.getPicFocus() != null) {
String picFocus = getImageNetUrl(bt.getPicFocus());
bt.setNetPicFocus(picFocus);
} else {
bt.setPicFocus("");
bt.setNetPicFocus("");
}
}
resMap.put("bodyTagList", bodyTagList);
//情绪标签
elderTag.setTagType("qx");
List<PlanBizNuCustomerElderTag> emotionTagList = planBizNuCustomerElderTagService.getElderTags(elderTag);
for (PlanBizNuCustomerElderTag et : emotionTagList) {
if (et.getPic() != null) {
String pic = getImageNetUrl(et.getPic());
et.setNetPic(pic);
} else {
et.setPic("");
et.setNetPic("");
}
if (et.getPicFocus() != null) {
String picFocus = getImageNetUrl(et.getPicFocus());
et.setNetPicFocus(picFocus);
} else {
et.setPicFocus("");
et.setNetPicFocus("");
}
}
resMap.put("emotionTagList", emotionTagList);
return resMap;
}
private PlanBizNuCustomerServer getNetImages(PlanBizNuCustomerServer par) {
if (par.getImmediateFile() != null && !par.getImmediateFile().equals("")) {
String immediateFile = getImageNetUrl(par.getImmediateFile());
par.setNetImmediateFile(immediateFile);
} else {
par.setImmediateFile("");
par.setNetImmediateFile("");
}
if (par.getImmediateFileFocus() != null && !par.getImmediateFileFocus().equals("")) {
String immediateFileFocus = getImageNetUrl(par.getImmediateFileFocus());
par.setNetImmediateFileFocus(immediateFileFocus);
} else {
par.setImmediateFileFocus("");
par.setNetImmediateFileFocus("");
}
if (par.getPreviewFile() != null && !par.getPreviewFile().equals("")) {
String previewFile = getImageNetUrl(par.getPreviewFile());
par.setNetPreviewFile(previewFile);
} else {
par.setPreviewFile("");
par.setNetPreviewFile("");
}
if (par.getPreviewFileSmall() != null && !par.getPreviewFileSmall().equals("")) {
String previewFileSmall = getImageNetUrl(par.getPreviewFileSmall());
par.setNetPreviewFileSmall(previewFileSmall);
} else {
par.setPreviewFileSmall("");
par.setNetPreviewFileSmall("");
}
if (par.getMp3File() != null && !par.getMp3File().equals("")) {
String netMp3File = getImageNetUrl(par.getMp3File());
par.setNetMp3File(netMp3File);
} else {
par.setMp3File("");
par.setNetMp3File("");
}
if (par.getMp4File() != null && !par.getMp4File().equals("")) {
String netMp4File = getImageNetUrl(par.getMp4File());
par.setNetMp4File(netMp4File);
} else {
par.setMp4File("");
par.setNetMp4File("");
}
return par;
}
private PlanBizNuCustomerServerInstant getInstantNetImages(PlanBizNuCustomerServerInstant par) {
if (par.getImmediateFile() != null && !par.getImmediateFile().equals("")) {
String immediateFile = getImageNetUrl(par.getImmediateFile());
par.setNetImmediateFile(immediateFile);
} else {
par.setImmediateFile("");
par.setNetImmediateFile("");
}
if (par.getImmediateFileFocus() != null && !par.getImmediateFileFocus().equals("")) {
String immediateFileFocus = getImageNetUrl(par.getImmediateFileFocus());
par.setNetImmediateFileFocus(immediateFileFocus);
} else {
par.setImmediateFileFocus("");
par.setNetImmediateFileFocus("");
}
if (par.getPreviewFile() != null && !par.getPreviewFile().equals("")) {
String previewFile = getImageNetUrl(par.getPreviewFile());
par.setNetPreviewFile(previewFile);
} else {
par.setPreviewFile("");
par.setNetPreviewFile("");
}
if (par.getPreviewFileSmall() != null && !par.getPreviewFileSmall().equals("")) {
String previewFileSmall = getImageNetUrl(par.getPreviewFileSmall());
par.setNetPreviewFileSmall(previewFileSmall);
} else {
par.setPreviewFileSmall("");
par.setNetPreviewFileSmall("");
}
if (par.getMp3File() != null && !par.getMp3File().equals("")) {
String netMp3File = getImageNetUrl(par.getMp3File());
par.setNetMp3File(netMp3File);
} else {
par.setMp3File("");
par.setNetMp3File("");
}
if (par.getMp4File() != null && !par.getMp4File().equals("")) {
String netMp4File = getImageNetUrl(par.getMp4File());
par.setNetMp4File(netMp4File);
} else {
par.setMp4File("");
par.setNetMp4File("");
}
return par;
}
@Override
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());
planBizNuCustomerServer.setCategoryId(careConfigServiceCategory.getId());
planBizNuCustomerServer.setCategoryName(careConfigServiceCategory.getCategoryName());
planBizNuCustomerServer.setTypeId(careConfigServiceType.getId());
planBizNuCustomerServer.setTypeName(careConfigServiceType.getTypeName());
baseMapper.insert(planBizNuCustomerServer);
BeanUtils.copyProperties(planBizNuCustomerServer, careDirectiveEntity);
return careDirectiveEntity;
}
@Override
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());
planBizNuCustomerServer.setCategoryId(careConfigServiceCategory.getId());
planBizNuCustomerServer.setCategoryName(careConfigServiceCategory.getCategoryName());
planBizNuCustomerServer.setTypeId(careConfigServiceType.getId());
planBizNuCustomerServer.setTypeName(careConfigServiceType.getTypeName());
baseMapper.updateById(planBizNuCustomerServer);
BeanUtils.copyProperties(planBizNuCustomerServer, careDirectiveEntity);
return careDirectiveEntity;
}
@Override
public void deleteNuCustomerServer(String id){
baseMapper.deleteById(id);
}
@Override
public CareDirectiveEntity getNuCustomerServerById(String id){
PlanBizNuCustomerServer planBizNuCustomerServer = this.getById(id);
CareDirectiveEntity careDirectiveEntity = new CareDirectiveEntity();
BeanUtils.copyProperties(planBizNuCustomerServer, careDirectiveEntity);
return careDirectiveEntity;
}
@Override
public void addBatch(CareDirectiveEntity careDirectiveEntity) {
//保存长者标签
String nuId = careDirectiveEntity.getNuId();
String customerId = careDirectiveEntity.getCustomerId();
QueryWrapper<PlanBizNuCustomerElderTag> tagQueryWrapper = new QueryWrapper<>();
tagQueryWrapper.eq("nu_id", nuId);
tagQueryWrapper.eq("customer_id", customerId);
planBizNuCustomerElderTagService.remove(tagQueryWrapper);
List<ElderTagEntity> tagList = careDirectiveEntity.getTagList();
List<PlanBizNuCustomerElderTag> elderTagList = BeanUtil.copyToList(tagList,PlanBizNuCustomerElderTag.class);
if (elderTagList.size() > 0) {
for (PlanBizNuCustomerElderTag tg : elderTagList) {
tg.setNuId(nuId);
tg.setNuName(careDirectiveEntity.getNuName());
tg.setCustomerId(customerId);
tg.setCustomerName(careDirectiveEntity.getCustomerName());
}
planBizNuCustomerElderTagService.saveBatch(elderTagList);
}
}
@Override
public CareDirectiveEntity addDirective(CareDirectiveEntity careDirectiveEntity) {
PlanBizNuCustomerServer planBizNuCustomerServer = new PlanBizNuCustomerServer();
BeanUtils.copyProperties(careDirectiveEntity,planBizNuCustomerServer);
baseMapper.insert(planBizNuCustomerServer);
//TODO 增加日志
//单一指令生成到数据池
dataPoolServiceImpl.generateDataPool(planBizNuCustomerServer);
BeanUtils.copyProperties(planBizNuCustomerServer, careDirectiveEntity);
return careDirectiveEntity;
}
@Override
public void editDirective(CareDirectiveEntity careDirectiveEntity) {
PlanBizNuCustomerServer planBizNuCustomerServer = new PlanBizNuCustomerServer();
BeanUtils.copyProperties(careDirectiveEntity,planBizNuCustomerServer);
PlanBizNuCustomerServer entity = baseMapper.selectById(careDirectiveEntity.getId());
baseMapper.updateById(planBizNuCustomerServer);
//TODO 增加日志
//调用方法先删除数据池中的数据，再生成数据池中的数据
dataPoolServiceImpl.editDataPool(entity);
}
@Override
public void deleteDirective(CareDirectiveEntity careDirectiveEntity) {
PlanBizNuCustomerServer planBizNuCustomerServer = new PlanBizNuCustomerServer();
BeanUtils.copyProperties(careDirectiveEntity,planBizNuCustomerServer);
String id = planBizNuCustomerServer.getId();
//调用方法删除数据池中的数据
dataPoolServiceImpl.deleteDataPool(planBizNuCustomerServer);
baseMapper.deleteByIdPhysic(id);
//TODO 增加日志
}
@Override
public CareDirectiveInstantEntity addInstant(CareDirectiveInstantEntity careDirectiveInstantEntity) {
PlanBizNuCustomerServerInstant customerServerInstant = new PlanBizNuCustomerServerInstant();
BeanUtils.copyProperties(careDirectiveInstantEntity,customerServerInstant);
planBizNuCustomerServerInstantService.save(customerServerInstant);
//TODO 增加日志
//生成即时指令到数据池，测试
// DataPool dataPool = new DataPool();
// dataPool.setBizId(customerServerInstant.getId());
// dataPool.setNuId(customerServerInstant.getNuId());
// dataPool.setNuName(customerServerInstant.getNuName());
// dataPool.setCustomerId(customerServerInstant.getCustomerId());
// dataPool.setCustomerName(customerServerInstant.getCustomerName());
// dataPool.setDirectiveId(customerServerInstant.getDirectiveId());
// dataPool.setDirectiveName(customerServerInstant.getDirectiveName());
// dataPool.setServiceDuration(customerServerInstant.getServiceDuration());
// dataPoolServiceImpl.addInstant(dataPool);
BeanUtils.copyProperties(customerServerInstant,careDirectiveInstantEntity);
return careDirectiveInstantEntity;
}
@Override
public void editInstant(CareDirectiveInstantEntity careDirectiveInstantEntity) {
PlanBizNuCustomerServerInstant customerServerInstant = new PlanBizNuCustomerServerInstant();
BeanUtils.copyProperties(careDirectiveInstantEntity,customerServerInstant);
planBizNuCustomerServerInstantService.updateById(customerServerInstant);
//TODO 增加日志
}
@Override
public void deleteInstant(CareDirectiveInstantEntity careDirectiveInstantEntity) {
planBizNuCustomerServerInstantService.deleteByIdPhysic(careDirectiveInstantEntity.getId());
//TODO 增加日志
}
@Override
public ElderTagEntity addElderTag(ElderTagEntity elderTagEntity) {
PlanBizNuCustomerElderTag planBizNuCustomerElderTag = new PlanBizNuCustomerElderTag();
BeanUtils.copyProperties(elderTagEntity,planBizNuCustomerElderTag);
planBizNuCustomerElderTagService.save(planBizNuCustomerElderTag);
//TODO 增加日志
BeanUtils.copyProperties(planBizNuCustomerElderTag,elderTagEntity);
return elderTagEntity;
}
@Override
public void editElderTag(ElderTagEntity elderTagEntity) {
PlanBizNuCustomerElderTag planBizNuCustomerElderTag = new PlanBizNuCustomerElderTag();
BeanUtils.copyProperties(elderTagEntity,planBizNuCustomerElderTag);
planBizNuCustomerElderTagService.updateById(planBizNuCustomerElderTag);
//TODO 增加日志
}
@Override
public void deleteElderTag(ElderTagEntity elderTagEntity) {
planBizNuCustomerElderTagService.deleteByIdPhysic(elderTagEntity.getId());
//TODO 增加日志
}
@Override
public List<CareDirectivePackageEntity> getNcPackagelist(CareDirectivePackageEntity careDirectivePackageEntity) {
PlanDirectivePackage directivePackage = new PlanDirectivePackage();
BeanUtils.copyProperties(careDirectivePackageEntity, directivePackage);
List<PlanDirectivePackage> list = baseMapper.getNcPackagelist(directivePackage);
List<CareDirectivePackageEntity> mainList = BeanUtil.copyToList(list,CareDirectivePackageEntity.class);
List<PlanBizNuCustomerServer> directiveList = baseMapper.getNcDirectiveList(new PlanBizNuCustomerServer());
for (CareDirectivePackageEntity et : mainList) {
List<CareDirectiveEntity> directivesList = new ArrayList<>();
for (PlanBizNuCustomerServer etd : directiveList) {
if (etd.getPackageId().equals(et.getId())) {
getNetImages(etd);
CareDirectiveEntity careDirectiveEntity = new CareDirectiveEntity();
BeanUtils.copyProperties(etd, careDirectiveEntity);
directivesList.add(careDirectiveEntity);
}
}
et.setDirectivesList(directivesList);
}
return mainList;
}
/**
* 获取管理平台静态资源路径
*
* @return
*/
private void getOpeMediaAddress() {
if (serverNetUrl == null || serverNetUrl.equals("")) {
JSONObject json = sysConfigApi.getByKey("ope_media_address");
if (json != null) {
String configValue = json.getString("configValue");
if (!configValue.endsWith("/")) {
configValue += "/";
}
serverNetUrl = configValue;
}
}
}
private String getImageNetUrl(String imageUrl) {
getOpeMediaAddress();
return serverNetUrl + imageUrl;
}
}

19
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/canadddirective/controller/CanAddDirectiveController.java → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/canadddirective/controller/CanAddDirectiveController.java
View File

@ -1,16 +1,10 @@
package com.nu.modules.canadddirective.controller; package com.nu.modules.config.canadddirective.controller;
import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.dynamic.datasource.annotation.DS;
@ -22,9 +16,8 @@ import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.query.QueryRuleEnum; import org.jeecg.common.system.query.QueryRuleEnum;
import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils; import com.nu.modules.config.canadddirective.entity.CanAddDirective;
import com.nu.modules.canadddirective.entity.CanAddDirective; import com.nu.modules.config.canadddirective.service.ICanAddDirectiveService;
import com.nu.modules.canadddirective.service.ICanAddDirectiveService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
@ -32,22 +25,16 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.jeecg.config.JeecgBaseConfig; import org.jeecg.config.JeecgBaseConfig;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.apache.shiro.authz.annotation.RequiresPermissions;
/** /**
* @Description: 可新增指令 * @Description: 可新增指令

7
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/canadddirective/entity/CanAddDirective.java → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/canadddirective/entity/CanAddDirective.java
View File

@ -1,13 +1,8 @@
package com.nu.modules.canadddirective.entity; package com.nu.modules.config.canadddirective.entity;
import java.io.Serializable; import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import org.jeecg.common.constant.ProvinceCityArea;
import org.jeecg.common.util.SpringContextUtils;
import lombok.Data; import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;

7
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/canadddirective/mapper/CanAddDirectiveMapper.java → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/canadddirective/mapper/CanAddDirectiveMapper.java
View File

@ -1,9 +1,6 @@
package com.nu.modules.canadddirective.mapper; package com.nu.modules.config.canadddirective.mapper;
import java.util.List; import com.nu.modules.config.canadddirective.entity.CanAddDirective;
import org.apache.ibatis.annotations.Param;
import com.nu.modules.canadddirective.entity.CanAddDirective;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/** /**

0
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/canadddirective/mapper/xml/CanAddDirectiveMapper.xml → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/canadddirective/mapper/xml/CanAddDirectiveMapper.xml
View File

4
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/canadddirective/service/ICanAddDirectiveService.java → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/canadddirective/service/ICanAddDirectiveService.java
View File

@ -1,6 +1,6 @@
package com.nu.modules.canadddirective.service; package com.nu.modules.config.canadddirective.service;
import com.nu.modules.canadddirective.entity.CanAddDirective; import com.nu.modules.config.canadddirective.entity.CanAddDirective;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
/** /**

8
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/canadddirective/service/impl/CanAddDirectiveServiceImpl.java → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/canadddirective/service/impl/CanAddDirectiveServiceImpl.java
View File

@ -1,8 +1,8 @@
package com.nu.modules.canadddirective.service.impl; package com.nu.modules.config.canadddirective.service.impl;
import com.nu.modules.canadddirective.entity.CanAddDirective; import com.nu.modules.config.canadddirective.entity.CanAddDirective;
import com.nu.modules.canadddirective.mapper.CanAddDirectiveMapper; import com.nu.modules.config.canadddirective.mapper.CanAddDirectiveMapper;
import com.nu.modules.canadddirective.service.ICanAddDirectiveService; import com.nu.modules.config.canadddirective.service.ICanAddDirectiveService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

25
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/customercaretemp/controller/NuBizCustomerCareTempMainController.java → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/customercaretemp/controller/NuBizCustomerCareTempMainController.java
View File

@ -1,41 +1,24 @@
package com.nu.modules.customercaretemp.controller; package com.nu.modules.config.customercaretemp.controller;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.nu.modules.customercaretemp.service.INuBizCustomerCareTempInfoService; import com.nu.modules.config.customercaretemp.service.INuBizCustomerCareTempInfoService;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.query.QueryRuleEnum; import com.nu.modules.config.customercaretemp.entity.NuBizCustomerCareTempMain;
import org.jeecg.common.util.oConvertUtils; import com.nu.modules.config.customercaretemp.service.INuBizCustomerCareTempMainService;
import com.nu.modules.customercaretemp.entity.NuBizCustomerCareTempMain;
import com.nu.modules.customercaretemp.service.INuBizCustomerCareTempMainService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.aspect.annotation.AutoLog;

8
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/customercaretemp/entity/NuBizCustomerCareTempInfo.java → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/customercaretemp/entity/NuBizCustomerCareTempInfo.java
View File

@ -1,19 +1,13 @@
package com.nu.modules.customercaretemp.entity; package com.nu.modules.config.customercaretemp.entity;
import java.io.Serializable; import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import java.util.List; import java.util.List;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import org.jeecg.common.constant.ProvinceCityArea;
import org.jeecg.common.util.SpringContextUtils;
import lombok.Data; import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;

7
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/customercaretemp/entity/NuBizCustomerCareTempMain.java → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/customercaretemp/entity/NuBizCustomerCareTempMain.java
View File

@ -1,14 +1,9 @@
package com.nu.modules.customercaretemp.entity; package com.nu.modules.config.customercaretemp.entity;
import java.io.Serializable; import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import java.util.List; import java.util.List;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import org.jeecg.common.constant.ProvinceCityArea;
import org.jeecg.common.util.SpringContextUtils;
import lombok.Data; import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;

4
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/customercaretemp/mapper/NuBizCustomerCareTempInfoMapper.java → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/customercaretemp/mapper/NuBizCustomerCareTempInfoMapper.java
View File

@ -1,7 +1,7 @@
package com.nu.modules.customercaretemp.mapper; package com.nu.modules.config.customercaretemp.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.nu.modules.customercaretemp.entity.NuBizCustomerCareTempInfo; import com.nu.modules.config.customercaretemp.entity.NuBizCustomerCareTempInfo;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;

Some files were not shown because too many files have changed in this diff Show More