From 7e73e7699d55b4b229bef4dc5d89e01aedef5a19 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 19 五月 2025 17:13:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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