From b115eea2b161adddeb92c5e885019aba8763bb0e Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 18 六月 2025 16:35:56 +0800
Subject: [PATCH] zjh20250618
---
ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
index efaad75..3fef055 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
@@ -473,6 +473,7 @@
else sampling.setJyxmdm(String.valueOf(project.getProId()));
sampling.setSpecimenTypeCode(project.getSpecimenType());
sampling.setSpecimenType(dictLabel);
+ sampling.setYb(project.getYb());
// LambdaQueryWrapper<LtkjJybbzd> wrapper = new LambdaQueryWrapper<>();
// wrapper.eq(LtkjJybbzd::getJybbdm,jyxmzd.getJybbdm());
// LtkjJybbzd jybbzd = jybbzdService.getOne(wrapper);
@@ -484,6 +485,7 @@
sampling.setJyxh(idUtils.generateLisID(lis_tmh_prefix));
sampling.setSpecimenTypeCode(project1.getSpecimenType());
sampling.setSpecimenType(dictLabel);
+ sampling.setYb(project.getYb());
if (config.equals("Y") && lisAndPacsRegister)
sampling.setJyxmdm(project1.getLisXmbm());
else sampling.setJyxmdm(String.valueOf(project1.getProId()));
@@ -2439,9 +2441,9 @@
String ysmc = configService.selectConfigByKey("request_default_ysmc");
String lis_tmh_prefix = configService.selectConfigByKey("make_lis_tmh_prefix");
List<TbTransition> detailList = transitionService.getBlTbTransitionListByCusId(customer.getCusIdcard(), cardId, jxbz);
- Boolean useLisAndPacsRegister = lisApiMethod.isUseLisAndPacsRegister(order);
+// Boolean useLisAndPacsRegister = lisApiMethod.isUseLisAndPacsRegister(order);
List<OutpinmedicapplyDetilsDto> outpinmedicapplyDetilsDtos = new ArrayList<>();
- if (useLisAndPacsRegister && isTuanTiPiao) {
+ if (isTuanTiPiao) {
// 妫�鏌ョ敵璇�
pacsReg(order, customer, jianChaProjects);
LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>();
@@ -2450,7 +2452,10 @@
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));
+// Map<String, List<TjSampling>> listMap = list.stream().collect(Collectors.groupingBy(TjSampling::getSpecimenTypeCode));
+ Map<String, List<TjSampling>> listMap = list.stream()
+ .collect(Collectors.groupingBy(p->p.getSpecimenTypeCode()+"_"+p.getYb()));
+
log.info("鍒嗙粍鍚� ->{}", JSONUtil.toJsonStr(listMap));
ArrayList<String> ids = new ArrayList<>();
for (Map.Entry<String, List<TjSampling>> entry : listMap.entrySet()) {
--
Gitblit v1.8.0