Dlp-Gyjd/dlp-drugtesting
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

增加了一些适配贵阳市局的新字段，现在我们不需要导入数据，通过手动录入数据的方式来进行检验分析以及生成检验记录了

Browse Source
This commit is contained in:
杨海航
2025-03-18 11:14:45 +08:00
parent 2f952f30a0
commit 83244629be
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
dlp-drugtesting-biz/src/main/java/digital/laboratory/platform/inspection/entity/TestRecordSampleData.java
View File

@@ -34,9 +34,9 @@ public class TestRecordSampleData extends BaseEntity {
private String rtTimeWithinError;//保留时间是否在误差范围 ±1 以内
private double targetRtTime;//目标物保留时间
private Double targetRtTime;//目标物保留时间
private double stdRtTime;//标准物保留时间
private Double stdRtTime;//标准物保留时间
private int isDetected;//是否检出目标化合物
@@ -48,9 +48,9 @@ public class TestRecordSampleData extends BaseEntity {
private String compoundCnName;//检测的化合物的中文名字
private double mainArea;//主要产物峰面积
private Double mainArea;//主要产物峰面积
private double minorArea;//次要产物峰面积
private Double minorArea;//次要产物峰面积
@ApiModelProperty("任务数据审核状态, 状态：\n" +
"0 待审核，\n" +

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

@@ -1998,12 +1998,13 @@ public class TestRecordSampleDataServiceImpl extends ServiceImpl<TestRecordSampl
.eq(TestRecordSampleData::getTestId, data.getTestId())
.eq(TestRecordSampleData::getSampleType, "STD"));
if (data.getMainArea() != 0.0 &&
data.getMinorArea() != 0.0 &&
data.getTargetRtTime() != 0.0 &&
std.getMainArea() != 0.0 &&
std.getMinorArea() != 0.0 &&
std.getTargetRtTime() != 0.0) {
if (data.getMainArea() != null &&
data.getMinorArea() != null &&
data.getTargetRtTime() != null &&
std.getMainArea() != null &&
std.getMinorArea() != null &&
std.getTargetRtTime() != null) {
System.out.println("所有属性都不为 null");
}
return this.updateById(data) ? data : null;
}