From 14ecea8537d5b29ca64c75aad4ff49265018415d Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 02 七月 2025 08:51:22 +0800
Subject: [PATCH] zjh20250702
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java | 53 +++++++++++++++++++++++++++++------------------------
1 files changed, 29 insertions(+), 24 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..a6aadee 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
@@ -133,7 +133,7 @@
String code1 = object1.getStr("ResultCode");
if (code1.equals("0")) {
JSONArray resultDatas = object1.getJSONArray("ResultData");
- if (null != resultDatas && resultDatas.size() > 0) {
+ if (null != resultDatas && !resultDatas.isEmpty()) {
Map<String, Object> resultDatasss = (Map<String, Object>) resultDatas.get(0);
String hisRegistrationId = resultDatasss.get("his_registration_id").toString();
jzh=hisRegistrationId;
@@ -2530,36 +2530,41 @@
String lis_tmh_prefix = configService.selectConfigByKey("make_lis_tmh_prefix");
String isRequestLisAllzx = configService.selectConfigByKey("jcx_is_requestLisAllzx");
if (mergeRequest.equals("Y")){
+ LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(TjSampling::getTjNum,tjOrder.getTjNumber());
+ List<TjSampling> list = tjSamplingService.list(wrapper);
if (isRequestLisAllzx != null && isRequestLisAllzx.equals("Y")){
log.info("杩涘叆鍥綋鏍规嵁灏忛」鏍囨湰鍚堝苟鍙戦�佹柟娉�");
- 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(p->p.getSpecimenType()+"_"+p.getYb()));
+
+ 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<>();
- wrapper.eq(TjSampling::getTjNum,tjOrder.getTjNumber());
- List<TjSampling> list = tjSamplingService.list(wrapper);
+// LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>();
+// wrapper.eq(TjSampling::getTjNum,tjOrder.getTjNumber());
+// List<TjSampling> list = tjSamplingService.list(wrapper);
log.info("閲囨牱鏁版嵁 ->{}",JSONUtil.toJsonStr(list));
if (!list.isEmpty()) {
Map<String, List<TjSampling>> listMap = list.stream().collect(Collectors.groupingBy(TjSampling::getSpecimenTypeCode));
--
Gitblit v1.8.0