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

人工交互分析beta部分RRR报告间距修改

Browse Source
This commit is contained in:
qiaoqinzheng 2023-12-11 17:58:33 +08:00
parent 905d5f5cbc
commit 8079d7e4fe
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1089,7 +1089,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
strBuffer.append(System.lineSeparator());
strBuffer.append("#SAMPLE: LIMITS PER ROI");
strBuffer.append(System.lineSeparator());
String limitRoi = "%s%-51s%-51s%-12s";
String limitRoi = "%s%-15s%-15s%-15s";
strBuffer.append(rowFormat(limitRoi, StringPool.SPACE, "Roi", "Beta", "Gamma"));
strBuffer.append(System.lineSeparator());
if (CollectionUtils.isNotEmpty(roiChannelsSpectrumsSample)) {
@ -1218,7 +1218,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
strBuffer.append(System.lineSeparator());
strBuffer.append("#GROSS COUNTS PER ROI");
strBuffer.append(System.lineSeparator());
String grossRoi = "%s%-51s%-51s%-13s%-15s";
String grossRoi = "%s%-15s%-15s%-15s%-15s";
strBuffer.append(rowFormat(grossRoi, StringPool.SPACE, "Roi", "Sample", "GasBkgnd", "DetBkgnd"));
strBuffer.append(System.lineSeparator());
if (CollectionUtils.isNotEmpty(resultsSpectrums)) {
@ -1230,7 +1230,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
strBuffer.append(System.lineSeparator());
strBuffer.append("#NET COUNTS AND LC PER ROI");
strBuffer.append(System.lineSeparator());
String netRoi = "%s%-51s%-51s%-13s";
String netRoi = "%s%-15s%-25s%-15s";
if (betaDataFile.isBProcessed()) {
if (CollectionUtils.isNotEmpty(resultsSpectrums)) {
if (Objects.isNull(resultsSpectrums.get(0).getLcCts())) {
@ -1285,7 +1285,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
strBuffer.append(System.lineSeparator());
strBuffer.append("#CONCENTRATION AND LC PER ROI");
strBuffer.append(System.lineSeparator());
String conLcRoi = "%s%-51s%-51s%-13s%-15s";
String conLcRoi = "%s%-15s%-25s%-15s%-15s";
strBuffer.append(rowFormat(conLcRoi, StringPool.SPACE, "Roi", "Conc(mBq/m3)", "LC(mBq/m3)", "MDC(mBq/m3):"));
strBuffer.append(System.lineSeparator());
if (betaDataFile.isBProcessed()) {
@ -1306,7 +1306,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
strBuffer.append(System.lineSeparator());
strBuffer.append("#RESULT SUMMARY");
strBuffer.append(System.lineSeparator());
String resultSum = "%s%-51s%-51s%-13s%-15s%-11s";
String resultSum = "%s%-15s%-25s%-15s%-15s%-15s";
strBuffer.append(rowFormat(resultSum, StringPool.SPACE, "Nuclide Name", "Conc", "LC", "MDC", "NID Flag"));
strBuffer.append(System.lineSeparator());
if (CollectionUtils.isNotEmpty(xeResultsSpectrums)) {