From f934309e1f07ea68e975bfd5c9d4fb06762f0dfc Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 15 十月 2024 16:17:51 +0800
Subject: [PATCH] zjh20241015修改采样数据添加逻辑
---
ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 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 e425d74..c572f27 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
@@ -27,6 +27,7 @@
import com.ltkj.system.service.ISysUserService;
import com.ltkj.web.controller.his.HisApiGetMethodService;
import com.ltkj.web.controller.his.HisApiMethodService;
+import com.ltkj.web.controller.lis.LisApiMethod;
import com.ltkj.web.controller.pacs.PacsApiMethodService;
import com.ltkj.web.controller.system.TjOrderController;
import lombok.extern.slf4j.Slf4j;
@@ -137,9 +138,9 @@
@Resource
private LtkjHysqdService hysqdService;
@Autowired
- private TjOrderController tjOrderController;
- @Autowired
private PacsApiMethodService pacsApiMethodService;
+ @Autowired
+ private LisApiMethod lisApiMethod;
@Override
public void newSaveextracted(TjOrder tjOrder, TjCustomer tjCustomer, BigDecimal discount, SysUser sysUser, TjReservation tjReservation, TjFlowingWater tjFlowingWater) {
@@ -402,11 +403,12 @@
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);
+// 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);
}
@@ -955,7 +957,7 @@
}
if(null !=config && config.equals("Y")){
- if (tjOrderController.isUseLisAndPacsRegister(order)) {
+ if (lisApiMethod.isUseLisAndPacsRegister(order)) {
List<TjProject> projectList2 = jianYanProjects.stream().distinct().collect(Collectors.toList());
LambdaQueryWrapper<TjOrderDetail> wq = new LambdaQueryWrapper<>();
wq.eq(TjOrderDetail::getOrderId, order.getOrderId());
--
Gitblit v1.8.0