From 3f31a0466e7a706424d28aaab10bb70e2895bcfc Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 21 四月 2025 16:13:25 +0800
Subject: [PATCH] zjh20250419

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java |   19 ++++++-------------
 1 files changed, 6 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 2beedbf..f59895e 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
@@ -1,6 +1,5 @@
 package com.ltkj.web.controller.service;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
@@ -8,19 +7,17 @@
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
-import com.alibaba.druid.sql.visitor.functions.If;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ltkj.common.core.domain.AjaxResult;
 import com.ltkj.common.core.domain.entity.SysDept;
 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.StringUtils;
 import com.ltkj.framework.config.MatchUtils;
-import com.ltkj.framework.datasource.DynamicDataSourceContextHolder;
 import com.ltkj.hosp.domain.*;
 import com.ltkj.hosp.hisDto.*;
+import com.ltkj.hosp.idutil.IdUtils;
 import com.ltkj.hosp.mapper.TjSamplingMapper;
 import com.ltkj.hosp.pacsDto.SavePacsApply;
 import com.ltkj.hosp.service.*;
@@ -38,10 +35,8 @@
 import com.ltkj.web.controller.lis.LisApiMethod;
 import com.ltkj.web.controller.pacs.PacsApiMethodService;
 import com.ltkj.web.controller.system.SamplingServiceApi;
-import jodd.util.StringUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -49,8 +44,6 @@
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.*;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -618,6 +611,7 @@
                         LambdaQueryWrapper<TjOrderYcxm> wq = new LambdaQueryWrapper<>();
                         wq.eq(TjOrderYcxm::getTjh, order.getTjNumber());
                         wq.eq(TjOrderYcxm::getJcxm, detail.getProName());
+                        ycxmService.remove(wq);
                         if (detail.getExceptionDesc() == 1) {
 
                                 if(!detail.getProName().contains("鑸掑紶鍘�") && !detail.getProName().contains("鏀剁缉鍘�")){
@@ -701,17 +695,16 @@
                                     if (!mapList.isEmpty()) {
                                         jianyilis.addAll(mapList);
                                     }
-                                        ssyszys.append(detail.getProName()).append("/");
-                                        ssyszyjgs.append(detail.getProResult()).append("/");
-
+                                   ssyszys.append(detail.getProName()).append("/");
+                                   ssyszyjgs.append(detail.getProResult()).append("/");
                                 }
-                        }else {
+                        } else {
                             if(detail.getProName().contains("鑸掑紶鍘�") || detail.getProName().contains("鏀剁缉鍘�")){
                                 ssyszys.append(detail.getProName()).append("/");
                                 ssyszyjgs.append(detail.getProResult()).append("/");
 
                             }
-                           ycxmService.remove(wq);
+
                         }
                 }
 

--
Gitblit v1.8.0