From 476740c4330135b38be6a32f54dbe1bbcd32476a Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 13 一月 2025 13:20:56 +0800
Subject: [PATCH] Merge branch 'master' into cnas

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

diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderService.java
index a15d44f..174116f 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderService.java
@@ -24,9 +24,6 @@
     //鑾峰彇鍗曚綅妫�楠屼笅鍗曟暟鎹�
     Map<String, Object> selectInsOrderParameter(IPage<InsOrder> page, SampleOrderDto sampleOrderDto);
 
-    //鍒嗛厤绔欑偣
-    int upInsOrder(Integer orderId,Integer sampleId, String appointed, Integer userId,String sonLaboratory);
-
     int addInsOrder(List<SampleProductDto> list, InsOrder insOrder, List<List<Integer>> pairing, List<MultipartFile> files);
 
     Map<String, Object> getInsOrder(Integer id);
@@ -35,7 +32,7 @@
 
     int upInsOrderOfState2(InsOrder insOrder);
 
-    Map<String, Object> getInsOrderAndSample(Integer id, String laboratory);
+    Map<String, Object> getInsOrderAndSample(Integer sampleId, String laboratory);
 
     Map<String, Object> selectSampleAndProductByOrderId(IPage<SampleProductDto2> page, SampleProductDto2 sampleProductDto);
 

--
Gitblit v1.9.3