From 1c375d6dcd0c41bc3c206585a2712ec066bf5992 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期五, 18 十一月 2022 10:09:13 +0800
Subject: [PATCH] 卡号 bug

---
 src/main/java/com/nanometer/smartlab/service/OpeReagentStatusService.java |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/service/OpeReagentStatusService.java b/src/main/java/com/nanometer/smartlab/service/OpeReagentStatusService.java
index 700b8c3..a8eca2e 100644
--- a/src/main/java/com/nanometer/smartlab/service/OpeReagentStatusService.java
+++ b/src/main/java/com/nanometer/smartlab/service/OpeReagentStatusService.java
@@ -7,6 +7,7 @@
 import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by maweiqing on 17/12/12.
@@ -34,9 +35,9 @@
 			String userId);
 
 	public List<OpeReagentStatus> getOpeReagentStatusListForLab(String name, String articleNumber, Integer status,
-																String reagentCode, String userId, Integer first, Integer pageSize);
+																String reagentCode, String userId, String labName, Integer first, Integer pageSize);
 	public int getOpeReagentStatusTotalCountForLab(String name, String articleNumber, Integer status, String reagentCode,
-												   String userId);
+												   String userId,String labName);
 	List<OpeReagentStatus> getOpeReagentStatusListByName(String reagentId, String articleNumber, Integer status,
 			String reagentCode, String userId, Integer first, Integer pageSize);
 
@@ -107,4 +108,13 @@
 
 	int getReagentNumInWarehouse(String id, String articleNumber, String warehouseId);
 
+    List<Map> selectExportList(String name, String articleNumber, Integer status,
+							   String reagentCode, String userId,String labName);
+
+	void exportLabStock2Excel(List<Map> list) throws Exception;
+
+    OpeReagentStatus getStatus(String reagentId, String reagentCode);
+
+	List<OpeReagentStatus> getOpeReagentStatusList22(String reagentId, String articleNumber, Integer status,
+															String reagentCode, String userId, Integer first, Integer pageSize);
 }

--
Gitblit v1.9.2