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

服务指令配置更改名称

This commit is contained in:
曹磊 2025-11-28 16:54:41 +08:00
parent 22e4a3dbe8
commit a3a77dbc2b
64 changed files with 468 additions and 468 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,7 +26,7 @@ import java.util.Date;
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="nu_biz_nu_care_directive_data_pool对象", description="服务指令数据池主表")
public class DataPool implements Serializable {
public class CareDataPool implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(type = IdType.ASSIGN_ID)

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

@ -23,7 +23,7 @@ import java.util.Date;
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="nu_biz_nu_care_directive_data_pool对象", description="服务指令数据池子表")
public class DataPoolSub implements Serializable {
public class CareDataPoolSub implements Serializable {
private static final long serialVersionUID = 1L;
/**id*/
@TableId(type = IdType.ASSIGN_ID)

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

@ -1,6 +1,6 @@
package com.nu.modules.biz.care.datapool.job;
import com.nu.modules.biz.care.datapool.service.IDataPoolService;
import com.nu.modules.biz.care.datapool.service.ICareDataPoolService;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.util.DateUtils;
@ -13,10 +13,10 @@ import org.springframework.beans.factory.annotation.Autowired;
* 指令计划批量生成到指令池
*/
@Slf4j
public class DataPoolJob implements Job {
public class CareDataPoolJob implements Job {
@Autowired
IDataPoolService service;
ICareDataPoolService service;
@Override
public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {

38
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/mapper/CareDataPoolMapper.java Normal file
View File

@ -0,0 +1,38 @@
package com.nu.modules.biz.care.datapool.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.nu.modules.biz.care.datapool.entity.CareDataPool;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* @Description: 服务指令数据池管理
* @Author: caolei
* @Date: 2025-11-07
* @Version: V1.0
*/
public interface CareDataPoolMapper extends BaseMapper<CareDataPool> {
List<CareDataPool> queryPlanList(CareDataPool dataPool);
CareDataPool queryPlanById(@Param("id") String id);
CareDataPool queryPoolOne(CareDataPool dataPool);
void createDataPoolLog(CareDataPool dataPool);
void createDataPoolLogSub(CareDataPool dataPool);
void addDataPoolLog(CareDataPool dataPool);
void addDataPoolSubLog(CareDataPool dataPool);
void deleteDataPool(CareDataPool dataPool);
void deleteDataPoolSub(CareDataPool dataPool);
void createOrdersLog(CareDataPool dataPool);
void createOrdersLogSub(CareDataPool dataPool);
void addOrdersLog(CareDataPool dataPool);
void addOrdersSubLog(CareDataPool dataPool);
CareDataPool queryOrdersOne(CareDataPool dataPool);
void deleteOrders(CareDataPool dataPool);
void deleteOrdersSub(CareDataPool dataPool);
}

16
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/mapper/CareDataPoolSubMapper.java Normal file
View File

@ -0,0 +1,16 @@
package com.nu.modules.biz.care.datapool.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.nu.modules.biz.care.datapool.entity.CareDataPoolSub;
import java.util.List;
/**
* @Description: 服务指令数据池管理子表
* @Author: caolei
* @Date: 2025-11-11
* @Version: V1.0
*/
public interface CareDataPoolSubMapper extends BaseMapper<CareDataPoolSub> {
CareDataPoolSub queryDirectiveOne(CareDataPoolSub dataPoolSub);
List<CareDataPoolSub> queryDirectiveList(CareDataPoolSub dataPoolSub);
}

38
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/mapper/DataPoolMapper.java
View File

@ -1,38 +0,0 @@
package com.nu.modules.biz.care.datapool.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.nu.modules.biz.care.datapool.entity.DataPool;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* @Description: 服务指令数据池管理
* @Author: caolei
* @Date: 2025-11-07
* @Version: V1.0
*/
public interface DataPoolMapper extends BaseMapper<DataPool> {
List<DataPool> queryPlanList(DataPool dataPool);
DataPool queryPlanById(@Param("id") String id);
DataPool queryPoolOne(DataPool dataPool);
void createDataPoolLog(DataPool dataPool);
void createDataPoolLogSub(DataPool dataPool);
void addDataPoolLog(DataPool dataPool);
void addDataPoolSubLog(DataPool dataPool);
void deleteDataPool(DataPool dataPool);
void deleteDataPoolSub(DataPool dataPool);
void createOrdersLog(DataPool dataPool);
void createOrdersLogSub(DataPool dataPool);
void addOrdersLog(DataPool dataPool);
void addOrdersSubLog(DataPool dataPool);
DataPool queryOrdersOne(DataPool dataPool);
void deleteOrders(DataPool dataPool);
void deleteOrdersSub(DataPool dataPool);
}

16
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/mapper/DataPoolSubMapper.java
View File

@ -1,16 +0,0 @@
package com.nu.modules.biz.care.datapool.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.nu.modules.biz.care.datapool.entity.DataPoolSub;
import java.util.List;
/**
* @Description: 服务指令数据池管理子表
* @Author: caolei
* @Date: 2025-11-11
* @Version: V1.0
*/
public interface DataPoolSubMapper extends BaseMapper<DataPoolSub> {
DataPoolSub queryDirectiveOne(DataPoolSub dataPoolSub);
List<DataPoolSub> queryDirectiveList(DataPoolSub dataPoolSub);
}

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

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.nu.modules.biz.care.datapool.mapper.DataPoolMapper">
<mapper namespace="com.nu.modules.biz.care.datapool.mapper.CareDataPoolMapper">
<select id="queryPlanList" resultType="com.nu.modules.biz.care.datapool.entity.DataPool">
<select id="queryPlanList" resultType="com.nu.modules.biz.care.datapool.entity.CareDataPool">
select
id as bizId,
nu_id as nuId,
@ -52,7 +52,7 @@
</where>
</select>
<select id="queryPlanById" resultType="com.nu.modules.biz.care.datapool.entity.DataPool">
<select id="queryPlanById" resultType="com.nu.modules.biz.care.datapool.entity.CareDataPool">
select
id as bizId,
nu_id as nuId,
@ -83,7 +83,7 @@
where id = #{id}
</select>
<select id="queryPoolOne" resultType="com.nu.modules.biz.care.datapool.entity.DataPool">
<select id="queryPoolOne" resultType="com.nu.modules.biz.care.datapool.entity.CareDataPool">
select
id,
biz_id,
@ -139,7 +139,7 @@
</where>
</select>
<select id="queryInstantOne" resultType="com.nu.modules.biz.care.datapool.entity.DataPool">
<select id="queryInstantOne" resultType="com.nu.modules.biz.care.datapool.entity.CareDataPool">
select
id,
biz_id,
@ -433,7 +433,7 @@
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '护理单元-服务指令-工单日志子表' ROW_FORMAT = Dynamic;
</update>
<select id="queryOrdersOne" resultType="com.nu.modules.biz.care.datapool.entity.DataPool">
<select id="queryOrdersOne" resultType="com.nu.modules.biz.care.datapool.entity.CareDataPool">
select
id,
nu_id,

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

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

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

@ -1,8 +1,8 @@
package com.nu.modules.biz.care.datapool.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.nu.modules.biz.care.datapool.entity.DataPool;
import com.nu.modules.biz.care.plan.entity.PlanBizNuCustomerServer;
import com.nu.modules.biz.care.datapool.entity.CareDataPool;
import com.nu.modules.biz.care.plan.entity.PlanBizNuCustomerCareServer;
import org.jeecg.common.api.vo.Result;
/**
@ -11,7 +11,7 @@ import org.jeecg.common.api.vo.Result;
* @Date: 2025-11-06
* @Version: V1.0
*/
public interface IDataPoolService extends IService<DataPool> {
public interface ICareDataPoolService extends IService<CareDataPool> {
/**
* 批量生成
@ -22,19 +22,19 @@ public interface IDataPoolService extends IService<DataPool> {
* 单一生成
* @param planBizNuCustomerServer
*/
void generateDataPool(PlanBizNuCustomerServer planBizNuCustomerServer);
void generateDataPool(PlanBizNuCustomerCareServer planBizNuCustomerServer);
/**
* 删除
* @param planBizNuCustomerServer
*/
void deleteDataPool(PlanBizNuCustomerServer planBizNuCustomerServer);
void deleteDataPool(PlanBizNuCustomerCareServer planBizNuCustomerServer);
/**
* 修改
* @param planBizNuCustomerServer
*/
void editDataPool(PlanBizNuCustomerServer planBizNuCustomerServer);
void editDataPool(PlanBizNuCustomerCareServer planBizNuCustomerServer);
/**
@ -42,7 +42,7 @@ public interface IDataPoolService extends IService<DataPool> {
*/
void cleanDataPool();
Result<?> addInstant(DataPool dataPool);
Result<?> addInstant(CareDataPool dataPool);
}

16
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/service/ICareDataPoolSubService.java Normal file
View File

@ -0,0 +1,16 @@
package com.nu.modules.biz.care.datapool.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.nu.modules.biz.care.datapool.entity.CareDataPoolSub;
import java.util.List;
/**
* @Description: 服务指令数据池管理子表
* @Author: caolei
* @Date: 2025-11-11
* @Version: V1.0
*/
public interface ICareDataPoolSubService extends IService<CareDataPoolSub> {
CareDataPoolSub queryDirectiveOne(CareDataPoolSub dataPoolSub);
List<CareDataPoolSub> queryDirectiveList(CareDataPoolSub dataPoolSub);
}

16
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/service/IDataPoolSubService.java
View File

@ -1,16 +0,0 @@
package com.nu.modules.biz.care.datapool.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.nu.modules.biz.care.datapool.entity.DataPoolSub;
import java.util.List;
/**
* @Description: 服务指令数据池管理子表
* @Author: caolei
* @Date: 2025-11-11
* @Version: V1.0
*/
public interface IDataPoolSubService extends IService<DataPoolSub> {
DataPoolSub queryDirectiveOne(DataPoolSub dataPoolSub);
List<DataPoolSub> queryDirectiveList(DataPoolSub dataPoolSub);
}

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

@ -2,12 +2,12 @@ package com.nu.modules.biz.care.datapool.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.nu.modules.biz.care.datapool.entity.DataPool;
import com.nu.modules.biz.care.datapool.entity.DataPoolSub;
import com.nu.modules.biz.care.datapool.mapper.DataPoolMapper;
import com.nu.modules.biz.care.datapool.service.IDataPoolService;
import com.nu.modules.biz.care.datapool.service.IDataPoolSubService;
import com.nu.modules.biz.care.plan.entity.PlanBizNuCustomerServer;
import com.nu.modules.biz.care.datapool.entity.CareDataPool;
import com.nu.modules.biz.care.datapool.entity.CareDataPoolSub;
import com.nu.modules.biz.care.datapool.mapper.CareDataPoolMapper;
import com.nu.modules.biz.care.datapool.service.ICareDataPoolService;
import com.nu.modules.biz.care.datapool.service.ICareDataPoolSubService;
import com.nu.modules.biz.care.plan.entity.PlanBizNuCustomerCareServer;
import com.nu.modules.sysconfig.ISysConfigApi;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
@ -29,10 +29,10 @@ import java.util.List;
*/
@Service
@Slf4j
public class DataPoolServiceImpl extends ServiceImpl<DataPoolMapper, DataPool> implements IDataPoolService {
public class CareDataPoolServiceImpl extends ServiceImpl<CareDataPoolMapper, CareDataPool> implements ICareDataPoolService {
@Autowired
IDataPoolSubService dataPoolSubService;
ICareDataPoolSubService dataPoolSubService;
@Autowired
private ISysConfigApi sysConfigApi;
@ -43,7 +43,7 @@ public class DataPoolServiceImpl extends ServiceImpl<DataPoolMapper, DataPool> i
*/
@Override
public Result<?> generateDataPoolBatch() {
DataPool entity = new DataPool();
CareDataPool entity = new CareDataPool();
Calendar c = Calendar.getInstance();
c.set(Calendar.SECOND,0);
c.set(Calendar.MILLISECOND,0);
@ -51,10 +51,10 @@ public class DataPoolServiceImpl extends ServiceImpl<DataPoolMapper, DataPool> i
c.add(Calendar.MINUTE,10);
entity.setEndTime(c.getTime());
try{
List<DataPool> planList = baseMapper.queryPlanList(entity);//获取计划
List<CareDataPool> planList = baseMapper.queryPlanList(entity);//获取计划
if(planList.size()>0){
for(DataPool plan : planList){
DataPool pool = baseMapper.queryPoolOne(plan);
for(CareDataPool plan : planList){
CareDataPool pool = baseMapper.queryPoolOne(plan);
if(pool!=null){
continue;
}
@ -71,7 +71,7 @@ public class DataPoolServiceImpl extends ServiceImpl<DataPoolMapper, DataPool> i
/**
* 指令生成数据池
*/
private void addDataPool(DataPool dataPool){
private void addDataPool(CareDataPool dataPool){
Date dataTime = dataPool.getStartTime();
Calendar c = Calendar.getInstance();
c.set(Calendar.SECOND,0);
@ -113,7 +113,7 @@ public class DataPoolServiceImpl extends ServiceImpl<DataPoolMapper, DataPool> i
/**
* 日常指令生成数据池子表（非包）
*/
private void addDaily(DataPool dataPool){
private void addDaily(CareDataPool dataPool){
//入指令池主表
this.save(dataPool);
//入指令池子表
@ -123,7 +123,7 @@ public class DataPoolServiceImpl extends ServiceImpl<DataPoolMapper, DataPool> i
/**
* 星期周期指令生成数据池子表（非包）
*/
private void addWeekDay(DataPool dataPool){
private void addWeekDay(CareDataPool dataPool){
String cycleValue = dataPool.getCycleValue();
Calendar calendar = Calendar.getInstance();
int dayOfWeek = calendar.get(Calendar.DAY_OF_WEEK); //1周日 2周一 3周二 4周三 5周四 6周五 7周六
@ -146,7 +146,7 @@ public class DataPoolServiceImpl extends ServiceImpl<DataPoolMapper, DataPool> i
/**
* 月周期指令生成数据池子表（非包）
*/
private void addMonthDay(DataPool dataPool){
private void addMonthDay(CareDataPool dataPool){
String cycleValue = dataPool.getCycleValue();
Calendar calendar = Calendar.getInstance();
int dayOfMonth = calendar.get(Calendar.DAY_OF_MONTH);
@ -163,10 +163,10 @@ public class DataPoolServiceImpl extends ServiceImpl<DataPoolMapper, DataPool> i
/**
* 指令生成数据池子表（非包）
*/
private void addSub(DataPool dataPool){
DataPoolSub entity = new DataPoolSub();
private void addSub(CareDataPool dataPool){
CareDataPoolSub entity = new CareDataPoolSub();
entity.setDirectiveId(dataPool.getDirectiveId());
DataPoolSub dataPoolSub = dataPoolSubService.queryDirectiveOne(entity);
CareDataPoolSub dataPoolSub = dataPoolSubService.queryDirectiveOne(entity);
getNetImagesSub(dataPoolSub);//获取网络地址
dataPoolSub.setCycleValue(dataPool.getCycleValue());
dataPoolSub.setNuId(dataPool.getNuId());
@ -184,7 +184,7 @@ public class DataPoolServiceImpl extends ServiceImpl<DataPoolMapper, DataPool> i
/**
* 指令包生成数据池
*/
private void addPackage(DataPool dataPool){
private void addPackage(CareDataPool dataPool){
//入指令池主表
this.save(dataPool);
//入指令池子表
@ -194,12 +194,12 @@ public class DataPoolServiceImpl extends ServiceImpl<DataPoolMapper, DataPool> i
/**
* 指令包中指令进行规则判断，并生成到数据池子表
*/
private void addPackageSubs(DataPool dataPool){
DataPoolSub entity = new DataPoolSub();
private void addPackageSubs(CareDataPool dataPool){
CareDataPoolSub entity = new CareDataPoolSub();
entity.setPackageId(dataPool.getPackageId());
List<DataPoolSub> subList = dataPoolSubService.queryDirectiveList(entity);
List<CareDataPoolSub> subList = dataPoolSubService.queryDirectiveList(entity);
for(int i=0;i<subList.size();i++){
DataPoolSub dataPoolSub = subList.get(i);
CareDataPoolSub dataPoolSub = subList.get(i);
getNetImagesSub(dataPoolSub);//获取网络地址
String cycleValue = dataPoolSub.getCycleValue();
if(cycleValue==null || cycleValue.equals("")){
@ -238,7 +238,7 @@ public class DataPoolServiceImpl extends ServiceImpl<DataPoolMapper, DataPool> i
/**
* 指令生成到数据池子表
*/
private void addPackageSub(DataPool dataPool,DataPoolSub dataPoolSub){
private void addPackageSub(CareDataPool dataPool, CareDataPoolSub dataPoolSub){
dataPoolSub.setNuId(dataPool.getNuId());
dataPoolSub.setNuName(dataPool.getNuName());
dataPoolSub.setCustomerId(dataPool.getCustomerId());
@ -258,8 +258,8 @@ public class DataPoolServiceImpl extends ServiceImpl<DataPoolMapper, DataPool> i
* @param planBizNuCustomerServer
*/
@Override
public void generateDataPool(PlanBizNuCustomerServer planBizNuCustomerServer){
DataPool dataPool = new DataPool();
public void generateDataPool(PlanBizNuCustomerCareServer planBizNuCustomerServer){
CareDataPool dataPool = new CareDataPool();
dataPool.setBizId(planBizNuCustomerServer.getId());
dataPool.setNuId(planBizNuCustomerServer.getNuId());
dataPool.setNuName(planBizNuCustomerServer.getNuName());
@ -313,7 +313,7 @@ public class DataPoolServiceImpl extends ServiceImpl<DataPoolMapper, DataPool> i
* @param planBizNuCustomerServer
*/
@Override
public void deleteDataPool(PlanBizNuCustomerServer planBizNuCustomerServer) {
public void deleteDataPool(PlanBizNuCustomerCareServer planBizNuCustomerServer) {
String startTime = planBizNuCustomerServer.getStartTime();
String[] starts = startTime.split(":");
String hour = starts[0];
@ -323,7 +323,7 @@ public class DataPoolServiceImpl extends ServiceImpl<DataPoolMapper, DataPool> i
c.set(Calendar.MINUTE,Integer.valueOf(minute));
c.set(Calendar.SECOND,0);
c.set(Calendar.MILLISECOND,0);
DataPool dataPool = new DataPool();
CareDataPool dataPool = new CareDataPool();
dataPool.setBizId(planBizNuCustomerServer.getId());
dataPool.setNuId(planBizNuCustomerServer.getNuId());
dataPool.setCustomerId(planBizNuCustomerServer.getCustomerId());
@ -336,7 +336,7 @@ public class DataPoolServiceImpl extends ServiceImpl<DataPoolMapper, DataPool> i
}else{
dataPool.setDirectiveId(planBizNuCustomerServer.getDirectiveId());
}
DataPool pool = baseMapper.queryPoolOne(dataPool);
CareDataPool pool = baseMapper.queryPoolOne(dataPool);
if(pool!=null){
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String dateStr = sdf.format(c.getTime());
@ -350,10 +350,10 @@ public class DataPoolServiceImpl extends ServiceImpl<DataPoolMapper, DataPool> i
}
//删除派单
private void deleteOrders(String dateStr,DataPool dataPool){
private void deleteOrders(String dateStr, CareDataPool dataPool){
dataPool.setIzStart("N");
//获取未开始的工单
DataPool pool = baseMapper.queryOrdersOne(dataPool);
CareDataPool pool = baseMapper.queryOrdersOne(dataPool);
if(pool!=null){
//删除工单
addOrdersLog(dateStr,pool);
@ -365,7 +365,7 @@ public class DataPoolServiceImpl extends ServiceImpl<DataPoolMapper, DataPool> i
/**
* 创建工单日志表
*/
private void addOrdersLog(String dateStr,DataPool dataPool){
private void addOrdersLog(String dateStr, CareDataPool dataPool){
String tableName = "nu_biz_nu_care_directive_order_log_"+dateStr.substring(2, 4)+dateStr.substring(5, 7);
dataPool.setTableName(tableName);
baseMapper.createOrdersLog(dataPool);//创建日志主表
@ -377,7 +377,7 @@ public class DataPoolServiceImpl extends ServiceImpl<DataPoolMapper, DataPool> i
/**
* 创建工单日志表
*/
private void addOrdersSubLog(String dateStr,DataPool dataPool){
private void addOrdersSubLog(String dateStr, CareDataPool dataPool){
String tableName = "nu_biz_nu_care_directive_order_sub_log_"+dateStr.substring(2, 4)+dateStr.substring(5, 7);
dataPool.setTableName(tableName);
baseMapper.createOrdersLogSub(dataPool);//创建日志子表
@ -391,10 +391,10 @@ public class DataPoolServiceImpl extends ServiceImpl<DataPoolMapper, DataPool> i
* @param planBizNuCustomerServer
*/
@Override
public void editDataPool(PlanBizNuCustomerServer planBizNuCustomerServer) {
public void editDataPool(PlanBizNuCustomerCareServer planBizNuCustomerServer) {
deleteDataPool(planBizNuCustomerServer);
DataPool dataPool = baseMapper.queryPlanById(planBizNuCustomerServer.getId());
DataPool pool = baseMapper.queryPoolOne(dataPool);
CareDataPool dataPool = baseMapper.queryPlanById(planBizNuCustomerServer.getId());
CareDataPool pool = baseMapper.queryPoolOne(dataPool);
if(pool==null){
addDataPool(dataPool);
}
@ -405,7 +405,7 @@ public class DataPoolServiceImpl extends ServiceImpl<DataPoolMapper, DataPool> i
*/
private void addDataPoolLog(String dateStr,String id){
String tableName = "nu_biz_nu_care_directive_data_pool_log_"+dateStr.substring(2, 4)+dateStr.substring(5, 7);
DataPool dataPool = new DataPool();
CareDataPool dataPool = new CareDataPool();
dataPool.setTableName(tableName);
baseMapper.createDataPoolLog(dataPool);//创建日志主表
dataPool.setId(id);
@ -419,7 +419,7 @@ public class DataPoolServiceImpl extends ServiceImpl<DataPoolMapper, DataPool> i
*/
private void addDataPoolSubLog(String dateStr,String id){
String tableName = "nu_biz_nu_care_directive_data_pool_sub_log_"+dateStr.substring(2, 4)+dateStr.substring(5, 7);
DataPool dataPool = new DataPool();
CareDataPool dataPool = new CareDataPool();
dataPool.setTableName(tableName);
baseMapper.createDataPoolLogSub(dataPool);//创建日志子表
dataPool.setId(id);
@ -448,7 +448,7 @@ public class DataPoolServiceImpl extends ServiceImpl<DataPoolMapper, DataPool> i
*/
private void addDataPoolLogByClean(String dateStr){
String tableName = "nu_biz_nu_care_directive_data_pool_log_"+dateStr.substring(2, 4)+dateStr.substring(5, 7);
DataPool dataPool = new DataPool();
CareDataPool dataPool = new CareDataPool();
dataPool.setTableName(tableName);
baseMapper.createDataPoolLog(dataPool);//创建日志主表
Calendar c = Calendar.getInstance();
@ -467,7 +467,7 @@ public class DataPoolServiceImpl extends ServiceImpl<DataPoolMapper, DataPool> i
*/
private void addDataPoolSubLogByClean(String dateStr){
String tableName = "nu_biz_nu_care_directive_data_pool_sub_log_"+dateStr.substring(2, 4)+dateStr.substring(5, 7);
DataPool dataPool = new DataPool();
CareDataPool dataPool = new CareDataPool();
dataPool.setTableName(tableName);
baseMapper.createDataPoolLogSub(dataPool);//创建日志子表
Calendar c = Calendar.getInstance();
@ -487,7 +487,7 @@ public class DataPoolServiceImpl extends ServiceImpl<DataPoolMapper, DataPool> i
* @return
*/
@Override
public Result<?> addInstant(DataPool dataPool){
public Result<?> addInstant(CareDataPool dataPool){
Calendar c = Calendar.getInstance();
c.set(Calendar.MILLISECOND,0);
c.set(Calendar.SECOND,0);
@ -528,7 +528,7 @@ public class DataPoolServiceImpl extends ServiceImpl<DataPoolMapper, DataPool> i
return serverNetUrl + imageUrl;
}
private DataPoolSub getNetImagesSub(DataPoolSub par) {
private CareDataPoolSub getNetImagesSub(CareDataPoolSub par) {
if (par.getPreviewFile() != null && !par.getPreviewFile().equals("")) {
String netPreviewFile = getImageNetUrl(par.getPreviewFile());
par.setNetPreviewFile(netPreviewFile);

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

@ -1,9 +1,9 @@
package com.nu.modules.biz.care.datapool.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.nu.modules.biz.care.datapool.entity.DataPoolSub;
import com.nu.modules.biz.care.datapool.mapper.DataPoolSubMapper;
import com.nu.modules.biz.care.datapool.service.IDataPoolSubService;
import com.nu.modules.biz.care.datapool.entity.CareDataPoolSub;
import com.nu.modules.biz.care.datapool.mapper.CareDataPoolSubMapper;
import com.nu.modules.biz.care.datapool.service.ICareDataPoolSubService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import java.util.List;
@ -16,15 +16,15 @@ import java.util.List;
*/
@Service
@Slf4j
public class DataPoolSubServiceImpl extends ServiceImpl<DataPoolSubMapper, DataPoolSub> implements IDataPoolSubService {
public class CareDataPoolSubServiceImpl extends ServiceImpl<CareDataPoolSubMapper, CareDataPoolSub> implements ICareDataPoolSubService {
@Override
public DataPoolSub queryDirectiveOne(DataPoolSub dataPoolSub){
public CareDataPoolSub queryDirectiveOne(CareDataPoolSub dataPoolSub){
return baseMapper.queryDirectiveOne(dataPoolSub);
}
@Override
public List<DataPoolSub> queryDirectiveList(DataPoolSub dataPoolSub){
public List<CareDataPoolSub> queryDirectiveList(CareDataPoolSub dataPoolSub){
return baseMapper.queryDirectiveList(dataPoolSub);
}
}

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

@ -27,7 +27,7 @@ import java.util.Date;
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="nu_biz_nu_care_directive_order对象", description="服务指令工单主表")
public class Orders implements Serializable {
public class CareOrders implements Serializable {
private static final long serialVersionUID = 1L;
/**id*/
@TableId(type = IdType.ASSIGN_ID)

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

@ -25,7 +25,7 @@ import java.util.Date;
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="nu_biz_nu_care_directive_order_sub对象", description="服务指令工单子表")
public class OrdersSub implements Serializable {
public class CareOrdersSub implements Serializable {
private static final long serialVersionUID = 1L;
/**id*/
@TableId(type = IdType.ASSIGN_ID)

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

@ -1,6 +1,6 @@
package com.nu.modules.biz.care.order.job;
import com.nu.modules.biz.care.order.service.IOrdersService;
import com.nu.modules.biz.care.order.service.ICareOrdersService;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.util.DateUtils;
@ -13,10 +13,10 @@ import org.springframework.beans.factory.annotation.Autowired;
* 指令池批量生成工单
*/
@Slf4j
public class OrdersJob implements Job {
public class CareOrdersJob implements Job {
@Autowired
IOrdersService service;
ICareOrdersService service;
@Override
public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {

20
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/mapper/CareOrdersMapper.java Normal file
View File

@ -0,0 +1,20 @@
package com.nu.modules.biz.care.order.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.nu.modules.biz.care.order.entity.CareOrders;
import org.apache.ibatis.annotations.Param;
import java.util.Date;
import java.util.List;
/**
* @Description: 服务指令工单主表
* @Author: caolei
* @Date: 2025-11-18
* @Version: V1.0
*/
public interface CareOrdersMapper extends BaseMapper<CareOrders> {
List<CareOrders> queryDataPoolList(CareOrders orders);
List<CareOrders> getEmpPermissionAndOnline(@Param("directiveIds") String directiveIds, @Param("employeeIds") String employeeIds, @Param("startTime") Date startTime);
CareOrders getEmpOrderly(@Param("customerId") String customerId);
List<CareOrders> getPermissionEmps(@Param("directiveIds") String directiveIds);
}

16
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/mapper/CareOrdersSubMapper.java Normal file
View File

@ -0,0 +1,16 @@
package com.nu.modules.biz.care.order.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.nu.modules.biz.care.order.entity.CareOrders;
import com.nu.modules.biz.care.order.entity.CareOrdersSub;
import java.util.List;
/**
* @Description: 服务指令工单子表
* @Author: caolei
* @Date: 2025-11-18
* @Version: V1.0
*/
public interface CareOrdersSubMapper extends BaseMapper<CareOrdersSub> {
List<CareOrdersSub> queryDataPoolSubList(CareOrders orders);
}

20
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/mapper/OrdersMapper.java
View File

@ -1,20 +0,0 @@
package com.nu.modules.biz.care.order.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.nu.modules.biz.care.order.entity.Orders;
import org.apache.ibatis.annotations.Param;
import java.util.Date;
import java.util.List;
/**
* @Description: 服务指令工单主表
* @Author: caolei
* @Date: 2025-11-18
* @Version: V1.0
*/
public interface OrdersMapper extends BaseMapper<Orders> {
List<Orders> queryDataPoolList(Orders orders);
List<Orders> getEmpPermissionAndOnline(@Param("directiveIds") String directiveIds,@Param("employeeIds") String employeeIds,@Param("startTime") Date startTime);
Orders getEmpOrderly(@Param("customerId") String customerId);
List<Orders> getPermissionEmps(@Param("directiveIds") String directiveIds);
}

16
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/mapper/OrdersSubMapper.java
View File

@ -1,16 +0,0 @@
package com.nu.modules.biz.care.order.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.nu.modules.biz.care.order.entity.Orders;
import com.nu.modules.biz.care.order.entity.OrdersSub;
import java.util.List;
/**
* @Description: 服务指令工单子表
* @Author: caolei
* @Date: 2025-11-18
* @Version: V1.0
*/
public interface OrdersSubMapper extends BaseMapper<OrdersSub> {
List<OrdersSub> queryDataPoolSubList(Orders orders);
}

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

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.nu.modules.biz.care.order.mapper.OrdersMapper">
<mapper namespace="com.nu.modules.biz.care.order.mapper.CareOrdersMapper">
<select id="queryDataPoolList" resultType="com.nu.modules.biz.care.order.entity.Orders">
<select id="queryDataPoolList" resultType="com.nu.modules.biz.care.order.entity.CareOrders">
select
a.id as poolId,
a.biz_id as bizId,
@ -37,7 +37,7 @@
order by a.start_time,orderEmp,a.nu_id
</select>
<select id="getEmpPermissionAndOnline" resultType="com.nu.modules.biz.care.order.entity.Orders">
<select id="getEmpPermissionAndOnline" resultType="com.nu.modules.biz.care.order.entity.CareOrders">
select
distinct
a.id as employeeId,
@ -93,13 +93,13 @@
</if>
</select>
<select id="getEmpOrderly" resultType="com.nu.modules.biz.care.order.entity.Orders">
<select id="getEmpOrderly" resultType="com.nu.modules.biz.care.order.entity.CareOrders">
select orderly as employeeIds
from nu_biz_elder_info
where id = #{customerId}
</select>
<select id="getPermissionEmps" resultType="com.nu.modules.biz.care.order.entity.Orders">
<select id="getPermissionEmps" resultType="com.nu.modules.biz.care.order.entity.CareOrders">
select a.id as employeeId,count(*) as ownCn
from nu_biz_employees_info a
inner join nu_biz_employees_servcie_tags b on a.id = b.employees_id

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

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.nu.modules.biz.care.order.mapper.OrdersSubMapper">
<mapper namespace="com.nu.modules.biz.care.order.mapper.CareOrdersSubMapper">
<select id="queryDataPoolSubList" resultType="com.nu.modules.biz.care.order.entity.OrdersSub">
<select id="queryDataPoolSubList" resultType="com.nu.modules.biz.care.order.entity.CareOrdersSub">
select
id as poolSubId,
nu_id as nuId,

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

@ -1,7 +1,7 @@
package com.nu.modules.biz.care.order.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.nu.modules.biz.care.order.entity.Orders;
import com.nu.modules.biz.care.order.entity.CareOrders;
import org.jeecg.common.api.vo.Result;
/**
@ -10,6 +10,6 @@ import org.jeecg.common.api.vo.Result;
* @Date: 2025-11-18
* @Version: V1.0
*/
public interface IOrdersService extends IService<Orders> {
public interface ICareOrdersService extends IService<CareOrders> {
Result<?> generateOrdersBatch();
}

16
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/service/ICareOrdersSubService.java Normal file
View File

@ -0,0 +1,16 @@
package com.nu.modules.biz.care.order.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.nu.modules.biz.care.order.entity.CareOrders;
import com.nu.modules.biz.care.order.entity.CareOrdersSub;
import java.util.List;
/**
* @Description: 服务指令工单子表
* @Author: caolei
* @Date: 2025-11-18
* @Version: V1.0
*/
public interface ICareOrdersSubService extends IService<CareOrdersSub> {
List<CareOrdersSub> queryDataPoolSubList(CareOrders orders);
}

16
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/service/IOrdersSubService.java
View File

@ -1,16 +0,0 @@
package com.nu.modules.biz.care.order.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.nu.modules.biz.care.order.entity.Orders;
import com.nu.modules.biz.care.order.entity.OrdersSub;
import java.util.List;
/**
* @Description: 服务指令工单子表
* @Author: caolei
* @Date: 2025-11-18
* @Version: V1.0
*/
public interface IOrdersSubService extends IService<OrdersSub> {
List<OrdersSub> queryDataPoolSubList(Orders orders);
}

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

@ -1,11 +1,11 @@
package com.nu.modules.biz.care.order.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.nu.modules.biz.care.order.entity.Orders;
import com.nu.modules.biz.care.order.entity.OrdersSub;
import com.nu.modules.biz.care.order.mapper.OrdersMapper;
import com.nu.modules.biz.care.order.service.IOrdersService;
import com.nu.modules.biz.care.order.service.IOrdersSubService;
import com.nu.modules.biz.care.order.entity.CareOrders;
import com.nu.modules.biz.care.order.entity.CareOrdersSub;
import com.nu.modules.biz.care.order.mapper.CareOrdersMapper;
import com.nu.modules.biz.care.order.service.ICareOrdersService;
import com.nu.modules.biz.care.order.service.ICareOrdersSubService;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
import org.springframework.beans.factory.annotation.Autowired;
@ -21,17 +21,17 @@ import java.util.stream.Collectors;
*/
@Service
@Slf4j
public class OrdersServiceImpl extends ServiceImpl<OrdersMapper, Orders> implements IOrdersService {
public class CareOrdersServiceImpl extends ServiceImpl<CareOrdersMapper, CareOrders> implements ICareOrdersService {
@Autowired
IOrdersSubService ordersSubService;
ICareOrdersSubService ordersSubService;
/**
* 获取在线，有指令权限的员工，并获取员工的接单上限、收益、服务时长、单次
* @param directiveId
* @return
*/
private List<Orders> getEmpPermissionAndOnline(String directiveId, String employeeIds, Date startTime){
private List<CareOrders> getEmpPermissionAndOnline(String directiveId, String employeeIds, Date startTime){
return baseMapper.getEmpPermissionAndOnline(directiveId,employeeIds,startTime);
}
@ -42,7 +42,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersMapper, Orders> impleme
*/
private Map<String,String> getEmpOrderly(String customerId){
Map<String, String> map = null;
Orders orders = baseMapper.getEmpOrderly(customerId);
CareOrders orders = baseMapper.getEmpOrderly(customerId);
if(orders!=null){
String empIds = orders.getEmployeeIds();
if(empIds!=null&&!empIds.equals("")){
@ -64,9 +64,9 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersMapper, Orders> impleme
*/
@Override
public Result<?> generateOrdersBatch(){
List<Orders> ordersList = baseMapper.queryDataPoolList(null);
List<CareOrders> ordersList = baseMapper.queryDataPoolList(null);
for(int i=0;i<ordersList.size();i++){
Orders orders = ordersList.get(i);
CareOrders orders = ordersList.get(i);
generateOrdersSub(orders);
}
return null;
@ -76,13 +76,13 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersMapper, Orders> impleme
* 获取工单子表数据，并进行处理
* @param orders
*/
private void generateOrdersSub(Orders orders){
private void generateOrdersSub(CareOrders orders){
System.out.println("护理单元:"+orders.getNuId()+",服务时间"+orders.getStartTime());
List<OrdersSub> ordersSubList = ordersSubService.queryDataPoolSubList(orders);
List<CareOrdersSub> ordersSubList = ordersSubService.queryDataPoolSubList(orders);
if(orders.getIzPackage().equals("N")){
OrdersSub ordersSub = ordersSubList.get(0);
CareOrdersSub ordersSub = ordersSubList.get(0);
//获取满足条件的员工
Orders employee = employeeScreening(ordersSub.getDirectiveId(),orders.getCustomerId(),null,orders.getStartTime());
CareOrders employee = employeeScreening(ordersSub.getDirectiveId(),orders.getCustomerId(),null,orders.getStartTime());
if(employee!=null){
orders.setEmployeeId(employee.getEmployeeId());
orders.setEmployeeName(employee.getEmployeeName());
@ -102,11 +102,11 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersMapper, Orders> impleme
System.out.println("");
}
}else{
String directiveIds = ordersSubList.stream().map(OrdersSub::getDirectiveId).collect(Collectors.joining(","));
List<Orders> emps = baseMapper.getPermissionEmps(directiveIds);//获取服务标签中的员工和数量
String directiveIds = ordersSubList.stream().map(CareOrdersSub::getDirectiveId).collect(Collectors.joining(","));
List<CareOrders> emps = baseMapper.getPermissionEmps(directiveIds);//获取服务标签中的员工和数量
emps.removeIf(data -> data.getOwnCn() < ordersSubList.size());//删除没有权限的数据
String employeeIds = emps.stream().map(Orders::getEmployeeId).collect(Collectors.joining(","));
Orders employee = employeeScreening(directiveIds,orders.getCustomerId(),employeeIds,orders.getStartTime());
String employeeIds = emps.stream().map(CareOrders::getEmployeeId).collect(Collectors.joining(","));
CareOrders employee = employeeScreening(directiveIds,orders.getCustomerId(),employeeIds,orders.getStartTime());
if(employee!=null){
orders.setEmployeeId(employee.getEmployeeId());
orders.setEmployeeName(employee.getEmployeeName());
@ -115,7 +115,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersMapper, Orders> impleme
this.save(orders);//生成工单主表
for(int i=0;i<ordersSubList.size();i++){
OrdersSub ordersSub = ordersSubList.get(i);
CareOrdersSub ordersSub = ordersSubList.get(i);
ordersSub.setMainId(orders.getId());
ordersSub.setEmployeeId(employee.getEmployeeId());
ordersSub.setEmployeeName(employee.getEmployeeName());
@ -137,13 +137,13 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersMapper, Orders> impleme
* 获取满足条件的员工
* @return
*/
private Orders employeeScreening(String directiveIds,String customerId,String employeeIds,Date startTime){
private CareOrders employeeScreening(String directiveIds, String customerId, String employeeIds, Date startTime){
List<Orders> empList = getEmpPermissionAndOnline(directiveIds,employeeIds,startTime);
List<CareOrders> empList = getEmpPermissionAndOnline(directiveIds,employeeIds,startTime);
Map<String,String> orderlyMap = getEmpOrderly(customerId);
if(empList.size()>0){
for(int i=0;i<empList.size();i++){
Orders emp = empList.get(i);
CareOrders emp = empList.get(i);
System.out.println("员工信息:"+emp.getEmployeeName()+","+emp.getOrderCap()+","+emp.getOrderNum()+","+emp.getTotalDuration()+","+emp.getTotalComPrice()+","+emp.getMaxTime()+","+emp.getOwnCn()+","+emp.getIzFree());
String employeeId = emp.getEmployeeId();
if(emp.getIzFree().equals(1)){
@ -165,31 +165,31 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersMapper, Orders> impleme
//通过工单次数排序数据来设置优先级
sortByNumAndSetLevel(empList);
for(int i=0;i<empList.size();i++){
Orders emp = empList.get(i);
CareOrders emp = empList.get(i);
System.out.println("员工获取工单数积分信息:"+emp.getEmployeeId()+"-"+emp.getEmployeeName()+"["+emp.getLevel()+"]");
}
//通过总收益排序数据来设置优先级
sortByPriceAndSetLevel(empList);
for(int i=0;i<empList.size();i++){
Orders emp = empList.get(i);
CareOrders emp = empList.get(i);
System.out.println("员工获取工单收益积分信息:"+emp.getEmployeeId()+"-"+emp.getEmployeeName()+"["+emp.getLevel()+"]");
}
//通过服务时长排序数据来设置优先级
sortByDurationAndSetLevel(empList);
for(int i=0;i<empList.size();i++){
Orders emp = empList.get(i);
CareOrders emp = empList.get(i);
System.out.println("员工获取服务时长积分信息:"+emp.getEmployeeId()+"-"+emp.getEmployeeName()+"["+emp.getLevel()+"]");
}
//通过最后一次接收派单时间排序数据来设置优先级
sortByMaxTimeAndSetLevel(empList);
for(int i=0;i<empList.size();i++){
Orders emp = empList.get(i);
CareOrders emp = empList.get(i);
System.out.println("员工获取派单时间积分信息:"+emp.getEmployeeId()+"-"+emp.getEmployeeName()+"["+emp.getLevel()+"]");
}
//按优先级排序数据
sortByLevel(empList);
for(int i=0;i<empList.size();i++){
Orders emp = empList.get(i);
CareOrders emp = empList.get(i);
System.out.println("员工获取总积分信息:"+emp.getEmployeeId()+"-"+emp.getEmployeeName()+"["+emp.getLevel()+"]");
}
//获取员工信息
@ -202,10 +202,10 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersMapper, Orders> impleme
* 通过工单次数排序数据来设置优先级
* @param empList
*/
public void sortByNumAndSetLevel(List<Orders> empList) {
public void sortByNumAndSetLevel(List<CareOrders> empList) {
// 根据orderNum倒序排序，并为level顺序赋值
List<Orders> sortedEmployees = empList.stream()
.sorted(Comparator.comparing(Orders::getOrderNum).reversed())
List<CareOrders> sortedEmployees = empList.stream()
.sorted(Comparator.comparing(CareOrders::getOrderNum).reversed())
.collect(Collectors.toList());
// 为level字段顺序赋值1,2,3...
@ -224,10 +224,10 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersMapper, Orders> impleme
* 通过总收益排序数据来设置优先级
* @param empList
*/
public void sortByPriceAndSetLevel(List<Orders> empList) {
public void sortByPriceAndSetLevel(List<CareOrders> empList) {
// 根据totalComPrice倒序排序，并为level顺序赋值
List<Orders> sortedEmployees = empList.stream()
.sorted(Comparator.comparing(Orders::getTotalComPrice).reversed())
List<CareOrders> sortedEmployees = empList.stream()
.sorted(Comparator.comparing(CareOrders::getTotalComPrice).reversed())
.collect(Collectors.toList());
// 为level字段顺序赋值1,2,3...
@ -246,10 +246,10 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersMapper, Orders> impleme
* 通过服务时长排序数据来设置优先级
* @param empList
*/
public void sortByDurationAndSetLevel(List<Orders> empList) {
public void sortByDurationAndSetLevel(List<CareOrders> empList) {
// 根据totalDuration倒序排序，并为level顺序赋值
List<Orders> sortedEmployees = empList.stream()
.sorted(Comparator.comparing(Orders::getTotalDuration).reversed())
List<CareOrders> sortedEmployees = empList.stream()
.sorted(Comparator.comparing(CareOrders::getTotalDuration).reversed())
.collect(Collectors.toList());
// 为level字段顺序赋值1,2,3...
@ -268,11 +268,11 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersMapper, Orders> impleme
* 通过最后一次接收派单时间排序数据来设置优先级
* @param empList
*/
public void sortByMaxTimeAndSetLevel(List<Orders> empList) {
public void sortByMaxTimeAndSetLevel(List<CareOrders> empList) {
// 根据maxTime倒序排序，并为level顺序赋值
List<Orders> sortedEmployees = empList.stream()
List<CareOrders> sortedEmployees = empList.stream()
.sorted(Comparator.comparing(
Orders::getMaxTime,
CareOrders::getMaxTime,
Comparator.nullsLast(Comparator.reverseOrder())
))
.collect(Collectors.toList());
@ -293,7 +293,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersMapper, Orders> impleme
* 按优先级排序数据
* @param empList
*/
public void sortByLevel(List<Orders> empList) {
public void sortByLevel(List<CareOrders> empList) {
for (int i = 0; i < empList.size(); i++) {
//工单超出接单上限，降4N级
if(empList.get(i).getOwnCn()>=empList.get(i).getOrderCap()){
@ -302,8 +302,8 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersMapper, Orders> impleme
}
}
//为level顺序
List<Orders> sortedEmployees = empList.stream()
.sorted(Comparator.comparing(Orders::getLevel).reversed())
List<CareOrders> sortedEmployees = empList.stream()
.sorted(Comparator.comparing(CareOrders::getLevel).reversed())
.collect(Collectors.toList());
// 如果需要返回新列表，可以返回sortedEmployees

26
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/service/impl/CareOrdersSubServiceImpl.java Normal file
View File

@ -0,0 +1,26 @@
package com.nu.modules.biz.care.order.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.nu.modules.biz.care.order.entity.CareOrders;
import com.nu.modules.biz.care.order.entity.CareOrdersSub;
import com.nu.modules.biz.care.order.mapper.CareOrdersSubMapper;
import com.nu.modules.biz.care.order.service.ICareOrdersSubService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* @Description: 服务指令工单子表
* @Author: caolei
* @Date: 2025-11-18
* @Version: V1.0
*/
@Service
@Slf4j
public class CareOrdersSubServiceImpl extends ServiceImpl<CareOrdersSubMapper, CareOrdersSub> implements ICareOrdersSubService {
@Override
public List<CareOrdersSub> queryDataPoolSubList(CareOrders orders){
return baseMapper.queryDataPoolSubList(orders);
}
}

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

@ -1,26 +0,0 @@
package com.nu.modules.biz.care.order.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.nu.modules.biz.care.order.entity.Orders;
import com.nu.modules.biz.care.order.entity.OrdersSub;
import com.nu.modules.biz.care.order.mapper.OrdersSubMapper;
import com.nu.modules.biz.care.order.service.IOrdersSubService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* @Description: 服务指令工单子表
* @Author: caolei
* @Date: 2025-11-18
* @Version: V1.0
*/
@Service
@Slf4j
public class OrdersSubServiceImpl extends ServiceImpl<OrdersSubMapper, OrdersSub> implements IOrdersSubService {
@Override
public List<OrdersSub> queryDataPoolSubList(Orders orders){
return baseMapper.queryDataPoolSubList(orders);
}
}

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

@ -23,7 +23,7 @@ import lombok.experimental.Accessors;
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="nu_biz_nu_customer_server对象", description="护理单元客户配置服务指令")
public class PlanBizNuCustomerServer implements Serializable {
public class PlanBizNuCustomerCareServer implements Serializable {
private static final long serialVersionUID = 1L;
/**id*/
@ -114,15 +114,15 @@ public class PlanBizNuCustomerServer implements Serializable {
/**服务指令列表**/
@TableField(exist = false)
private List<PlanBizNuCustomerServer> serverList;
private List<PlanBizNuCustomerCareServer> serverList;
/**即时服务指令列表**/
@TableField(exist = false)
private List<PlanBizNuCustomerServerInstant> instantList;
private List<PlanBizNuCustomerCareServerInstant> instantList;
/**长者标签列表**/
@TableField(exist = false)
private List<PlanBizNuCustomerElderTag> tagList;
/**服务包中的服务列表**/
@TableField(exist = false)
private List<PlanBizNuCustomerServer> directivesList;
private List<PlanBizNuCustomerCareServer> directivesList;
}

4
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/entity/PlanBizNuCustomerServerInstant.java → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/entity/PlanBizNuCustomerCareServerInstant.java
View File

@ -25,8 +25,8 @@ import java.util.Date;
@TableName("nu_biz_nu_customer_care_server_instant")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="nu_biz_nu_customer_server_instant对象", description="护理单元客户配置服务指令即时指令")
public class PlanBizNuCustomerServerInstant implements Serializable {
@ApiModel(value="nu_biz_nu_customer_care_server_instant对象", description="护理单元客户配置服务指令即时指令")
public class PlanBizNuCustomerCareServerInstant implements Serializable {
private static final long serialVersionUID = 1L;
/**id*/

2
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/entity/PlanDirectivePackage.java
View File

@ -54,6 +54,6 @@ public class PlanDirectivePackage implements Serializable {
// 结束时间
private String endTimeStr;
// 服务指令集合
private List<PlanBizNuCustomerServer> directivesList;
private List<PlanBizNuCustomerCareServer> directivesList;
}

4
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/mapper/PlanBizNuCustomerServerInstantMapper.java → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/mapper/PlanBizNuCustomerCareServerInstantMapper.java
View File

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

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

@ -1,7 +1,7 @@
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.PlanBizNuCustomerCareServer;
import com.nu.modules.biz.care.plan.entity.PlanDirectivePackage;
import org.apache.ibatis.annotations.Param;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@ -12,13 +12,13 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* @Date: 2025-03-31
* @Version: V1.0
*/
public interface PlanBizNuCustomerServerMapper extends BaseMapper<PlanBizNuCustomerServer> {
public interface PlanBizNuCustomerCareServerMapper extends BaseMapper<PlanBizNuCustomerCareServer> {
List<PlanBizNuCustomerServer> getGroupPositioning(PlanBizNuCustomerServer planBizNuCustomerServer);
List<PlanBizNuCustomerCareServer> getGroupPositioning(PlanBizNuCustomerCareServer planBizNuCustomerServer);
List<PlanDirectivePackage> getNcPackagelist(@Param("params") PlanDirectivePackage directivePackageDto);
List<PlanBizNuCustomerServer> getNcDirectiveList(@Param("params") PlanBizNuCustomerServer planBizNuCustomerServer);
List<PlanBizNuCustomerCareServer> getNcDirectiveList(@Param("params") PlanBizNuCustomerCareServer planBizNuCustomerServer);
int deleteByIdPhysic(@Param("id") String id);
}

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

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

6
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/mapper/xml/PlanBizNuCustomerServerMapper.xml → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/mapper/xml/PlanBizNuCustomerCareServerMapper.xml
View File

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.nu.modules.biz.care.plan.mapper.PlanBizNuCustomerServerMapper">
<mapper namespace="com.nu.modules.biz.care.plan.mapper.PlanBizNuCustomerCareServerMapper">
<delete id="deleteByIdPhysic">
delete from nu_biz_nu_customer_care_server where id = #{id}
</delete>
<select id="getGroupPositioning" resultType="com.nu.modules.biz.care.plan.entity.PlanBizNuCustomerServer">
<select id="getGroupPositioning" resultType="com.nu.modules.biz.care.plan.entity.PlanBizNuCustomerCareServer">
</select>
@ -20,7 +20,7 @@
and iz_enabled = 'Y'
</select>
<select id="getNcDirectiveList" resultType="com.nu.modules.biz.care.plan.entity.PlanBizNuCustomerServer">
<select id="getNcDirectiveList" resultType="com.nu.modules.biz.care.plan.entity.PlanBizNuCustomerCareServer">
select a.package_id,a.cycle_type,a.cycle_value,b.*,
c.category_name AS category_name,
d.type_name AS type_name,

4
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/service/IPlanBizNuCustomerServerInstantService.java → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/service/IPlanBizNuCustomerCareServerInstantService.java
View File

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

4
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/service/IPlanBizNuCustomerServerService.java → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/service/IPlanBizNuCustomerCareServerService.java
View File

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

22
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/service/impl/PlanBizNuCustomerCareServerInstantServiceImpl.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.PlanBizNuCustomerCareServerInstant;
import com.nu.modules.biz.care.plan.mapper.PlanBizNuCustomerCareServerInstantMapper;
import com.nu.modules.biz.care.plan.service.IPlanBizNuCustomerCareServerInstantService;
import org.springframework.stereotype.Service;
/**
* @Description: 护理单元客户配置服务指令即时指令
* @Author: caolei
* @Date: 2025-10-13
* @Version: V1.0
*/
@Service
public class PlanBizNuCustomerCareServerInstantServiceImpl extends ServiceImpl<PlanBizNuCustomerCareServerInstantMapper, PlanBizNuCustomerCareServerInstant> implements IPlanBizNuCustomerCareServerInstantService {
@Override
public int deleteByIdPhysic(String id) {
return baseMapper.deleteByIdPhysic(id);
}
}

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

@ -9,21 +9,21 @@ 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.common.entity.ConfigServiceCategory;
import com.nu.modules.biz.common.entity.ConfigServiceDirective;
import com.nu.modules.biz.common.entity.ConfigServiceType;
import com.nu.modules.biz.common.service.IConfigServiceCategoryService;
import com.nu.modules.biz.common.service.IConfigServiceDirectiveService;
import com.nu.modules.biz.common.service.IConfigServiceTypeService;
import com.nu.modules.biz.care.datapool.service.impl.DataPoolServiceImpl;
import com.nu.modules.biz.common.entity.BizConfigServiceCategory;
import com.nu.modules.biz.common.entity.BizConfigServiceDirective;
import com.nu.modules.biz.common.entity.BizConfigServiceType;
import com.nu.modules.biz.common.service.IBizConfigServiceCategoryService;
import com.nu.modules.biz.common.service.IBizConfigServiceDirectiveService;
import com.nu.modules.biz.common.service.IBizConfigServiceTypeService;
import com.nu.modules.biz.care.datapool.service.impl.CareDataPoolServiceImpl;
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.PlanBizNuCustomerCareServer;
import com.nu.modules.biz.care.plan.entity.PlanBizNuCustomerCareServerInstant;
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.mapper.PlanBizNuCustomerCareServerMapper;
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.biz.care.plan.service.IPlanBizNuCustomerCareServerInstantService;
import com.nu.modules.biz.care.plan.service.IPlanBizNuCustomerCareServerService;
import com.nu.modules.care.api.ICareDirectivePlanApi;
import com.nu.modules.sysconfig.ISysConfigApi;
import org.springframework.beans.factory.annotation.Autowired;
@ -39,22 +39,22 @@ import java.util.*;
* @Version: V1.0
*/
@Service
public class PlanBizNuCustomerServerServiceImpl extends ServiceImpl<PlanBizNuCustomerServerMapper, PlanBizNuCustomerServer> implements IPlanBizNuCustomerServerService, ICareDirectivePlanApi {
public class PlanBizNuCustomerCareServerServiceImpl extends ServiceImpl<PlanBizNuCustomerCareServerMapper, PlanBizNuCustomerCareServer> implements IPlanBizNuCustomerCareServerService, ICareDirectivePlanApi {
@Autowired
private IConfigServiceCategoryService careConfigServiceCategoryService;
private IBizConfigServiceCategoryService careConfigServiceCategoryService;
@Autowired
private IConfigServiceTypeService careConfigServiceTypeService;
private IBizConfigServiceTypeService careConfigServiceTypeService;
@Autowired
private IConfigServiceDirectiveService careConfigServiceDirectiveService;
private IBizConfigServiceDirectiveService careConfigServiceDirectiveService;
@Autowired
private IPlanBizNuCustomerServerInstantService planBizNuCustomerServerInstantService;
private IPlanBizNuCustomerCareServerInstantService planBizNuCustomerServerInstantService;
@Autowired
private IPlanBizNuCustomerElderTagService planBizNuCustomerElderTagService;
@Autowired
private ISysConfigApi sysConfigApi;
@Autowired
private DataPoolServiceImpl dataPoolServiceImpl;
private CareDataPoolServiceImpl dataPoolServiceImpl;
private String serverNetUrl;
@ -62,18 +62,18 @@ public class PlanBizNuCustomerServerServiceImpl extends ServiceImpl<PlanBizNuCus
public Map<String, Object> getPlanList(CareDirectiveEntity careDirectiveEntity) {
Map<String, Object> resMap = new HashMap<>();
//服务指令计划
QueryWrapper<PlanBizNuCustomerServer> PlanBizNuCustomerServerQueryWrapper = new QueryWrapper<>();
QueryWrapper<PlanBizNuCustomerCareServer> 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) {
List<PlanBizNuCustomerCareServer> groupList = baseMapper.selectList(PlanBizNuCustomerServerQueryWrapper);
for (PlanBizNuCustomerCareServer par : groupList) {
if (par.getIzPackage().equals("Y")) {
String directiveId = par.getDirectiveId();
if (directiveId != null && !directiveId.equals("")) {
PlanBizNuCustomerServer packageDirective = new PlanBizNuCustomerServer();
PlanBizNuCustomerCareServer packageDirective = new PlanBizNuCustomerCareServer();
packageDirective.setPackageId(directiveId);
List<PlanBizNuCustomerServer> pdList = baseMapper.getNcDirectiveList(packageDirective);
for (PlanBizNuCustomerServer pd : pdList) {
List<PlanBizNuCustomerCareServer> pdList = baseMapper.getNcDirectiveList(packageDirective);
for (PlanBizNuCustomerCareServer pd : pdList) {
getNetImages(pd);
}
par.setDirectivesList(pdList);
@ -83,11 +83,11 @@ public class PlanBizNuCustomerServerServiceImpl extends ServiceImpl<PlanBizNuCus
resMap.put("serviceList", groupList);//服务指令计划
//即时指令
QueryWrapper<PlanBizNuCustomerServerInstant> instantQueryWrapper = new QueryWrapper<>();
QueryWrapper<PlanBizNuCustomerCareServerInstant> 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);
List<PlanBizNuCustomerCareServerInstant> instantList = planBizNuCustomerServerInstantService.list(instantQueryWrapper);
// for (PlanBizNuCustomerServerInstant pari : instantList) {
// getInstantNetImages(pari);
// }
@ -138,7 +138,7 @@ public class PlanBizNuCustomerServerServiceImpl extends ServiceImpl<PlanBizNuCus
return resMap;
}
private PlanBizNuCustomerServer getNetImages(PlanBizNuCustomerServer par) {
private PlanBizNuCustomerCareServer getNetImages(PlanBizNuCustomerCareServer par) {
if (par.getImmediateFile() != null && !par.getImmediateFile().equals("")) {
String immediateFile = getImageNetUrl(par.getImmediateFile());
par.setNetImmediateFile(immediateFile);
@ -184,7 +184,7 @@ public class PlanBizNuCustomerServerServiceImpl extends ServiceImpl<PlanBizNuCus
return par;
}
private PlanBizNuCustomerServerInstant getInstantNetImages(PlanBizNuCustomerServerInstant par) {
private PlanBizNuCustomerCareServerInstant getInstantNetImages(PlanBizNuCustomerCareServerInstant par) {
if (par.getImmediateFile() != null && !par.getImmediateFile().equals("")) {
String immediateFile = getImageNetUrl(par.getImmediateFile());
par.setNetImmediateFile(immediateFile);
@ -232,11 +232,11 @@ public class PlanBizNuCustomerServerServiceImpl extends ServiceImpl<PlanBizNuCus
@Override
public CareDirectiveEntity addNuCustomerServer(CareDirectiveEntity careDirectiveEntity) {
PlanBizNuCustomerServer planBizNuCustomerServer = new PlanBizNuCustomerServer();
PlanBizNuCustomerCareServer planBizNuCustomerServer = new PlanBizNuCustomerCareServer();
BeanUtils.copyProperties(careDirectiveEntity, planBizNuCustomerServer);
ConfigServiceDirective careConfigServiceDirective = careConfigServiceDirectiveService.getById(planBizNuCustomerServer.getDirectiveId());
ConfigServiceCategory careConfigServiceCategory = careConfigServiceCategoryService.getById(careConfigServiceDirective.getCategoryId());
ConfigServiceType careConfigServiceType = careConfigServiceTypeService.getById(careConfigServiceDirective.getTypeId());
BizConfigServiceDirective careConfigServiceDirective = careConfigServiceDirectiveService.getById(planBizNuCustomerServer.getDirectiveId());
BizConfigServiceCategory careConfigServiceCategory = careConfigServiceCategoryService.getById(careConfigServiceDirective.getCategoryId());
BizConfigServiceType careConfigServiceType = careConfigServiceTypeService.getById(careConfigServiceDirective.getTypeId());
planBizNuCustomerServer.setCategoryId(careConfigServiceCategory.getId());
planBizNuCustomerServer.setCategoryName(careConfigServiceCategory.getCategoryName());
planBizNuCustomerServer.setTypeId(careConfigServiceType.getId());
@ -248,11 +248,11 @@ public class PlanBizNuCustomerServerServiceImpl extends ServiceImpl<PlanBizNuCus
@Override
public CareDirectiveEntity editNuCustomerServer(CareDirectiveEntity careDirectiveEntity) {
PlanBizNuCustomerServer planBizNuCustomerServer = new PlanBizNuCustomerServer();
PlanBizNuCustomerCareServer planBizNuCustomerServer = new PlanBizNuCustomerCareServer();
BeanUtils.copyProperties(careDirectiveEntity, planBizNuCustomerServer);
ConfigServiceDirective careConfigServiceDirective = careConfigServiceDirectiveService.getById(planBizNuCustomerServer.getDirectiveId());
ConfigServiceCategory careConfigServiceCategory = careConfigServiceCategoryService.getById(careConfigServiceDirective.getCategoryId());
ConfigServiceType careConfigServiceType = careConfigServiceTypeService.getById(careConfigServiceDirective.getTypeId());
BizConfigServiceDirective careConfigServiceDirective = careConfigServiceDirectiveService.getById(planBizNuCustomerServer.getDirectiveId());
BizConfigServiceCategory careConfigServiceCategory = careConfigServiceCategoryService.getById(careConfigServiceDirective.getCategoryId());
BizConfigServiceType careConfigServiceType = careConfigServiceTypeService.getById(careConfigServiceDirective.getTypeId());
planBizNuCustomerServer.setCategoryId(careConfigServiceCategory.getId());
planBizNuCustomerServer.setCategoryName(careConfigServiceCategory.getCategoryName());
planBizNuCustomerServer.setTypeId(careConfigServiceType.getId());
@ -269,7 +269,7 @@ public class PlanBizNuCustomerServerServiceImpl extends ServiceImpl<PlanBizNuCus
@Override
public CareDirectiveEntity getNuCustomerServerById(String id){
PlanBizNuCustomerServer planBizNuCustomerServer = this.getById(id);
PlanBizNuCustomerCareServer planBizNuCustomerServer = this.getById(id);
CareDirectiveEntity careDirectiveEntity = new CareDirectiveEntity();
BeanUtils.copyProperties(planBizNuCustomerServer, careDirectiveEntity);
return careDirectiveEntity;
@ -299,7 +299,7 @@ public class PlanBizNuCustomerServerServiceImpl extends ServiceImpl<PlanBizNuCus
@Override
public CareDirectiveEntity addDirective(CareDirectiveEntity careDirectiveEntity) {
PlanBizNuCustomerServer planBizNuCustomerServer = new PlanBizNuCustomerServer();
PlanBizNuCustomerCareServer planBizNuCustomerServer = new PlanBizNuCustomerCareServer();
BeanUtils.copyProperties(careDirectiveEntity,planBizNuCustomerServer);
baseMapper.insert(planBizNuCustomerServer);
//TODO 增加日志
@ -312,9 +312,9 @@ public class PlanBizNuCustomerServerServiceImpl extends ServiceImpl<PlanBizNuCus
@Override
public void editDirective(CareDirectiveEntity careDirectiveEntity) {
PlanBizNuCustomerServer planBizNuCustomerServer = new PlanBizNuCustomerServer();
PlanBizNuCustomerCareServer planBizNuCustomerServer = new PlanBizNuCustomerCareServer();
BeanUtils.copyProperties(careDirectiveEntity,planBizNuCustomerServer);
PlanBizNuCustomerServer entity = baseMapper.selectById(careDirectiveEntity.getId());
PlanBizNuCustomerCareServer entity = baseMapper.selectById(careDirectiveEntity.getId());
baseMapper.updateById(planBizNuCustomerServer);
//TODO 增加日志
//调用方法先删除数据池中的数据，再生成数据池中的数据
@ -323,7 +323,7 @@ public class PlanBizNuCustomerServerServiceImpl extends ServiceImpl<PlanBizNuCus
@Override
public void deleteDirective(CareDirectiveEntity careDirectiveEntity) {
PlanBizNuCustomerServer planBizNuCustomerServer = new PlanBizNuCustomerServer();
PlanBizNuCustomerCareServer planBizNuCustomerServer = new PlanBizNuCustomerCareServer();
BeanUtils.copyProperties(careDirectiveEntity,planBizNuCustomerServer);
String id = planBizNuCustomerServer.getId();
//调用方法删除数据池中的数据
@ -334,7 +334,7 @@ public class PlanBizNuCustomerServerServiceImpl extends ServiceImpl<PlanBizNuCus
@Override
public CareDirectiveInstantEntity addInstant(CareDirectiveInstantEntity careDirectiveInstantEntity) {
PlanBizNuCustomerServerInstant customerServerInstant = new PlanBizNuCustomerServerInstant();
PlanBizNuCustomerCareServerInstant customerServerInstant = new PlanBizNuCustomerCareServerInstant();
BeanUtils.copyProperties(careDirectiveInstantEntity,customerServerInstant);
planBizNuCustomerServerInstantService.save(customerServerInstant);
//TODO 增加日志
@ -357,7 +357,7 @@ public class PlanBizNuCustomerServerServiceImpl extends ServiceImpl<PlanBizNuCus
@Override
public void editInstant(CareDirectiveInstantEntity careDirectiveInstantEntity) {
PlanBizNuCustomerServerInstant customerServerInstant = new PlanBizNuCustomerServerInstant();
PlanBizNuCustomerCareServerInstant customerServerInstant = new PlanBizNuCustomerCareServerInstant();
BeanUtils.copyProperties(careDirectiveInstantEntity,customerServerInstant);
planBizNuCustomerServerInstantService.updateById(customerServerInstant);
//TODO 增加日志
@ -400,10 +400,10 @@ public class PlanBizNuCustomerServerServiceImpl extends ServiceImpl<PlanBizNuCus
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());
List<PlanBizNuCustomerCareServer> directiveList = baseMapper.getNcDirectiveList(new PlanBizNuCustomerCareServer());
for (CareDirectivePackageEntity et : mainList) {
List<CareDirectiveEntity> directivesList = new ArrayList<>();
for (PlanBizNuCustomerServer etd : directiveList) {
for (PlanBizNuCustomerCareServer etd : directiveList) {
if (etd.getPackageId().equals(et.getId())) {
getNetImages(etd);
CareDirectiveEntity careDirectiveEntity = new CareDirectiveEntity();

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

@ -1,22 +0,0 @@
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);
}
}

2
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/entity/ConfigInstructionTag.java → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/entity/BizConfigInstructionTag.java
View File

@ -26,7 +26,7 @@ import java.util.Date;
@TableName("nu_config_service_instruction_tag")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
public class ConfigInstructionTag implements Serializable {
public class BizConfigInstructionTag implements Serializable {
private static final long serialVersionUID = 1L;
/**id*/

2
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/entity/ConfigServiceCategory.java → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/entity/BizConfigServiceCategory.java
View File

@ -25,7 +25,7 @@ import lombok.experimental.Accessors;
@TableName("nu_config_service_category")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
public class ConfigServiceCategory implements Serializable {
public class BizConfigServiceCategory implements Serializable {
private static final long serialVersionUID = 1L;
/**id*/

2
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/entity/ConfigServiceDirective.java → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/entity/BizConfigServiceDirective.java
View File

@ -23,7 +23,7 @@ import lombok.experimental.Accessors;
@TableName("nu_config_service_directive")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
public class ConfigServiceDirective implements Serializable {
public class BizConfigServiceDirective implements Serializable {
private static final long serialVersionUID = 1L;
/**id*/

2
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/entity/ConfigServiceType.java → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/entity/BizConfigServiceType.java
View File

@ -25,7 +25,7 @@ import lombok.experimental.Accessors;
@TableName("nu_config_service_type")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
public class ConfigServiceType implements Serializable {
public class BizConfigServiceType implements Serializable {
private static final long serialVersionUID = 1L;
/**id*/

4
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/ConfigInstructionTagMapper.java → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/BizConfigInstructionTagMapper.java
View File

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

4
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/ConfigServiceCategoryMapper.java → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/BizConfigServiceCategoryMapper.java
View File

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

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

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

4
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/ConfigServiceTypeMapper.java → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/BizConfigServiceTypeMapper.java
View File

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

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

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

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

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

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

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

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

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

4
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/IConfigInstructionTagService.java → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/IBizConfigInstructionTagService.java
View File

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

4
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/IConfigServiceCategoryService.java → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/IBizConfigServiceCategoryService.java
View File

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

4
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/IConfigServiceDirectiveService.java → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/IBizConfigServiceDirectiveService.java
View File

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

4
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/IConfigServiceTypeService.java → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/IBizConfigServiceTypeService.java
View File

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

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

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

50
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/impl/ConfigServiceCategoryServiceImpl.java → nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/impl/BizConfigServiceCategoryServiceImpl.java
View File

@ -3,15 +3,15 @@ package com.nu.modules.biz.common.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.nu.modules.biz.common.entity.ConfigServiceCategory;
import com.nu.modules.biz.common.entity.ConfigServiceDirective;
import com.nu.modules.biz.common.entity.ConfigServiceType;
import com.nu.modules.biz.common.entity.ConfigInstructionTag;
import com.nu.modules.biz.common.mapper.ConfigServiceCategoryMapper;
import com.nu.modules.biz.common.service.IConfigServiceCategoryService;
import com.nu.modules.biz.common.service.IConfigServiceDirectiveService;
import com.nu.modules.biz.common.service.IConfigServiceTypeService;
import com.nu.modules.biz.common.service.IConfigInstructionTagService;
import com.nu.modules.biz.common.entity.BizConfigServiceCategory;
import com.nu.modules.biz.common.entity.BizConfigServiceDirective;
import com.nu.modules.biz.common.entity.BizConfigServiceType;
import com.nu.modules.biz.common.entity.BizConfigInstructionTag;
import com.nu.modules.biz.common.mapper.BizConfigServiceCategoryMapper;
import com.nu.modules.biz.common.service.IBizConfigServiceCategoryService;
import com.nu.modules.biz.common.service.IBizConfigServiceDirectiveService;
import com.nu.modules.biz.common.service.IBizConfigServiceTypeService;
import com.nu.modules.biz.common.service.IBizConfigInstructionTagService;
import com.nu.modules.care.api.IDirectiveConfigApi;
import com.nu.modules.sysconfig.ISysConfigApi;
import org.apache.commons.lang3.StringUtils;
@ -30,14 +30,14 @@ import java.util.Map;
* @Version: V1.0
*/
@Service
public class ConfigServiceCategoryServiceImpl extends ServiceImpl<ConfigServiceCategoryMapper, ConfigServiceCategory> implements IConfigServiceCategoryService, IDirectiveConfigApi {
public class BizConfigServiceCategoryServiceImpl extends ServiceImpl<BizConfigServiceCategoryMapper, BizConfigServiceCategory> implements IBizConfigServiceCategoryService, IDirectiveConfigApi {
@Autowired
private IConfigInstructionTagService instructionTagService;
private IBizConfigInstructionTagService instructionTagService;
@Autowired
private IConfigServiceTypeService configServiceTypeService;
private IBizConfigServiceTypeService configServiceTypeService;
@Autowired
private IConfigServiceDirectiveService configServiceDirectiveService;
private IBizConfigServiceDirectiveService configServiceDirectiveService;
@Autowired
private ISysConfigApi sysConfigApi;
@ -47,38 +47,38 @@ public class ConfigServiceCategoryServiceImpl extends ServiceImpl<ConfigServiceC
String mediaAddress = getOpeMediaAddress();
//查询护理类服务
QueryWrapper<ConfigInstructionTag> instructionTagQueryWrapper = new QueryWrapper<>();
QueryWrapper<BizConfigInstructionTag> instructionTagQueryWrapper = new QueryWrapper<>();
instructionTagQueryWrapper.eq("iz_enabled", "Y");
instructionTagQueryWrapper.eq("del_flag", "0");
instructionTagQueryWrapper.eq("instruction_type", instructionType);
List<ConfigInstructionTag> instructionTagList = instructionTagService.list(instructionTagQueryWrapper);
List<BizConfigInstructionTag> instructionTagList = instructionTagService.list(instructionTagQueryWrapper);
Map<String, Object> tagMap = new HashMap<String, Object>();
for (ConfigInstructionTag par : instructionTagList) {
for (BizConfigInstructionTag par : instructionTagList) {
tagMap.put(par.getId(), par.getInstructionName());
}
//查询服务类别数据
QueryWrapper<ConfigServiceCategory> categoryQueryWrapper = new QueryWrapper<>();
QueryWrapper<BizConfigServiceCategory> categoryQueryWrapper = new QueryWrapper<>();
categoryQueryWrapper.eq("iz_enabled", "Y");
categoryQueryWrapper.eq("del_flag", "0");
List<ConfigServiceCategory> categoryList = baseMapper.selectList(categoryQueryWrapper);
List<BizConfigServiceCategory> categoryList = baseMapper.selectList(categoryQueryWrapper);
//查询服务类型数据
QueryWrapper<ConfigServiceType> typeQueryWrapper = new QueryWrapper<>();
QueryWrapper<BizConfigServiceType> typeQueryWrapper = new QueryWrapper<>();
typeQueryWrapper.eq("iz_enabled", "Y");
typeQueryWrapper.eq("del_flag", "0");
List<ConfigServiceType> typeList = configServiceTypeService.list(typeQueryWrapper);
List<BizConfigServiceType> typeList = configServiceTypeService.list(typeQueryWrapper);
//查询服务指令数据
QueryWrapper<ConfigServiceDirective> directiveQueryWrapper = new QueryWrapper<>();
QueryWrapper<BizConfigServiceDirective> directiveQueryWrapper = new QueryWrapper<>();
directiveQueryWrapper.eq("iz_enabled", "Y");
directiveQueryWrapper.eq("del_flag", "0");
List<ConfigServiceDirective> directiveList = configServiceDirectiveService.list(directiveQueryWrapper);
List<BizConfigServiceDirective> directiveList = configServiceDirectiveService.list(directiveQueryWrapper);
//封装服务指令和服务类型tree集合
List<Map<String, Object>> typeMapList = new ArrayList<>();
for (ConfigServiceType par : typeList) {
for (BizConfigServiceType par : typeList) {
Map<String, Object> wllxMap = new HashMap<String, Object>();
List<Map<String, Object>> directiceMapList = new ArrayList<Map<String, Object>>();
for (ConfigServiceDirective directicePar : directiveList) {
for (BizConfigServiceDirective directicePar : directiveList) {
if (StringUtils.equals(directicePar.getTypeId(), par.getId())) {
Map<String, Object> directiceMap = new HashMap<String, Object>();
directiceMap.put("id", directicePar.getId());
@ -161,7 +161,7 @@ public class ConfigServiceCategoryServiceImpl extends ServiceImpl<ConfigServiceC
//封装服务类别服务类型tree集合
List<Map<String, Object>> treeList = new ArrayList<>();
int index = 0;
for (ConfigServiceCategory par : categoryList) {
for (BizConfigServiceCategory par : categoryList) {
index++;
Map<String, Object> infoMap = new HashMap<String, Object>();
List<Map<String, Object>> wllxMap2List = new ArrayList<Map<String, Object>>();

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

@ -0,0 +1,18 @@
package com.nu.modules.biz.common.service.impl;
import com.nu.modules.biz.common.entity.BizConfigServiceDirective;
import com.nu.modules.biz.common.mapper.BizConfigServiceDirectiveMapper;
import com.nu.modules.biz.common.service.IBizConfigServiceDirectiveService;
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 BizConfigServiceDirectiveServiceImpl extends ServiceImpl<BizConfigServiceDirectiveMapper, BizConfigServiceDirective> implements IBizConfigServiceDirectiveService {
}

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

@ -0,0 +1,19 @@
package com.nu.modules.biz.common.service.impl;
import com.nu.modules.biz.common.entity.BizConfigServiceType;
import com.nu.modules.biz.common.mapper.BizConfigServiceTypeMapper;
import com.nu.modules.biz.common.service.IBizConfigServiceTypeService;
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 BizConfigServiceTypeServiceImpl extends ServiceImpl<BizConfigServiceTypeMapper, BizConfigServiceType> implements IBizConfigServiceTypeService {
}

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

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

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

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

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

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