From 1931c00063f392f201ee5f9154e9a4826820ab49 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 11 六月 2025 18:27:01 +0800
Subject: [PATCH] zjh20250611
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java | 37 ++++++++++++++++++++-----------------
1 files changed, 20 insertions(+), 17 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 a798d34..ed00f68 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
@@ -2535,26 +2535,29 @@
LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(TjSampling::getTjNum,tjOrder.getTjNumber());
List<TjSampling> list = tjSamplingService.list(wrapper);
- List<String> strings = list.stream().map(TjSampling::getProId).collect(Collectors.toList());
- LambdaQueryWrapper<TjProject> wrapper1 = new LambdaQueryWrapper<>();
- wrapper1.in(TjProject::getProParentId,strings);
- wrapper1.eq(TjProject::getProStatus,0);
- wrapper1.groupBy(TjProject::getProId);
- List<TjProject> tjProjectList = projectService.list(wrapper1);
- if(null != tjProjectList && !tjProjectList.isEmpty()){
- Map<String, List<TjProject>> listMap = tjProjectList.stream().collect(Collectors.groupingBy(TjProject::getSpecimenType));
- log.info("鍒嗙粍鍚� ->{}",JSONUtil.toJsonStr(listMap));
- boolean save = lisApiMethod.save(listMap, tjOrder, customer);
- if (!save) {
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return AjaxResult.error("澶勭悊澶辫触");
+ if(null !=list && !list.isEmpty()){
+ List<String> strings = list.stream().map(TjSampling::getProId).collect(Collectors.toList());
+ LambdaQueryWrapper<TjProject> wrapper1 = new LambdaQueryWrapper<>();
+ wrapper1.in(TjProject::getProParentId,strings);
+ wrapper1.eq(TjProject::getProStatus,0);
+ wrapper1.groupBy(TjProject::getProId);
+ List<TjProject> tjProjectList = projectService.list(wrapper1);
+ if(null != tjProjectList && !tjProjectList.isEmpty()){
+ Map<String, List<TjProject>> listMap = tjProjectList.stream().collect(Collectors.groupingBy(TjProject::getSpecimenType));
+ log.info("鍒嗙粍鍚� ->{}",JSONUtil.toJsonStr(listMap));
+ boolean save = lisApiMethod.save(listMap, tjOrder, customer);
+ if (!save) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return AjaxResult.error("澶勭悊澶辫触");
+ }
+ for (TjSampling tjSampling : list) {
+ tjSampling.setIsSignFor("0");
+ }
+ tjSamplingService.updateBatchById(list);
}
- for (TjSampling tjSampling : list) {
- tjSampling.setIsSignFor("0");
- }
- tjSamplingService.updateBatchById(list);
}
+
}else{
try {
LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>();
--
Gitblit v1.8.0