From dbc11598957806965ec0e6b15c91f3d017d5759f Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期五, 03 一月 2025 20:16:53 +0800
Subject: [PATCH] 20250103
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
index 111bff4..fe72568 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
@@ -587,6 +587,7 @@
tjSysAsyncService.addCaiYangDengJi(detailList1, !detailList1.isEmpty(), tjOrder, sysUser,null);
String mergeRequest = configService.selectConfigByKey("use_lis_pacs_is_auto_merge_request");
+ String lis_tmh_prefix = configService.selectConfigByKey("make_lis_tmh_prefix");
if (mergeRequest.equals("Y")){
LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(TjSampling::getTjNum,tjOrder.getTjNumber());
@@ -613,7 +614,7 @@
}
}
if (stringList.size() > 1) {
- String id = tjSamplingService.mergeCaiYangApi(stringList);
+ String id = tjSamplingService.mergeCaiYangApi(stringList,lis_tmh_prefix);
ids.add(id);
}else {
ids.add(stringList.get(0));
--
Gitblit v1.8.0