From f0afb2b17f2f6e13925ffe1b6fd8c8ae724aec0e Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 13 三月 2025 10:46:24 +0800
Subject: [PATCH] 分支合并冲突解决
---
basic-server/src/main/java/com/ruoyi/basic/service/impl/StructureItemParameterServiceImpl.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StructureItemParameterServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StructureItemParameterServiceImpl.java
index 4009106..635acdc 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StructureItemParameterServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StructureItemParameterServiceImpl.java
@@ -9,6 +9,7 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.util.List;
@Service
@AllArgsConstructor
@@ -21,4 +22,14 @@
public void removeNoSample(String sample) {
structureItemParameterMapper.removeNoSample("\""+sample+"\"");
}
+
+ @Override
+ public List<StructureItemParameter> selectTestObjectInspectionItem(String specimenName) {
+ return structureItemParameterMapper.selectItemParameterList1(specimenName);
+ }
+
+ @Override
+ public List<StructureItemParameter> selectTestInspectionItemSub(String inspectionItemSubclass) {
+ return structureItemParameterMapper.selectItemParameterList2(inspectionItemSubclass);
+ }
}
--
Gitblit v1.9.3