From 17d73df3095c352c2d75b20ff031a4384504c4f4 Mon Sep 17 00:00:00 2001 From: nieziyan Date: Wed, 13 Sep 2023 19:22:14 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9Aformat?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SpectrumAnalysisServiceImpl.java | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 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 a75eca23..b46db147 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 @@ -1264,31 +1264,31 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService { if (CollectionUtils.isNotEmpty(xeDataList)){ List xe131mDataList = xeDataList.stream().filter(item -> item.getNuclideName().equals(XeNuclideName.XE_131m.getType())).collect(Collectors.toList()); GardsXeResultsSpectrum xe131m = xe131mDataList.get(0); - rlrDataValues.setXe131m_conc(String.valueOf(xe131m.getConc())); - rlrDataValues.setXe131m_uncert_conc(String.valueOf(xe131m.getConcErr())); - rlrDataValues.setXe131m_MDC(String.valueOf(xe131m.getMdc())); - rlrDataValues.setXe131m_LC(String.valueOf(xe131m.getLc())); + rlrDataValues.setXe131m_conc(NumUtil.keepStr(xe131m.getConc(), 5)); + rlrDataValues.setXe131m_uncert_conc(NumUtil.keepStr(xe131m.getConcErr(), 5)); + rlrDataValues.setXe131m_MDC(NumUtil.keepStr(xe131m.getMdc(), 5)); + rlrDataValues.setXe131m_LC(NumUtil.keepStr(xe131m.getLc(), 5)); List xe133DataList = xeDataList.stream().filter(item -> item.getNuclideName().equals(XeNuclideName.XE_133.getType())).collect(Collectors.toList()); GardsXeResultsSpectrum xe133 = xe133DataList.get(0); - rlrDataValues.setXe133_conc(String.valueOf(xe133.getConc())); - rlrDataValues.setXe133_uncert_conc(String.valueOf(xe133.getConcErr())); - rlrDataValues.setXe133_MDC(String.valueOf(xe133.getMdc())); - rlrDataValues.setXe133_LC(String.valueOf(xe133.getLc())); + rlrDataValues.setXe133_conc(NumUtil.keepStr(xe133.getConc(), 5)); + rlrDataValues.setXe133_uncert_conc(NumUtil.keepStr(xe133.getConcErr(), 5)); + rlrDataValues.setXe133_MDC(NumUtil.keepStr(xe133.getMdc(), 5)); + rlrDataValues.setXe133_LC(NumUtil.keepStr(xe133.getLc(), 5)); List xe133mDataList = xeDataList.stream().filter(item -> item.getNuclideName().equals(XeNuclideName.XE_133m.getType())).collect(Collectors.toList()); GardsXeResultsSpectrum xe133m = xe133mDataList.get(0); - rlrDataValues.setXe133m_conc(String.valueOf(xe133m.getConc())); - rlrDataValues.setXe133m_uncert_conc(String.valueOf(xe133m.getConcErr())); - rlrDataValues.setXe133m_MDC(String.valueOf(xe133m.getMdc())); - rlrDataValues.setXe133m_LC(String.valueOf(xe133m.getLc())); + rlrDataValues.setXe133m_conc(NumUtil.keepStr(xe133m.getConc(), 5)); + rlrDataValues.setXe133m_uncert_conc(NumUtil.keepStr(xe133m.getConcErr(), 5)); + rlrDataValues.setXe133m_MDC(NumUtil.keepStr(xe133m.getMdc(), 5)); + rlrDataValues.setXe133m_LC(NumUtil.keepStr(xe133m.getLc(), 5)); List xe135DataList = xeDataList.stream().filter(item -> item.getNuclideName().equals(XeNuclideName.XE_135.getType())).collect(Collectors.toList()); GardsXeResultsSpectrum xe135 = xe135DataList.get(0); - rlrDataValues.setXe135_conc(String.valueOf(xe135.getConc())); - rlrDataValues.setXe135_uncert_conc(String.valueOf(xe135.getConcErr())); - rlrDataValues.setXe135_MDC(String.valueOf(xe135.getMdc())); - rlrDataValues.setXe135_LC(String.valueOf(xe135.getLc())); + rlrDataValues.setXe135_conc(NumUtil.keepStr(xe135.getConc(), 5)); + rlrDataValues.setXe135_uncert_conc(NumUtil.keepStr(xe135.getConcErr(), 5)); + rlrDataValues.setXe135_MDC(NumUtil.keepStr(xe135.getMdc(), 5)); + rlrDataValues.setXe135_LC(NumUtil.keepStr(xe135.getLc(), 5)); } } }