wangyizhe/his
1
3
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

套餐设置套餐管理完善

Browse Source
This commit is contained in:
nanyangbreeze
2026-02-03 14:03:07 +08:00
parent 3acf8ad50a
commit 3d31b3482a
4 changed files with 136 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
openhis-server-new/openhis-application/src/main/java/com/openhis/web/lab/controller/InspectionTypeController.java
View File

@@ -69,7 +69,9 @@ public class InspectionTypeController extends BaseController {
// 验证code字段是否唯一
QueryWrapper<InspectionType> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("code", inspectionType.getCode());
queryWrapper.eq("code", inspectionType.getCode())
// 只在“有效(valid_flag=1)”范围内判重；逻辑删除(valid_flag=0)的不阻止复用编码
.eq("valid_flag", 1);
// 查询是否存在相同编码的记录
List<InspectionType> existingRecords = inspectionTypeService.list(queryWrapper);
@@ -86,7 +88,8 @@ public class InspectionTypeController extends BaseController {
return transactionTemplate.execute(status -> {
// 再次检查，防止并发问题
QueryWrapper<InspectionType> checkWrapper = new QueryWrapper<>();
checkWrapper.eq("code", inspectionType.getCode());
checkWrapper.eq("code", inspectionType.getCode())
.eq("valid_flag", 1);
List<InspectionType> finalCheck = inspectionTypeService.list(checkWrapper);
if (!finalCheck.isEmpty()) {
return AjaxResult.error("检验类型编码已存在");
@@ -123,7 +126,8 @@ public class InspectionTypeController extends BaseController {
// 验证code字段是否唯一（排除自身）
QueryWrapper<InspectionType> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("code", inspectionType.getCode())
.ne("id", inspectionType.getId());
.ne("id", inspectionType.getId())
.eq("valid_flag", 1);
if (inspectionTypeService.count(queryWrapper) > 0) {
return AjaxResult.error("检验类型编码已存在");
}

4
openhis-server-new/openhis-domain/src/main/java/com/openhis/lab/domain/InspectionType.java
View File

@@ -31,6 +31,10 @@ public class InspectionType {
/** 所属科室 */
private String department;
/** 父类ID（为空表示是大类，有值表示是子类） */
@TableField("parent_id")
private Long parentId;
/** 排序 */
@TableField("\"order\"")
private Integer sortOrder;