Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -1,6 +1,7 @@
|
|||||||
package digital.laboratory.platform.inspection.vo;
|
package digital.laboratory.platform.inspection.vo;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableName;
|
import com.baomidou.mybatisplus.annotation.TableName;
|
||||||
|
import digital.laboratory.platform.inspection.constant.TestRecordSampleDataConstant;
|
||||||
import io.swagger.annotations.ApiModel;
|
import io.swagger.annotations.ApiModel;
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
@@ -52,21 +53,21 @@ public class TestRecordSampleDataExpandVO {
|
|||||||
|
|
||||||
public String getIonAbundanceRatio() {
|
public String getIonAbundanceRatio() {
|
||||||
if (getBasePeak()) {
|
if (getBasePeak()) {
|
||||||
return "/";
|
return TestRecordSampleDataConstant.INVALID_VALUE_STR;
|
||||||
}
|
}
|
||||||
return ionAbundanceRatio != null ? ionAbundanceRatio.setScale(2, RoundingMode.HALF_UP).toString() : null;
|
return ionAbundanceRatio != null ? ionAbundanceRatio.setScale(2, RoundingMode.HALF_UP).toString() : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getIonAbundanceRatioError() {
|
public String getIonAbundanceRatioError() {
|
||||||
if (getBasePeak()) {
|
if (getBasePeak()) {
|
||||||
return "/";
|
return TestRecordSampleDataConstant.INVALID_VALUE_STR;
|
||||||
}
|
}
|
||||||
return ionAbundanceRatioError != null ? ionAbundanceRatioError.setScale(2, RoundingMode.HALF_UP).toString() : null;
|
return ionAbundanceRatioError != null ? ionAbundanceRatioError.setScale(2, RoundingMode.HALF_UP).toString() : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getIonAbundanceRatioWithinError() {
|
public String getIonAbundanceRatioWithinError() {
|
||||||
if (getBasePeak()) {
|
if (getBasePeak()) {
|
||||||
return "/";
|
return TestRecordSampleDataConstant.INVALID_VALUE_STR;
|
||||||
}
|
}
|
||||||
return ionAbundanceRatioWithinError;
|
return ionAbundanceRatioWithinError;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user