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

获取各类型即时指令

This commit is contained in:
1378012178@qq.com 2026-02-03 15:10:45 +08:00
parent 94c60348cb
commit 00f1726b8a
8 changed files with 159 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
nursing-unit-api/src/main/java/com/nu/modules/pad/directiveplan/api/CareDirectiveApi.java
View File

@ -5,6 +5,8 @@ import com.google.common.collect.Maps;
import com.nu.entity.*;
import com.nu.modules.config.IDirectiveConfigApi;
import com.nu.modules.care.api.ICareDirectivePlanApi;
import com.nu.modules.invoicing.api.IInvoicingDirectivePlanApi;
import com.nu.modules.logistics.api.ILogisticsDirectivePlanApi;
import com.nu.modules.order.api.IDirectiveOrderApi;
import com.nu.modules.servicepackage.IDirectivePackageApi;
import lombok.extern.slf4j.Slf4j;
@ -37,6 +39,10 @@ public class CareDirectiveApi {
private IDirectiveOrderApi directiveOrderApi;
@Autowired
private IDirectivePackageApi directivePackageApi;
@Autowired
private IInvoicingDirectivePlanApi invoicingDirectivePlanApi;
@Autowired
private ILogisticsDirectivePlanApi logisticsDirectivePlanApi;
/**
* 获取护理类服务指令树-配置数据
@ -253,4 +259,30 @@ public class CareDirectiveApi {
result.put("all", all);
return Result.OK(result);
}
/**
* 获取护理单元中的即时指令信息
*
* @param dto
* @return total 各类型即时指令总数
*/
@GetMapping(value = "/getImmediatelyOrderByNuID")
public Result<Map<String, Object>> getImmediatelyOrderByNuID(CareDirectiveEntity dto) {
Map<String, Object> result = Maps.newHashMap();
//护理类即时指令
List<DirectiveOrderEntity> hlList = careDirectivePlanApi.queryImmediatelyOrderList(dto);
//TODO 医疗类即时指令 目前没有表 后续待开发
List<DirectiveOrderEntity> ylList = Lists.newArrayList();
//后勤类即时指令
List<DirectiveOrderEntity> hqList = invoicingDirectivePlanApi.queryImmediatelyOrderList(dto);
//仓库类即时指令
List<DirectiveOrderEntity> ckList = logisticsDirectivePlanApi.queryImmediatelyOrderList(dto);
result.put("total", hlList.size() + ylList.size() + hqList.size() + ckList.size());
result.put("hlList", hlList);
result.put("ylList", ylList);
result.put("hqList", hqList);
result.put("ckList", ckList);
return Result.ok(result);
}
}

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

@ -13,5 +13,5 @@ public interface ICareDirectivePlanApi {
void deleteDirective(CareDirectiveEntity careDirectiveEntity);
List<DirectiveOrderEntity> queryFuture(CareDirectiveEntity dto);
List<DirectiveOrderEntity> queryImmediatelyOrderList(CareDirectiveEntity dto);
}

5
nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingDirectivePlanApi.java
View File

