1. 在ActivityDefinition实体类及相关DTO中添加inspectionTypeId字段

2. 新增检验类型分页查询接口及前端API调用
3. 优化检验申请模块的前后端交互逻辑
4.完成修改78 增加门诊医生开立检验申请单立检验申请单的检验项目写死的问题
5.对检验目录设置的查询,更新和保存进行修改完善。
6.对检验项目设置的页面使用vue3+elementui进行修改。
This commit is contained in:
wangjian963
2026-03-12 18:58:54 +08:00
parent bc12cc1b08
commit 5f134945ab
13 changed files with 917 additions and 1365 deletions

View File

@@ -1,5 +1,7 @@
package com.openhis.lab.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.openhis.lab.domain.InspectionType;
@@ -11,4 +13,13 @@ import com.openhis.lab.domain.InspectionType;
*/
public interface IInspectionTypeService extends IService<InspectionType> {
/**
* 分页查询检验类型列表
*
* @param pageNo 页码
* @param pageSize 每页数量
* @param searchKey 搜索关键词(可选)
* @return 分页结果
*/
IPage<InspectionType> getPage(Integer pageNo, Integer pageSize, String searchKey);
}

View File

@@ -1,10 +1,14 @@
package com.openhis.lab.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.openhis.lab.domain.InspectionType;
import com.openhis.lab.mapper.InspectionTypeMapper;
import com.openhis.lab.service.IInspectionTypeService;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
/**
* 检验类型Service实现类
@@ -15,4 +19,22 @@ import org.springframework.stereotype.Service;
@Service
public class InspectionTypeServiceImpl extends ServiceImpl<InspectionTypeMapper, InspectionType> implements IInspectionTypeService {
@Override
public IPage<InspectionType> getPage(Integer pageNo, Integer pageSize, String searchKey) {
Page<InspectionType> page = new Page<>(pageNo, pageSize);
LambdaQueryWrapper<InspectionType> queryWrapper = new LambdaQueryWrapper<>();
// 搜索关键词(按编码或名称模糊查询)
if (StringUtils.hasText(searchKey)) {
queryWrapper.and(wrapper -> wrapper
.like(InspectionType::getCode, searchKey)
.or()
.like(InspectionType::getName, searchKey));
}
// 按排序字段升序排列
queryWrapper.orderByAsc(InspectionType::getSortOrder);
return this.page(page, queryWrapper);
}
}

View File

@@ -89,4 +89,7 @@ public class ActivityDefinition extends HisBaseEntity {
/** 服务范围 */
private String serviceRange;
/** 检验类型ID关联 inspection_type 表) */
private Long inspectionTypeId;
}