From 9a26e787c8eec261a9204173a2fdca920fe87890 Mon Sep 17 00:00:00 2001
From: qiaoqinzheng <qiaoqinzheng@hivekion.com>
Date: Mon, 25 Dec 2023 13:42:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=A4=84=E7=90=86Gamma?=
 =?UTF-8?q?=E9=83=A8=E5=88=86QC=E7=9B=B8=E5=85=B3=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=AD=98=E5=82=A8=E6=95=B0=E6=8D=AE=E5=BA=93?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/spectrum/Sample_G_Analysis.java   | 28 ++++++++++---------
 .../org/jeecg/common/util/GammaFileUtil.java  | 20 ++++++++-----
 2 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_G_Analysis.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_G_Analysis.java
index 2960ce5b..03efead5 100644
--- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_G_Analysis.java
+++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_G_Analysis.java
@@ -883,20 +883,22 @@ public class Sample_G_Analysis {
        List<GardsMDC> mdcList = new LinkedList<>();
        if (CollectionUtils.isNotEmpty(mdcInfoMap)) {
            for (CalMDCInfo mdcInfo :mdcInfoMap.values()) {
-               GardsMDC mdc = new GardsMDC();
-               mdc.setIdAnalysis(IdAnalysis);
-               mdc.setSampleId(sampleId);
-               mdc.setNuclideName(mdcInfo.getNuclideName());
-               mdc.setEnergy(mdcInfo.getEnergy());
-               mdc.setYield(mdcInfo.getYield());
-               mdc.setEfficiency(mdcInfo.getEfficiency());
-               if (Objects.nonNull(mdcInfo.getMdc()) && Double.isFinite(mdcInfo.getMdc())) {
-                   mdc.setMdc(mdcInfo.getMdc());
-               } else {
-                   mdc.setMdc(null);
+               if (Objects.nonNull(mdcInfo.getEnergy()) && Objects.nonNull(mdcInfo.getYield()) && Objects.nonNull(mdcInfo.getEfficiency())) {
+                   GardsMDC mdc = new GardsMDC();
+                   mdc.setIdAnalysis(IdAnalysis);
+                   mdc.setSampleId(sampleId);
+                   mdc.setNuclideName(mdcInfo.getNuclideName());
+                   mdc.setEnergy(mdcInfo.getEnergy());
+                   mdc.setYield(mdcInfo.getYield());
+                   mdc.setEfficiency(mdcInfo.getEfficiency());
+                   if (Objects.nonNull(mdcInfo.getMdc()) && Double.isFinite(mdcInfo.getMdc())) {
+                       mdc.setMdc(mdcInfo.getMdc());
+                   } else {
+                       mdc.setMdc(null);
+                   }
+                   mdc.setMdcErr(null);
+                   mdcList.add(mdc);
                }
-               mdc.setMdcErr(null);
-               mdcList.add(mdc);
            }
        }
        if (CollectionUtils.isNotEmpty(mdcList)) {
diff --git a/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/GammaFileUtil.java b/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/GammaFileUtil.java
index fe3417d1..3f1b78eb 100644
--- a/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/GammaFileUtil.java
+++ b/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/GammaFileUtil.java
@@ -3116,6 +3116,7 @@ public class GammaFileUtil extends AbstractLogOrReport {
             String anylseEnd;
             anylseBegin = DateUtils.formatDate(new Date(), "yyyy/MM/dd HH:mm:ss");
             bRet = AnalyseSpectrum(fileAnlyse,nucline);
+            RunQC(fileAnlyse);
             fileAnlyse.setEfficiencyParam(fileAnlyse.getUsedEffiPara().getP());
             fileAnlyse.setEfficiencyEnergy(fileAnlyse.getUsedEffiKD().getG_energy());
             fileAnlyse.setEfficiencyCurRow(0);
@@ -4593,13 +4594,15 @@ public class GammaFileUtil extends AbstractLogOrReport {
             CalMDCInfo mdcInfo = mdcInfoMap.get(nuclideName);
             if (Objects.nonNull(mdcInfo)) {
                 calCulEfficiencyValue(phd, mdcInfo, nuclideLines);
-                //计算MDC数据
-                List<Double> vMdcInfo = new LinkedList<>();
-                vMdcInfo.add(mdcInfo.getEnergy());
-                vMdcInfo.add(mdcInfo.getYield());
-                vMdcInfo.add(mdcInfo.getHalflife());
-                Double mdc = CalculateMDC(phd, vMdcInfo, 1.0);
-                mdcInfo.setMdc(mdc);
+                if (Objects.nonNull(mdcInfo.getEnergy()) && Objects.nonNull(mdcInfo.getYield()) && Objects.nonNull(mdcInfo.getHalflife())) {
+                    //计算MDC数据
+                    List<Double> vMdcInfo = new LinkedList<>();
+                    vMdcInfo.add(mdcInfo.getEnergy());
+                    vMdcInfo.add(mdcInfo.getYield());
+                    vMdcInfo.add(mdcInfo.getHalflife());
+                    Double mdc = CalculateMDC(phd, vMdcInfo, 1.0);
+                    mdcInfo.setMdc(mdc);
+                }
             }
         }
 
@@ -4607,6 +4610,9 @@ public class GammaFileUtil extends AbstractLogOrReport {
 
     public void calCulEfficiencyValue(PHDFile phd, CalMDCInfo mdcInfo, NuclideLines nuclideLines) {
         List<Double> efficiencies = new LinkedList<>();
+        if (CollectionUtils.isEmpty(phd.getEfficiencyParam()) || CollectionUtils.isEmpty(phd.getEfficiencyEnergy())) {
+            return;
+        }
         int funId = phd.getEfficiencyParam().get(0).intValue();
         int p_size = phd.getEfficiencyParam().size() - 1;
         int e_size = phd.getEfficiencyEnergy().size();