zgty/zt-qms
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:双杯判定bug优化

Browse Source
This commit is contained in:
李如贤
2025-12-31 17:53:58 +08:00
parent 28a8970c03
commit cc2812c458
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleAnalysisAuditServiceImpl.java
View File

@@ -687,6 +687,7 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic
} }
businessSubSampleAssessmentProjectDO.setBusinessSubParentSampleId(businessAssayTaskDataDO.getBusinessSubParentSampleId()); businessSubSampleAssessmentProjectDO.setBusinessSubParentSampleId(businessAssayTaskDataDO.getBusinessSubParentSampleId());
businessSubSampleAssessmentProjectDO.setBusinessSubSampleId(businessAssayTaskDataDO.getBusinessSubSampleId()); businessSubSampleAssessmentProjectDO.setBusinessSubSampleId(businessAssayTaskDataDO.getBusinessSubSampleId());
businessSubSampleAssessmentProjectDO.setBusinessSubSampleAssessmentId(businessSubSampleAssessmentDO.getId());
businessSubSampleAssessmentProjectDO.setConfigAssayMethodId(businessAssayTaskDataDO.getConfigAssayMethodId()); businessSubSampleAssessmentProjectDO.setConfigAssayMethodId(businessAssayTaskDataDO.getConfigAssayMethodId());
businessSubSampleAssessmentProjectDO.setConfigAssayMethodProjectId(businessAssayProjectDataDO.getConfigAssayMethodProjectId()); businessSubSampleAssessmentProjectDO.setConfigAssayMethodProjectId(businessAssayProjectDataDO.getConfigAssayMethodProjectId());
businessSubSampleAssessmentProjectDO.setDictionaryProjectId(dictionaryProjectId); businessSubSampleAssessmentProjectDO.setDictionaryProjectId(dictionaryProjectId);
@@ -852,17 +853,19 @@ public class SampleAnalysisAuditServiceImpl implements SampleAnalysisAuditServic
.filter(r -> r.getAssessmentLevel() == 1) .filter(r -> r.getAssessmentLevel() == 1)
.findFirst() .findFirst()
.orElse(rule); .orElse(rule);
if (value.compareTo(new BigDecimal(next.getMinimumValue())) >= 0 && value.compareTo(new BigDecimal(next.getMaximumValue())) <= 0) { // if (value.compareTo(new BigDecimal(next.getMinimumValue())) >= 0 && value.compareTo(new BigDecimal(next.getMaximumValue())) <= 0) {
return next; // return next;
} // }
return next;
} else if (rule.getAssessmentLevel() == 4) { } else if (rule.getAssessmentLevel() == 4) {
ConfigAssayMethodProjectAssessmentDO prev = rules.stream() ConfigAssayMethodProjectAssessmentDO prev = rules.stream()
.filter(r -> r.getAssessmentLevel() == 3) .filter(r -> r.getAssessmentLevel() == 3)
.findFirst() .findFirst()
.orElse(rule); .orElse(rule);
if (value.compareTo(new BigDecimal(prev.getMinimumValue())) >= 0 && value.compareTo(new BigDecimal(prev.getMaximumValue())) <= 0) { // if (value.compareTo(new BigDecimal(prev.getMinimumValue())) >= 0 && value.compareTo(new BigDecimal(prev.getMaximumValue())) <= 0) {
return prev; // return prev;
} // }
return prev;
} else { } else {
if (value.compareTo(new BigDecimal(rule.getMinimumValue())) >= 0 && value.compareTo(new BigDecimal(rule.getMaximumValue())) <= 0) { if (value.compareTo(new BigDecimal(rule.getMinimumValue())) >= 0 && value.compareTo(new BigDecimal(rule.getMaximumValue())) <= 0) {
return rule; return rule;