20250407 更新

1.提供BusinessType枚举到api包里

dlp-drugtesting-api/src/main/java/digital/laboratory/platform/inspetion/api/enums/BusinessType.java

@@ -1,4 +1,4 @@
-package digital.laboratory.platform.inspection.enums;
+package digital.laboratory.platform.inspetion.api.enums;
 
 import lombok.Getter;
 

dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/controller/EntrustInfoController.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import digital.laboratory.platform.common.core.util.R;
 import digital.laboratory.platform.common.oss.service.OssFile;
-import digital.laboratory.platform.inspection.enums.BusinessType;
+import digital.laboratory.platform.inspetion.api.enums.BusinessType;
 import digital.laboratory.platform.inspection.enums.TestRecordFileUrl;
 import digital.laboratory.platform.inspection.dto.EntrustInfoDto;
 import digital.laboratory.platform.inspetion.api.entity.EntrustInfo;

dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/controller/TestRecordSampleDataController.java

@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import digital.laboratory.platform.common.aop.annotation.DlpAccessLimit;
 import digital.laboratory.platform.common.core.util.R;
 import digital.laboratory.platform.common.mybatis.security.service.DLPUser;
-import digital.laboratory.platform.inspection.enums.BusinessType;
+import digital.laboratory.platform.inspetion.api.enums.BusinessType;
 import digital.laboratory.platform.inspection.dto.*;
 import digital.laboratory.platform.inspection.entity.TestRecordSampleData;
 import digital.laboratory.platform.inspection.query.AnalysisTestResultPageQuery;
@@ -32,12 +32,9 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
-import javax.validation.constraints.NotEmpty;
 import java.security.Principal;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * @author xy

dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/AssignmentInfoServiceImpl.java

@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
-import digital.laboratory.platform.inspection.enums.BusinessType;
+import digital.laboratory.platform.inspetion.api.enums.BusinessType;
 import digital.laboratory.platform.inspection.dto.AssignmentInfoDto;
 import digital.laboratory.platform.inspection.entity.*;
 import digital.laboratory.platform.inspection.mapper.AssignmentInfoMapper;

dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/InspectRecordServiceImpl.java

@@ -19,14 +19,13 @@ import digital.laboratory.platform.inspection.entity.TestRecordInstrument;
 import digital.laboratory.platform.inspection.entity.TestRecordReagent;
 import digital.laboratory.platform.inspection.entity.TestRecordSampleData;
 import digital.laboratory.platform.inspection.entity.TestRecordSampleDataExpand;
-import digital.laboratory.platform.inspection.enums.BusinessType;
+import digital.laboratory.platform.inspetion.api.enums.BusinessType;
 import digital.laboratory.platform.inspection.enums.TestRecordFileUrl;
 import digital.laboratory.platform.inspection.service.*;
 import digital.laboratory.platform.inspection.vo.IonPairAndCEVO;
 import digital.laboratory.platform.inspection.vo.TestRecordReagentVO;
 import digital.laboratory.platform.inspetion.api.entity.EntrustInfo;
 import digital.laboratory.platform.inspetion.api.entity.SampleInfo;
-import digital.laboratory.platform.inspetion.api.entity.TargetObject;
 import digital.laboratory.platform.inspetion.api.entity.TestRecord;
 import digital.laboratory.platform.sys.entity.Drug;
 import digital.laboratory.platform.sys.enums.entrust.EntrustBiologyType;

dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/PushDataToLabsCareServiceImpl.java

@@ -13,8 +13,7 @@ import digital.laboratory.platform.inspection.entity.TestRecordInstrument;
 import digital.laboratory.platform.inspection.entity.TestRecordMethod;
 import digital.laboratory.platform.inspection.entity.TestRecordReagent;
 import digital.laboratory.platform.inspection.entity.TestRecordSampleData;
