From 3419517251ebdaa5e0ade07352fb9fc831fed982 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期三, 16 十月 2024 15:30:14 +0800
Subject: [PATCH] 2024-10-16
---
ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 26 ++++++++++++++++++--------
1 files changed, 18 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..d13f2f1 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
@@ -10,6 +10,7 @@
import com.ltkj.common.core.domain.AjaxResult;
import com.ltkj.common.core.domain.entity.SysUser;
import com.ltkj.common.core.redis.RedisCache;
+import com.ltkj.common.utils.IdUtils;
import com.ltkj.common.utils.SecurityUtils;
import com.ltkj.common.utils.StringUtils;
import com.ltkj.framework.config.MatchUtils;
@@ -25,8 +26,10 @@
import com.ltkj.system.service.ISysConfigService;
import com.ltkj.system.service.ISysDeptService;
import com.ltkj.system.service.ISysUserService;
+import com.ltkj.web.config.IdcardUtil.IdcardUtil;
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 +140,11 @@
@Resource
private LtkjHysqdService hysqdService;
@Autowired
- private TjOrderController tjOrderController;
- @Autowired
private PacsApiMethodService pacsApiMethodService;
+ @Autowired
+ private LisApiMethod lisApiMethod;
+ @Autowired
+ private IdUtils idUtils;
@Override
public void newSaveextracted(TjOrder tjOrder, TjCustomer tjCustomer, BigDecimal discount, SysUser sysUser, TjReservation tjReservation, TjFlowingWater tjFlowingWater) {
@@ -402,11 +407,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);
}
@@ -418,6 +424,7 @@
if (null == projectService.getById(detail.getProId())) continue;
Long proParentId = projectService.getById(detail.getProId()).getProParentId();
if (null != proParentId && proParentId == 0) {
+ sampling.setJyxh(idUtils.generateLisID());
sampling.setSpecimenType(projectService.getById(detail.getProId()).getSpecimenType());
} else {
sampling.setSpecimenType(projectService.getById(projectService.getById(detail.getProId()).getProParentId()).getSpecimenType());
@@ -955,7 +962,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());
@@ -1002,6 +1009,7 @@
tree.setType("妫�楠�");
LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(TjProject::getHisXmbm, mxfyxmbm);
+ wrapper.eq(TjProject::getProParentId,0);
List<TjProject> list = projectService.list(wrapper);
String tj_price = "";
for (TjProject project : list) {
@@ -1064,6 +1072,7 @@
tree.setType("妫�鏌�");
LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(TjProject::getHisXmbm, mxfyxmbm);
+ wrapper.eq(TjProject::getProParentId,0);
List<TjProject> list = projectService.list(wrapper);
String tj_price = "";
for (TjProject project : list) {
@@ -1174,6 +1183,7 @@
tree.setType("澶勭疆");
LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(TjProject::getHisXmbm, mxfyxmbm);
+ wrapper.eq(TjProject::getProParentId,0);
List<TjProject> list = projectService.list(wrapper);
String tj_price = "";
for (TjProject project : list) {
--
Gitblit v1.8.0