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

beta查看RRR报告计算结果result不存在问题修改

Browse Source
This commit is contained in:
qiaoqinzheng 2023-11-16 09:23:14 +08:00
parent 1edb06857d
commit 67dba4c0bc
1 changed files with 34 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1201,42 +1201,46 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
strBuffer.append(System.lineSeparator()); strBuffer.append(System.lineSeparator());
String netRoi = "%s%-51s%-51s%-13s"; String netRoi = "%s%-51s%-51s%-13s";
if (betaDataFile.isBProcessed()) { if (betaDataFile.isBProcessed()) {
if (Objects.isNull(resultsSpectrums.get(0).getLcCts())) { if (CollectionUtils.isNotEmpty(resultsSpectrums)) {
strBuffer.append(rowFormat(netRoi, StringPool.SPACE, "Roi", "Net count", StringPool.SPACE)); if (Objects.isNull(resultsSpectrums.get(0).getLcCts())) {
strBuffer.append(System.lineSeparator()); strBuffer.append(rowFormat(netRoi, StringPool.SPACE, "Roi", "Net count", StringPool.SPACE));
if (CollectionUtils.isNotEmpty(resultsSpectrums)) { strBuffer.append(System.lineSeparator());
for (GardsROIResultsSpectrum resultsSpectrum:resultsSpectrums){ if (CollectionUtils.isNotEmpty(resultsSpectrums)) {
strBuffer.append(rowFormat(netRoi, StringPool.SPACE, String.valueOf(resultsSpectrum.getRoi()), NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getNet()))+" +/- "+NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getNetErr())), StringPool.SPACE)); for (GardsROIResultsSpectrum resultsSpectrum:resultsSpectrums){
strBuffer.append(System.lineSeparator()); strBuffer.append(rowFormat(netRoi, StringPool.SPACE, String.valueOf(resultsSpectrum.getRoi()), NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getNet()))+" +/- "+NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getNetErr())), StringPool.SPACE));
strBuffer.append(System.lineSeparator());
}
} }
} } else {
} else { strBuffer.append(rowFormat(netRoi, StringPool.SPACE, "Roi", "Net count", "LC"));
strBuffer.append(rowFormat(netRoi, StringPool.SPACE, "Roi", "Net count", "LC")); strBuffer.append(System.lineSeparator());
strBuffer.append(System.lineSeparator()); if (CollectionUtils.isNotEmpty(resultsSpectrums)) {
if (CollectionUtils.isNotEmpty(resultsSpectrums)) { for (GardsROIResultsSpectrum resultsSpectrum:resultsSpectrums){
for (GardsROIResultsSpectrum resultsSpectrum:resultsSpectrums){ strBuffer.append(rowFormat(netRoi, StringPool.SPACE, String.valueOf(resultsSpectrum.getRoi()), NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getNet()))+" +/- "+NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getNetErr())), NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getLcCts()))));
strBuffer.append(rowFormat(netRoi, StringPool.SPACE, String.valueOf(resultsSpectrum.getRoi()), NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getNet()))+" +/- "+NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getNetErr())), NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getLcCts())))); strBuffer.append(System.lineSeparator());
strBuffer.append(System.lineSeparator()); }
} }
} }
} }
} else { } else {
if (Objects.isNull(resultsSpectrums.get(0).getLcCts())) { if (CollectionUtils.isNotEmpty(resultsSpectrums)) {
strBuffer.append(rowFormat(netRoi, StringPool.SPACE, "Roi", "Net count", StringPool.SPACE)); if (Objects.isNull(resultsSpectrums.get(0).getLcCts())) {
strBuffer.append(System.lineSeparator()); strBuffer.append(rowFormat(netRoi, StringPool.SPACE, "Roi", "Net count", StringPool.SPACE));
if (CollectionUtils.isNotEmpty(resultsSpectrums)) { strBuffer.append(System.lineSeparator());
for (GardsROIResultsSpectrum resultsSpectrum:resultsSpectrums){ if (CollectionUtils.isNotEmpty(resultsSpectrums)) {
strBuffer.append(rowFormat(netRoi, StringPool.SPACE, String.valueOf(resultsSpectrum.getRoi()), NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getNet()))+" +/- "+NumberFormatUtil.numberSixLen(String.valueOf(Math.sqrt(resultsSpectrum.getNetErr()))), StringPool.SPACE)); for (GardsROIResultsSpectrum resultsSpectrum:resultsSpectrums){
strBuffer.append(System.lineSeparator()); strBuffer.append(rowFormat(netRoi, StringPool.SPACE, String.valueOf(resultsSpectrum.getRoi()), NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getNet()))+" +/- "+NumberFormatUtil.numberSixLen(String.valueOf(Math.sqrt(resultsSpectrum.getNetErr()))), StringPool.SPACE));
strBuffer.append(System.lineSeparator());
}
} }
} } else {
} else { strBuffer.append(rowFormat(netRoi, StringPool.SPACE, "Roi", "Net count", "LC"));
strBuffer.append(rowFormat(netRoi, StringPool.SPACE, "Roi", "Net count", "LC")); strBuffer.append(System.lineSeparator());
strBuffer.append(System.lineSeparator()); if (CollectionUtils.isNotEmpty(resultsSpectrums)) {
if (CollectionUtils.isNotEmpty(resultsSpectrums)) { for (GardsROIResultsSpectrum resultsSpectrum:resultsSpectrums){
for (GardsROIResultsSpectrum resultsSpectrum:resultsSpectrums){ strBuffer.append(rowFormat(netRoi, StringPool.SPACE, String.valueOf(resultsSpectrum.getRoi()), NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getNet()))+" +/- "+NumberFormatUtil.numberSixLen(String.valueOf(Math.sqrt(resultsSpectrum.getNetErr()))), NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getLcCts()))));
strBuffer.append(rowFormat(netRoi, StringPool.SPACE, String.valueOf(resultsSpectrum.getRoi()), NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getNet()))+" +/- "+NumberFormatUtil.numberSixLen(String.valueOf(Math.sqrt(resultsSpectrum.getNetErr()))), NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getLcCts())))); strBuffer.append(System.lineSeparator());
strBuffer.append(System.lineSeparator()); }
} }
} }
} }