diff --git a/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/InspectRecordServiceImpl.java b/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/InspectRecordServiceImpl.java index d7f1baa..ebecbb5 100644 --- a/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/InspectRecordServiceImpl.java +++ b/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/InspectRecordServiceImpl.java @@ -37,7 +37,6 @@ import org.apache.poi.xwpf.usermodel.XWPFTableRow; import org.springframework.beans.BeanUtils; import org.springframework.mock.web.MockMultipartFile; import org.springframework.stereotype.Service; - import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.io.ByteArrayInputStream; @@ -320,7 +319,7 @@ public class InspectRecordServiceImpl implements InspectRecordService { dto.setIndexNum(String.valueOf(indexNum++)); } - // 14️⃣ 构建离子对和CE值数据 + // 14️⃣ 构建离子对和C E值数据 this.buildIonPairAndCE(data, testRecordReagentService.list( Wrappers.lambdaQuery() .in(TestRecordReagent::getId, testRecord.getReagentConsumablesList()) diff --git a/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/TestRecordSampleDataServiceImpl.java b/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/TestRecordSampleDataServiceImpl.java index 6a24277..0130156 100644 --- a/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/TestRecordSampleDataServiceImpl.java +++ b/dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/service/impl/TestRecordSampleDataServiceImpl.java @@ -17,12 +17,14 @@ import digital.laboratory.platform.common.core.constant.CommonConstants; import digital.laboratory.platform.common.core.exception.CheckedException; 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.comservice.entity.DlpDictData; import digital.laboratory.platform.comservice.feign.RemoteDictDataService; import digital.laboratory.platform.inspection.constant.TestRecordSampleDataConstant; 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.TestRecordFileUrl; import digital.laboratory.platform.inspetion.api.enums.BusinessType; import digital.laboratory.platform.inspection.enums.StdSolutionNum; import digital.laboratory.platform.inspection.enums.TaskTestDataStatus; @@ -107,6 +109,12 @@ public class TestRecordSampleDataServiceImpl extends ServiceImpl { TestRecordSampleData std = stdTestDataMap.get(testRecordSampleData.getCompoundName()); - if ( std != null && testRecordSampleData.getTargetRtTime() != null && std.getTargetRtTime() != null ) { + if (std != null && testRecordSampleData.getTargetRtTime() != null && std.getTargetRtTime() != null) { testRecordSampleData.setRtTimeError(processInspectDataService.getHairCaseRtTimeError(testRecordSampleData.getTargetRtTime(), std.getTargetRtTime())); if (businessType.equals(BusinessType.BOINT_CASE.getBusinessType())) { testRecordSampleData.setRtTimeWithinError(