From 8079d7e4fe57c0a91a9435e7eeb9244935eaa7d0 Mon Sep 17 00:00:00 2001 From: qiaoqinzheng Date: Mon, 11 Dec 2023 17:58:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=B7=A5=E4=BA=A4=E4=BA=92=E5=88=86?= =?UTF-8?q?=E6=9E=90beta=E9=83=A8=E5=88=86RRR=E6=8A=A5=E5=91=8A=E9=97=B4?= =?UTF-8?q?=E8=B7=9D=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SpectrumAnalysisServiceImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java index 28e15a40..29445c0e 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java @@ -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)) {