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 953c449a..04becf71 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 @@ -1470,7 +1470,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements String xe133MDCEvaluationMetrics = "0.001 ~ 5"; qcResult.setXe133MDCEvaluationMetrics(xe133MDCEvaluationMetrics); //获取数据信息 - GardsXeResultsSpectrum gardsXeResults = new GardsXeResultsSpectrum(); + GardsXeResultsSpectrum gardsXeResults = null; List xeDataList = new LinkedList<>(); try { xeDataList = betaDataFile.getXeResultsSpectrumList(); @@ -1543,7 +1543,8 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements qcResult.setXe133MDCStatus("Failed"); } } else { - qcResult.setXe133MDCStatus("Pass"); + qcResult.setXe133MDCValue("None"); + qcResult.setXe133MDCStatus("None"); } } } catch (Exception e) { @@ -1588,17 +1589,17 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements String qcTitle = "%s%-24s%-21s%-10s%-9s"; strBuffer.append(rowFormat(qcTitle, StringPool.SPACE, "QC Flags", "Evaluation Metrics", "Value", "Status")); strBuffer.append(System.lineSeparator()); - strBuffer.append(rowFormat(qcTitle, StringPool.SPACE, "Collection Time (h)", qcResult.getCollectTimeEvaluationMetrics(), qcResult.getCollectTimeValue(), qcResult.getCollectTimeStatus())); + strBuffer.append(rowFormat(qcTitle, StringPool.SPACE, "Collection Time (h)", StringUtils.isNotBlank(qcResult.getCollectTimeEvaluationMetrics())?qcResult.getCollectTimeEvaluationMetrics():"", StringUtils.isNotBlank(qcResult.getCollectTimeValue())?qcResult.getCollectTimeValue():"", StringUtils.isNotBlank(qcResult.getCollectTimeStatus())?qcResult.getCollectTimeStatus():"Failed")); strBuffer.append(System.lineSeparator()); - strBuffer.append(rowFormat(qcTitle, StringPool.SPACE, "Acqusition Time (h)", qcResult.getAcquisitionTimeEvaluationMetrics(), qcResult.getAcquisitionTimeValue(), qcResult.getAcquisitionTimeStatus())); + strBuffer.append(rowFormat(qcTitle, StringPool.SPACE, "Acqusition Time (h)", StringUtils.isNotBlank(qcResult.getAcquisitionTimeEvaluationMetrics())?qcResult.getAcquisitionTimeEvaluationMetrics():"", StringUtils.isNotBlank(qcResult.getAcquisitionTimeValue())?qcResult.getAcquisitionTimeValue():"", StringUtils.isNotBlank(qcResult.getAcquisitionTimeStatus())?qcResult.getAcquisitionTimeStatus():"Failed")); strBuffer.append(System.lineSeparator()); - strBuffer.append(rowFormat(qcTitle, StringPool.SPACE, "Xenon Volume (ml)", qcResult.getXenonVolumeEvaluationMetrics(), qcResult.getXenonVolumeValue(), qcResult.getXenonVolumeStatus())); + strBuffer.append(rowFormat(qcTitle, StringPool.SPACE, "Xenon Volume (ml)", StringUtils.isNotBlank(qcResult.getXenonVolumeEvaluationMetrics())?qcResult.getXenonVolumeEvaluationMetrics():"", StringUtils.isNotBlank(qcResult.getXenonVolumeValue())?qcResult.getXenonVolumeValue():"", StringUtils.isNotBlank(qcResult.getXenonVolumeStatus())?qcResult.getXenonVolumeStatus():"Failed")); strBuffer.append(System.lineSeparator()); - strBuffer.append(rowFormat(qcTitle, StringPool.SPACE, "Gas Bg", qcResult.getGasBgEvaluationMetrics(), qcResult.getGasBgValue(), qcResult.isGasBgValueAndStatus()?"true":"false")); + strBuffer.append(rowFormat(qcTitle, StringPool.SPACE, "Gas Bg", StringUtils.isNotBlank(qcResult.getGasBgEvaluationMetrics())?qcResult.getGasBgEvaluationMetrics():"", StringUtils.isNotBlank(qcResult.getGasBgValue())?qcResult.getGasBgValue():"", qcResult.isGasBgValueAndStatus()?"Pass":"Failed")); strBuffer.append(System.lineSeparator()); - strBuffer.append(rowFormat(qcTitle, StringPool.SPACE, "Det Bg", qcResult.getDetBgEvaluationMetrics(), qcResult.getDetBgValue(), qcResult.isDetBgValueAndStatus()?"true":"false")); + strBuffer.append(rowFormat(qcTitle, StringPool.SPACE, "Det Bg", StringUtils.isNotBlank(qcResult.getDetBgEvaluationMetrics())?qcResult.getDetBgEvaluationMetrics():"", StringUtils.isNotBlank(qcResult.getDetBgValue())?qcResult.getDetBgValue():"", qcResult.isDetBgValueAndStatus()?"Pass":"Failed")); strBuffer.append(System.lineSeparator()); - strBuffer.append(rowFormat(qcTitle, StringPool.SPACE, "MDC for Xe133 (mBq/m3)", qcResult.getXe133MDCEvaluationMetrics(), qcResult.getXe133MDCValue(), qcResult.getXe133MDCStatus())); + strBuffer.append(rowFormat(qcTitle, StringPool.SPACE, "MDC for Xe133 (mBq/m3)", StringUtils.isNotBlank(qcResult.getXe133MDCEvaluationMetrics())?qcResult.getXe133MDCEvaluationMetrics():"", StringUtils.isNotBlank(qcResult.getXe133MDCValue())?qcResult.getXe133MDCValue():"None", StringUtils.isNotBlank(qcResult.getXe133MDCStatus())?qcResult.getXe133MDCStatus():"None")); strBuffer.append(System.lineSeparator()); strBuffer.append(System.lineSeparator()); OutputStream fos = null;