From 52486d021d78c9b4d594cf610925e9eed6f201f0 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期一, 16 六月 2025 16:51:42 +0800
Subject: [PATCH] 0616-1

---
 ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjSamplingService.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjSamplingService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjSamplingService.java
index b81c736..bad2931 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjSamplingService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjSamplingService.java
@@ -89,9 +89,9 @@
 
     String getBuKeHebingProName(List<String> ids);
 
-    AjaxResult mergeCaiYangTran(List<String> ids);
+    AjaxResult mergeCaiYangTran(List<String> ids,String prefix);
 
-    String mergeCaiYangApi(List<String> ids);
+    String mergeCaiYangApi(List<String> ids,String prefix);
 
     /**
      * 鍒ゆ柇椤圭洰鏄惁鑳借繘琛屽悎骞�
@@ -99,4 +99,6 @@
      * @return
      */
     int isMergeItem(String id);
+
+    int isExistProId(String tjh,String proId);
 }

--
Gitblit v1.8.0