From 0a469fa5898ac2b63b860d17ac10c0ebf534d82f Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 27 六月 2025 17:49:38 +0800
Subject: [PATCH] zjh20250627
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 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 53d0542..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,11 +2530,11 @@
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);
if(null !=list && !list.isEmpty()){
List<String> strings = list.stream().map(TjSampling::getProId).collect(Collectors.toList());
LambdaQueryWrapper<TjProject> wrapper1 = new LambdaQueryWrapper<>();
@@ -2562,9 +2562,9 @@
}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