@ -1,6 +1,8 @@
package com.nu.modules.invoicing.api;
import com.nu.entity.*;
import java.util.List;
import java.util.Map;
public interface IInvoicingDirectivePlanApi {
@ -8,4 +10,7 @@ public interface IInvoicingDirectivePlanApi {
InvoicingDirectiveEntity addDirective(InvoicingDirectiveEntity invoicingDirectiveEntity);
void editDirective(InvoicingDirectiveEntity invoicingDirectiveEntity);
void deleteDirective(InvoicingDirectiveEntity invoicingDirectiveEntity);
List<DirectiveOrderEntity> queryImmediatelyOrderList(CareDirectiveEntity dto);
}

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

@ -1,10 +1,8 @@
package com.nu.modules.logistics.api;
import com.nu.entity.InvoicingDirectiveEntity;
import com.nu.entity.InvoicingDirectiveInstantEntity;
import com.nu.entity.LogisticsDirectiveEntity;
import com.nu.entity.LogisticsDirectiveInstantEntity;
import com.nu.entity.*;
import java.util.List;
import java.util.Map;
public interface ILogisticsDirectivePlanApi {
@ -12,4 +10,6 @@ public interface ILogisticsDirectivePlanApi {
LogisticsDirectiveEntity addDirective(LogisticsDirectiveEntity logisticsDirectiveEntity);
void editDirective(LogisticsDirectiveEntity logisticsDirectiveEntity);
void deleteDirective(LogisticsDirectiveEntity logisticsDirectiveEntity);
List<DirectiveOrderEntity> queryImmediatelyOrderList(CareDirectiveEntity dto);
}

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

@ -160,6 +160,17 @@ public class CareDirectivePlanServiceImpl extends ServiceImpl<CareDirectivePlanM
return baseMapper.queryFuture(dto);
}
@Override
public List<DirectiveOrderEntity> queryImmediatelyOrderList(CareDirectiveEntity dto) {
dto.setQueryType("instant");
List<CareDirectivePlan> list = baseMapper.list(dto);
if(!CollectionUtils.isEmpty(list)){
return BeanUtil.copyToList(list,DirectiveOrderEntity.class);
}else{
return List.of();
}
}
@Override
public int queryTotal(String nuId, String elderId) {
return baseMapper.queryTotal(nuId, elderId);

20
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/invoicing/service/impl/InvoicingDirectivePlanServiceImpl.java
View File

@ -1,8 +1,13 @@
package com.nu.modules.biz.plan.invoicing.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.nu.entity.CareDirectiveEntity;
import com.nu.entity.DirectiveOrderEntity;
import com.nu.entity.InvoicingDirectiveEntity;
import com.nu.modules.biz.datapool.service.IInvoicingDataPoolService;
import com.nu.modules.biz.plan.care.entity.CareDirectivePlan;
import com.nu.modules.biz.plan.invoicing.entity.InvoicingDirectivePlan;
import com.nu.modules.biz.plan.invoicing.mapper.InvoicingDirectivePlanMapper;
import com.nu.modules.biz.plan.invoicing.service.IInvoicingDirectivePlanService;
@ -10,6 +15,8 @@ import com.nu.modules.invoicing.api.IInvoicingDirectivePlanApi;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -81,6 +88,19 @@ public class InvoicingDirectivePlanServiceImpl extends ServiceImpl<InvoicingDire
//TODO 增加日志
}
@Override
public List<DirectiveOrderEntity> queryImmediatelyOrderList(CareDirectiveEntity dto_) {
InvoicingDirectiveEntity dto = new InvoicingDirectiveEntity();
dto.setNuId(dto_.getNuId());
dto.setQueryType("instant");
List<InvoicingDirectivePlan> list = baseMapper.list(dto);
if(!CollectionUtils.isEmpty(list)){
return BeanUtil.copyToList(list,DirectiveOrderEntity.class);
}else{
return List.of();
}
}
@Override
public int queryTotal(String nuId) {
return baseMapper.queryTotal(nuId);

111
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/logistics/entity/LogisticsDirectivePlan.java
View File

@ -35,47 +35,13 @@ public class LogisticsDirectivePlan implements Serializable {
private String id;
/**护理单元id*/
private String nuId;
/**护理单元名称*/
private String nuName;
/**长者id*/
private String elderId;
/**长者姓名*/
private String elderName;
/**服务类别id*/
private String categoryId;
/**服务类别名称*/
private String categoryName;
/**服务类型id*/
private String typeId;
/**服务类型名称*/
private String typeName;
/**服务指令id*/
/**服务指令id*/
private String directiveId;
/**服务指令名称*/
private String directiveName;
/**指令类型ID*/
private String cycleTypeId;
/**指令类型*/
private String cycleType;
/**周期值*/
private String cycleValue;
/**即时指令图标*/
private String immediateFile;
/**即时指令焦点图标*/
private String immediateFileFocus;
/**服务指令图片大图*/
private String previewFile;
/**服务指令图片小图*/
private String previewFileSmall;
/**指令音频文件*/
private String mp3File;
/**指令视频文件*/
private String mp4File;
/**服务指令时长*/
private String serviceDuration;
/**服务描述*/
private String serviceContent;
/**定位*/
/**定位*/
private String positioning;
/**纵向定位*/
private String positioningLong;
@ -83,21 +49,19 @@ public class LogisticsDirectivePlan implements Serializable {
private String tagName;
/**开始时间*/
private String startTime;
/**结束时间*/
private String endTime;
/**创建人*/
/**创建人*/
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")
private Date createTime;
/**更新人*/
/**更新人*/
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")
private Date updateTime;
/**所属部门*/
/**所属部门*/
private String sysOrgCode;
/**是否是服务指令包 N否 Y是*/
private String izPackage;
@ -112,9 +76,64 @@ public class LogisticsDirectivePlan implements Serializable {
*/
private Integer optCount;
/**护理单元名称*/
@TableField(exist = false)
private String nuName;
/**长者id*/
@TableField(exist = false)
private String elderId;
/**长者姓名*/
@TableField(exist = false)
private String elderName;
/**服务类别id*/
@TableField(exist = false)
private String categoryId;
/**服务类别名称*/
@TableField(exist = false)
private String categoryName;
/**服务类型id*/
@TableField(exist = false)
private String typeId;
/**服务类型名称*/
@TableField(exist = false)
private String typeName;
/**服务指令名称*/
@TableField(exist = false)
private String directiveName;
/**指令类型*/
@TableField(exist = false)
private String cycleType;
/**即时指令图标*/
@TableField(exist = false)
private String immediateFile;
/**即时指令焦点图标*/
@TableField(exist = false)
private String immediateFileFocus;
/**服务指令图片大图*/
@TableField(exist = false)
private String previewFile;
/**服务指令图片小图*/
@TableField(exist = false)
private String previewFileSmall;
/**指令音频文件*/
@TableField(exist = false)
private String mp3File;
/**指令视频文件*/
@TableField(exist = false)
private String mp4File;
/**服务指令时长*/
@TableField(exist = false)
private String serviceDuration;
/**服务描述*/
@TableField(exist = false)
private String serviceContent;
/**结束时间*/
@TableField(exist = false)
private String endTime;
@TableField(exist = false)
private String packageId;
/**服务指令列表**/
@TableField(exist = false)
private List<LogisticsDirectivePlan> serverList;

21
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/logistics/service/impl/LogisticsDirectivePlanServiceImpl.java
View File

@ -1,8 +1,14 @@
package com.nu.modules.biz.plan.logistics.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.nu.entity.CareDirectiveEntity;
import com.nu.entity.DirectiveOrderEntity;
import com.nu.entity.InvoicingDirectiveEntity;
import com.nu.entity.LogisticsDirectiveEntity;
import com.nu.modules.biz.datapool.service.ILogisticsDataPoolService;
import com.nu.modules.biz.plan.invoicing.entity.InvoicingDirectivePlan;
import com.nu.modules.biz.plan.logistics.entity.LogisticsDirectivePlan;
import com.nu.modules.biz.plan.logistics.mapper.LogisticsDirectivePlanMapper;
import com.nu.modules.biz.plan.logistics.service.LogisticsDirectivePlanService;
@ -10,6 +16,8 @@ import com.nu.modules.logistics.api.ILogisticsDirectivePlanApi;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -78,6 +86,19 @@ public class LogisticsDirectivePlanServiceImpl extends ServiceImpl<LogisticsDire
//TODO 增加日志
}
@Override
public List<DirectiveOrderEntity> queryImmediatelyOrderList(CareDirectiveEntity dto_) {
LogisticsDirectiveEntity dto = new LogisticsDirectiveEntity();
dto.setNuId(dto_.getNuId());
dto.setQueryType("instant");
List<LogisticsDirectivePlan> list = baseMapper.list(dto);
if(!CollectionUtils.isEmpty(list)){
return BeanUtil.copyToList(list,DirectiveOrderEntity.class);
}else{
return List.of();
}
}
@Override
public int queryTotal(String nuId, String elderId) {
return baseMapper.queryTotal(nuId, elderId);