-import digital.laboratory.platform.inspection.enums.BusinessType;
-import digital.laboratory.platform.inspection.event.PushDataToLabsCareEvent;
+import digital.laboratory.platform.inspetion.api.enums.BusinessType;
 import digital.laboratory.platform.inspection.mapper.TestRecordSampleDataMapper;
 import digital.laboratory.platform.inspection.service.*;
 import digital.laboratory.platform.inspection.vo.TestRecordReagentVO;
@@ -27,10 +26,8 @@ import digital.laboratory.platform.othersys.utils.HttpsUtils;
 import digital.laboratory.platform.sys.entity.Drug;
 import digital.laboratory.platform.sys.entity.SysUser;
 import lombok.extern.slf4j.Slf4j;
-import org.aspectj.weaver.ast.Test;
 import org.springframework.http.*;
 import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestClientException;
 
 import javax.annotation.Resource;

dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/TaskInfoServiceImpl.java

@@ -27,7 +27,7 @@ import digital.laboratory.platform.common.core.constant.OSSDirectoryConstants;
 import digital.laboratory.platform.common.core.util.R;
 import digital.laboratory.platform.common.feign.RemoteGenerateWordService;
 import digital.laboratory.platform.common.oss.service.OssFile;
-import digital.laboratory.platform.inspection.enums.BusinessType;
+import digital.laboratory.platform.inspetion.api.enums.BusinessType;
 import digital.laboratory.platform.inspection.enums.SewageReportColumn;
 import digital.laboratory.platform.inspection.dto.*;
 import digital.laboratory.platform.inspection.entity.AssignmentInfo;

dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/TestRecordSampleDataServiceImpl.java

@@ -23,7 +23,7 @@ import digital.laboratory.platform.inspection.constant.TestRecordSampleDataConst
 import digital.laboratory.platform.inspection.convert.TestRecordSampleDataConverter;
 import digital.laboratory.platform.inspection.dto.*;
 import digital.laboratory.platform.inspection.entity.*;
-import digital.laboratory.platform.inspection.enums.BusinessType;
+import digital.laboratory.platform.inspetion.api.enums.BusinessType;
 import digital.laboratory.platform.inspection.enums.StdSolutionNum;
 import digital.laboratory.platform.inspection.enums.TaskTestDataStatus;
 import digital.laboratory.platform.inspection.event.AuditDataExecutionEvent;

dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/TestRecordSampledataExpandServiceImpl.java

@@ -12,7 +12,7 @@ import digital.laboratory.platform.inspection.dto.NPSCaseTestDataDto;
 import digital.laboratory.platform.inspection.dto.TestSampleDataExpandDTO;
 import digital.laboratory.platform.inspection.entity.TestRecordSampleData;
 import digital.laboratory.platform.inspection.entity.TestRecordSampleDataExpand;
-import digital.laboratory.platform.inspection.enums.BusinessType;
+import digital.laboratory.platform.inspetion.api.enums.BusinessType;
 import digital.laboratory.platform.inspection.mapper.TestRecordSampleDataExpandMapper;
 import digital.laboratory.platform.inspection.service.ProcessInspectDataService;
 import digital.laboratory.platform.inspection.service.TestRecordSampleDataService;

dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/TestRecordServiceImpl.java

@@ -17,7 +17,7 @@ import com.deepoove.poi.xwpf.NiceXWPFDocument;
 import digital.laboratory.platform.common.core.util.R;
 import digital.laboratory.platform.common.mybatis.security.service.DLPUser;
 import digital.laboratory.platform.common.oss.service.OssFile;
-import digital.laboratory.platform.inspection.enums.BusinessType;
+import digital.laboratory.platform.inspetion.api.enums.BusinessType;
 import digital.laboratory.platform.inspection.enums.TestRecordArgumentType;
 import digital.laboratory.platform.inspection.enums.TestRecordFileUrl;
 import digital.laboratory.platform.inspection.constant.TestRecordSampleDataConstant;