From 527ec0325210356d3572b86db24e746fa054df5f Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 06 六月 2024 15:52:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 inspect-server/src/main/java/com/yuanchu/mom/service/StandardTreeService.java |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/StandardTreeService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/StandardTreeService.java
index ebba737..d82be97 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/StandardTreeService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/StandardTreeService.java
@@ -1,11 +1,12 @@
 package com.yuanchu.mom.service;
 
-import com.yuanchu.mom.dto.FactoryDto;
-import com.yuanchu.mom.pojo.StandardProductList;
-import com.yuanchu.mom.pojo.StandardTree;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yuanchu.mom.dto.FactoryDto;
+import com.yuanchu.mom.dto.SampleTypeDto;
+import com.yuanchu.mom.pojo.StandardTree;
 
 import java.util.List;
+import java.util.Map;
 
 /**
 * @author Administrator
@@ -22,7 +23,10 @@
 
     int addStandardProduct(String ids, String tree);
 
-//    鏍规嵁鏍峰搧绫诲瀷杩涜鏍囧噯鏍戞洿鏂版搷浣�
-    void reTreeBySampleType(String sampleType);
+    List<SampleTypeDto> getStandardTree2();
+
+    int upStandardProducts(Map<String, Object> product);
+
+    List<StandardTree> getStandTreeBySampleType(String laboratory, String sampleType);
 
 }

--
Gitblit v1.9.3