xiaoguangbin/AnalysisSystemForRadionuclide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：betaEnergyData null

Browse Source
This commit is contained in:
nieziyan 2024-08-01 14:43:57 +08:00
parent dc3375a5ab
commit ba17537b44
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/PHDFileUtil.java
View File

@ -312,7 +312,7 @@ public class PHDFileUtil extends AbstractLogOrReport {
betaDataFile.setDetGammaEnergyList(gammaEnergyList); betaDataFile.setDetGammaEnergyList(gammaEnergyList);
betaDataFile.setDetBetaOriginalSeriseData(betaOriginalSeriseData); betaDataFile.setDetBetaOriginalSeriseData(betaOriginalSeriseData);
betaDataFile.setDetBetaProjectedSeriseData(betaProjectedSeriseData); betaDataFile.setDetBetaProjectedSeriseData(betaProjectedSeriseData);
betaDataFile.setSampleBetaEnergyList(betaEnergyList); betaDataFile.setDetBetaEnergyList(betaEnergyList);
} else if (type.equalsIgnoreCase("qc")) { } else if (type.equalsIgnoreCase("qc")) {
betaDataFile.setQcSpectrumData(spectrumData); betaDataFile.setQcSpectrumData(spectrumData);
betaDataFile.setQcBoundary(boundaryList); betaDataFile.setQcBoundary(boundaryList);

1
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumFileServiceImpl.java
View File

@ -194,6 +194,7 @@ public class SpectrumFileServiceImpl implements ISpectrumFileService {
String[] names = name.split(comma); String[] names = name.split(comma);
ftpFiles = ftpFiles.stream() ftpFiles = ftpFiles.stream()
.filter(file -> containsAllIgnoreCase(file.getName(),names)) .filter(file -> containsAllIgnoreCase(file.getName(),names))
.filter(file -> !StrUtil.contains(file.getName(), "_ROI_"))
.collect(Collectors.toList()); .collect(Collectors.toList());
} }
for (File ftpFile : ftpFiles) { for (File ftpFile : ftpFiles) {