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

添加接口

This commit is contained in:
yangjun 2025-12-29 09:42:28 +08:00
parent 37884ae4a4
commit 18e3b56434
4 changed files with 58 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nursing-unit-api/src/main/java/com/nu/modules/pad/care/api/CareApi.java
View File

@ -86,4 +86,18 @@ public class CareApi {
Map<String, Object> pddMap = carePadApi.editSubPicPath(careOrdersSubEntity);
return Result.OK("操作成功！");
}
@ApiOperation(value = "服务指令工单-查询工单列表", notes = "服务指令工单-查询工单列表")
@GetMapping(value = "/queryWorkCareList")
public Result<IPage<CareOrdersEntity>> queryWorkCareList(CareOrdersEntity careOrdersEntityDto,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
if(StringUtils.isBlank(careOrdersEntityDto.getNuId())){
return Result.error("参数错误，请选择正确的护理单元");
}
IPage<CareOrdersEntity> pageList = carePadApi.queryWorkCareList(pageNo, pageSize, careOrdersEntityDto,req);
return Result.OK(pageList);
}
}

3
nursing-unit-common/src/main/java/com/nu/entity/CareOrdersEntity.java
View File

@ -155,4 +155,7 @@ public class CareOrdersEntity implements Serializable {
//空闲状态提高3级 指定护理员提高2级
@TableField(exist = false)
private Integer level;
/**工单类型 1待执行 2已执行 3已完成 4已过期 5待执行或者已执行未完成 空是全部*/
@TableField(exist = false)
private String workType;
}

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

@ -20,4 +20,6 @@ public interface ICarePadApi {
Map<String, Object> startOrder(CareOrdersSubEntity careOrdersSubEntity);
Map<String, Object> endOrder(CareOrdersSubEntity careOrdersSubEntity);
IPage<CareOrdersEntity> queryWorkCareList(Integer pageNo, Integer pageSize, CareOrdersEntity careOrdersEntityDto, HttpServletRequest req);
}

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

@ -20,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletRequest;
import java.time.LocalDateTime;
import java.util.*;
/**
@ -105,6 +106,44 @@ public class CarePadServiceImpl extends ServiceImpl<CareOrdersMapper, CareOrders
return map;
}
@Override
public IPage<CareOrdersEntity> queryWorkCareList(Integer pageNo, Integer pageSize, CareOrdersEntity careOrdersEntityDto, HttpServletRequest req) {
CareOrders careOrders = new CareOrders();
BeanUtils.copyProperties(careOrdersEntityDto,careOrders);
QueryWrapper<CareOrders> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("nu_id",careOrdersEntityDto.getNuId());
queryWrapper.eq(StringUtils.isNotBlank(careOrdersEntityDto.getEmployeeId()),"employee_id",careOrdersEntityDto.getEmployeeId());
// 方法1: 使用between查询
LocalDateTime todayStart = LocalDateTime.now().withHour(0).withMinute(0).withSecond(0);
LocalDateTime todayEnd = LocalDateTime.now().withHour(23).withMinute(59).withSecond(59);
queryWrapper.between("start_time", todayStart, todayEnd);
/**工单类型 1待执行 2已执行 3已完成 4已过期 5待执行或者已执行未完成 空是全部*/
if(StringUtils.equals("1",careOrdersEntityDto.getWorkType())){
queryWrapper.eq("iz_start","N");
queryWrapper.eq("iz_finish","N");
queryWrapper.apply("start_time > now()");
queryWrapper.orderByAsc("start_time");
}else if(StringUtils.equals("2",careOrdersEntityDto.getWorkType())){
queryWrapper.eq("iz_start","Y");
queryWrapper.eq("iz_finish","N");
queryWrapper.orderByAsc("start_time");
}else if(StringUtils.equals("3",careOrdersEntityDto.getWorkType())){
queryWrapper.eq("iz_start","Y");
queryWrapper.eq("iz_finish","Y");
}else if(StringUtils.equals("4",careOrdersEntityDto.getWorkType())){
queryWrapper.eq("iz_start","N");
queryWrapper.eq("iz_finish","N");
queryWrapper.apply("start_time < now()");
}else if(StringUtils.equals("5",careOrdersEntityDto.getWorkType())){
queryWrapper.apply("((iz_start = 'N' and iz_finish='N') or (iz_start='Y' and iz_finish='N'))");
}
Page<CareOrders> page = new Page<>(pageNo, pageSize);
List<CareOrders> list = baseMapper.selectList(page,queryWrapper);
IPage<CareOrdersEntity> entityPage = new Page<>(page.getCurrent(), page.getSize(), page.getTotal());
entityPage.setRecords(BeanUtil.copyToList(list, CareOrdersEntity.class));
return entityPage;
}
@Override
public Map<String, Object> editSubMp4(CareOrdersSubEntity careOrdersSubEntity) {
CareOrdersSub careOrdersSub = new CareOrdersSub();