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

pad已编排服务指令查询接口：增加包相应指令返回

This commit is contained in:
1378012178@qq.com 2026-01-28 15:19:17 +08:00
parent c2fffe192c
commit f956c6304d
4 changed files with 51 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nursing-unit-common/src/main/java/com/nu/entity/CareDirectivePackageEntity.java
View File

@ -57,4 +57,6 @@ public class CareDirectivePackageEntity implements Serializable {
private List<DirectiveEntity> directives;
private String ids;
}

2
nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/servicepackage/IDirectivePackageApi.java
View File

@ -7,5 +7,5 @@ import java.util.List;
import java.util.Map;
public interface IDirectivePackageApi {
public List<CareDirectivePackageEntity> getNcPackagelist(CareDirectivePackageEntity directivePackageEntity, IPage<CareDirectivePackageEntity> pageList);
public List<CareDirectivePackageEntity> getNcPackagelist(CareDirectivePackageEntity directivePackageEntity, List<CareDirectivePackageEntity> pageList);
}

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

@ -3,6 +3,9 @@ package com.nu.modules.biz.plan.care.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.nu.entity.*;
import com.nu.modules.biz.datapool.service.ICareDataPoolService;
import com.nu.modules.config.directivepackage.service.IDirectivePackageService;
import com.nu.modules.config.directivepackage.service.impl.DirectivePackageServiceImpl;
import org.apache.commons.compress.utils.Lists;
import org.springframework.beans.BeanUtils;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.nu.modules.biz.plan.care.entity.ElderTagPlan;
@ -14,7 +17,10 @@ import com.nu.modules.care.api.ICareDirectivePlanApi;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.util.CollectionUtils;
import java.util.*;
import java.util.stream.Collectors;
/**
* @Description: 护理单元客户配置服务指令
@ -29,6 +35,8 @@ public class CareDirectivePlanServiceImpl extends ServiceImpl<CareDirectivePlanM
private IElderTagPlanService bizNuElderTagPlanService;
@Autowired
private ICareDataPoolService dataPoolServiceImpl;
@Autowired
private DirectivePackageServiceImpl directivePackageService;
@Override
public Map<String, Object> getPlanList(CareDirectiveEntity careDirectiveEntity) {
@ -36,6 +44,34 @@ public class CareDirectivePlanServiceImpl extends ServiceImpl<CareDirectivePlanM
//服务指令计划
careDirectiveEntity.setQueryType("service");
List<CareDirectivePlan> groupList = baseMapper.list(careDirectiveEntity);
if (!CollectionUtils.isEmpty(groupList)) {
//将包的指令塞进去（写一个sql效率低）
CareDirectivePackageEntity queryParams = new CareDirectivePackageEntity();
List<CareDirectivePackageEntity> ids = Lists.newArrayList();
groupList.stream().forEach(item -> {
CareDirectivePackageEntity d_ = new CareDirectivePackageEntity();
if ("Y".equals(item.getIzPackage())) {
d_.setId(item.getDirectiveId());
ids.add(d_);
}
});
List<CareDirectivePackageEntity> packagelist = directivePackageService.getNcPackagelist(queryParams, ids);
if (!CollectionUtils.isEmpty(groupList)) {
Map<String, CareDirectivePackageEntity> packageMap = packagelist.stream()
.collect(Collectors.toMap(
CareDirectivePackageEntity::getId,
entity -> entity,
(existing, replacement) -> existing
));
groupList.stream().forEach(item -> {
if ("Y".equals(item.getIzPackage())) {
List<DirectiveEntity> directives = packageMap.get(item.getDirectiveId()).getDirectives();
item.setDirectivesList(BeanUtil.copyToList(directives, CareDirectivePlan.class));
}
});
}
}
resMap.put("serviceList", groupList);//服务指令计划
//即时指令
careDirectiveEntity.setQueryType("instant");
@ -57,6 +93,7 @@ public class CareDirectivePlanServiceImpl extends ServiceImpl<CareDirectivePlanM
/**
* 保存长者标签
*
* @param careDirectiveEntity
*/
@Override
@ -84,7 +121,7 @@ public class CareDirectivePlanServiceImpl extends ServiceImpl<CareDirectivePlanM
@Override
public CareDirectiveEntity addDirective(CareDirectiveEntity careDirectiveEntity) {
CareDirectivePlan careDirectivePlan = new CareDirectivePlan();
BeanUtils.copyProperties(careDirectiveEntity,careDirectivePlan);
BeanUtils.copyProperties(careDirectiveEntity, careDirectivePlan);
baseMapper.insert(careDirectivePlan);
//TODO 增加日志
@ -97,7 +134,7 @@ public class CareDirectivePlanServiceImpl extends ServiceImpl<CareDirectivePlanM
@Override
public void editDirective(CareDirectiveEntity careDirectiveEntity) {
CareDirectivePlan careDirectivePlan = new CareDirectivePlan();
BeanUtils.copyProperties(careDirectiveEntity,careDirectivePlan);
BeanUtils.copyProperties(careDirectiveEntity, careDirectivePlan);
CareDirectivePlan entity = baseMapper.selectById(careDirectiveEntity.getId());
baseMapper.deleteByIdPhysic(careDirectiveEntity.getId());
baseMapper.insert(careDirectivePlan);
@ -110,7 +147,7 @@ public class CareDirectivePlanServiceImpl extends ServiceImpl<CareDirectivePlanM
@Override
public void deleteDirective(CareDirectiveEntity careDirectiveEntity) {
CareDirectivePlan careDirectivePlan = new CareDirectivePlan();
BeanUtils.copyProperties(careDirectiveEntity,careDirectivePlan);
BeanUtils.copyProperties(careDirectiveEntity, careDirectivePlan);
String id = careDirectivePlan.getId();
//调用方法删除数据池中的数据
dataPoolServiceImpl.deleteDataPool(careDirectivePlan);
@ -125,6 +162,6 @@ public class CareDirectivePlanServiceImpl extends ServiceImpl<CareDirectivePlanM
@Override
public int queryTotal(String nuId, String elderId) {
return baseMapper.queryTotal(nuId,elderId);
return baseMapper.queryTotal(nuId, elderId);
}
}

9
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivepackage/service/impl/DirectivePackageServiceImpl.java
View File

@ -11,6 +11,7 @@ import com.nu.modules.config.directivepackage.service.IDirectivePackageService;
import com.nu.modules.servicepackage.IDirectivePackageApi;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.util.List;
@ -54,10 +55,14 @@ public class DirectivePackageServiceImpl extends ServiceImpl<DirectivePackageMap
}
@Override
public List<CareDirectivePackageEntity> getNcPackagelist(CareDirectivePackageEntity directivePackageEntity, IPage<CareDirectivePackageEntity> pageList) {
public List<CareDirectivePackageEntity> getNcPackagelist(CareDirectivePackageEntity directivePackageEntity, List<CareDirectivePackageEntity> pageList) {
DirectivePackage directivePackage = new DirectivePackage();
BeanUtils.copyProperties(directivePackageEntity,directivePackage);
List<DirectivePackage> record = baseMapper.queryList(directivePackage, null);
List<DirectivePackage> ids = Lists.newArrayList();
if(!CollectionUtils.isEmpty(pageList)){
ids = BeanUtil.copyToList(pageList,DirectivePackage.class);
}
List<DirectivePackage> record = baseMapper.queryList(directivePackage, ids);
return BeanUtil.copyToList(record, CareDirectivePackageEntity.class);
}
}