zjh20250325

zjh

2025-03-25 b9ec0ddbda9381e4587426a0cb7cf400cfb8c972

zjh20250325

 ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java

@@ -28,6 +28,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.NoTransactionException;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;

@@ -2014,6 +2015,7 @@
        String mergeRequest = configService.selectConfigByKey("use_lis_pacs_is_auto_merge_request");
        String lis_tmh_prefix = configService.selectConfigByKey("make_lis_tmh_prefix");
        if (mergeRequest.equals("Y")){
            try {
            LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>();
            wrapper.eq(TjSampling::getTjNum,tjOrder.getTjNumber());
            List<TjSampling> list = tjSamplingService.list(wrapper);
@@ -2054,6 +2056,10 @@
                    return AjaxResult.error("处理失败");
                }
            }
            } catch (NoTransactionException e) {
//                throw new RuntimeException(e);
                log.error(e.getMessage().toString());
            }
        }

        //检验申请