From cd6114bf85d19e6bdcd6a17c66f34b8c838870d5 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期三, 16 十月 2024 15:31:23 +0800
Subject: [PATCH] 增加标本代码设置
---
ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 38 +++++++++++++++++++++++++-------------
1 files changed, 25 insertions(+), 13 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 d13f2f1..1cb7102 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
@@ -145,6 +145,9 @@
private LisApiMethod lisApiMethod;
@Autowired
private IdUtils idUtils;
+ @Autowired
+ private LtkjJybbzdService jybbzdService;
+
@Override
public void newSaveextracted(TjOrder tjOrder, TjCustomer tjCustomer, BigDecimal discount, SysUser sysUser, TjReservation tjReservation, TjFlowingWater tjFlowingWater) {
@@ -422,12 +425,29 @@
for (TjOrderDetail detail : detailList) {
TjSampling sampling = new TjSampling();
if (null == projectService.getById(detail.getProId())) continue;
- Long proParentId = projectService.getById(detail.getProId()).getProParentId();
+ TjProject project = projectService.getById(detail.getProId());
+ Long proParentId = project.getProParentId();
if (null != proParentId && proParentId == 0) {
sampling.setJyxh(idUtils.generateLisID());
- sampling.setSpecimenType(projectService.getById(detail.getProId()).getSpecimenType());
+ LtkjJyxmzd jyxmzd = lisApiMethod.getJyxmzd(project);
+ if (jyxmzd != null) {
+ sampling.setSpecimenTypeCode(jyxmzd.getJybbdm());
+ LambdaQueryWrapper<LtkjJybbzd> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(LtkjJybbzd::getJybbdm,jyxmzd.getJybbdm());
+ LtkjJybbzd jybbzd = jybbzdService.getOne(wrapper);
+ sampling.setSpecimenType(jybbzd.getJybbmc());
+ }
} else {
- sampling.setSpecimenType(projectService.getById(projectService.getById(detail.getProId()).getProParentId()).getSpecimenType());
+ TjProject project1 = projectService.getById(proParentId);
+ sampling.setJyxh(idUtils.generateLisID());
+ LtkjJyxmzd jyxmzd = lisApiMethod.getJyxmzd(project1);
+ if (jyxmzd != null) {
+ sampling.setSpecimenTypeCode(jyxmzd.getJybbdm());
+ LambdaQueryWrapper<LtkjJybbzd> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(LtkjJybbzd::getJybbdm,jyxmzd.getJybbdm());
+ LtkjJybbzd jybbzd = jybbzdService.getOne(wrapper);
+ sampling.setSpecimenType(jybbzd.getJybbmc());
+ }
}
sampling.setSamplingNumber(format);
sampling.setTjNum(order.getTjNumber());
@@ -964,11 +984,7 @@
if(null !=config && config.equals("Y")){
if (lisApiMethod.isUseLisAndPacsRegister(order)) {
List<TjProject> projectList2 = jianYanProjects.stream().distinct().collect(Collectors.toList());
- LambdaQueryWrapper<TjOrderDetail> wq = new LambdaQueryWrapper<>();
- wq.eq(TjOrderDetail::getOrderId, order.getOrderId());
- wq.isNotNull(TjOrderDetail::getFlowingWaterId);
- wq.eq(TjOrderDetail::getIsSampling, 0);
- List<TjOrderDetail> detailList = tjOrderDetailService.list(wq);
+ List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(order.getOrderId());
addCaiYangDengJi(detailList, !detailList.isEmpty(), order, sysUser);
// 妫�鏌ョ敵璇�
@@ -1749,11 +1765,7 @@
chargingStandardService.save(tjChargingStandard);
}
- LambdaQueryWrapper<TjOrderDetail> wq = new LambdaQueryWrapper<>();
- wq.eq(TjOrderDetail::getOrderId, order.getOrderId());
- wq.isNotNull(TjOrderDetail::getFlowingWaterId);
- wq.eq(TjOrderDetail::getIsSampling, 0);
- List<TjOrderDetail> detailList = tjOrderDetailService.list(wq);
+ List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(order.getOrderId());
addCaiYangDengJi(detailList, detailList.size() > 0, order, sysUser);
}
--
Gitblit v1.8.0