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/system/TjSamplingController.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java
index c7e531f..23e430e 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java
@@ -286,10 +286,11 @@
list.removeIf(item -> Objects.equals(item.getId(), s));
}
}
+ String lis_tmh_prefix = configService.selectConfigByKey("make_lis_tmh_prefix");
Map<String, List<TjSampling>> map = list.stream().filter(i->StrUtil.isNotBlank(i.getSpecimenTypeCode())).collect(Collectors.groupingBy(item -> item.getSpecimenTypeCode()));
for (Map.Entry<String, List<TjSampling>> entry : map.entrySet()) {
List<TjSampling> entryValue = entry.getValue();
- tjSamplingService.mergeCaiYangTran(entryValue.stream().map(TjSampling::getId).collect(Collectors.toList()));
+ tjSamplingService.mergeCaiYangTran(entryValue.stream().map(TjSampling::getId).collect(Collectors.toList()),lis_tmh_prefix);
}
}
wrapper = new LambdaQueryWrapper<>();
@@ -311,7 +312,8 @@
@PostMapping("/mergeCaiYang")
@ApiOperation(value = "閲囨牱鐧昏鍚堝苟椤圭洰鎺ュ彛")
public AjaxResult mergeCaiYang(@RequestBody List<String> ids) {
- return tjSamplingService.mergeCaiYangTran(ids);
+ String lis_tmh_prefix = configService.selectConfigByKey("make_lis_tmh_prefix");
+ return tjSamplingService.mergeCaiYangTran(ids,lis_tmh_prefix);
}
--
Gitblit v1.8.0