Merge remote-tracking branch 'origin/SelfStation' into SelfStation

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

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

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

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