From 4de9186c64cf35556aaceb17fc6a2bdaf798c844 Mon Sep 17 00:00:00 2001
From: duwenyuan <15600000461@163.com>
Date: Mon, 30 Jun 2025 10:45:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0STATISTICS=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BAmdc=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/GardsSampleDataWebServiceImpl.java   | 31 +++++++++++++++++--
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSampleDataWebServiceImpl.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSampleDataWebServiceImpl.java
index 6f3eb318..512155e1 100644
--- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSampleDataWebServiceImpl.java
+++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSampleDataWebServiceImpl.java
@@ -934,6 +934,8 @@ public class GardsSampleDataWebServiceImpl extends ServiceImpl<GardsSampleDataWe
                 if (StringUtils.isNotBlank(nuclideName)) {
                     List<Double> concList = new LinkedList<>();
                     resultMap.put(nuclideName+"Conc", concList);
+                    List<Double> mdcList = new LinkedList<>();
+                    resultMap.put(nuclideName+"MDC", mdcList);
                 }
             }
         }
@@ -1042,6 +1044,7 @@ public class GardsSampleDataWebServiceImpl extends ServiceImpl<GardsSampleDataWe
                 String nuclideName = nuclideNameList.get(i);
                 if (StringUtils.isNotBlank(nuclideName)) {
                     columnNameList.add(StringUtils.upperCase(nuclideName));
+                    columnNameList.add(StringUtils.upperCase(nuclideName+"MDC"));
                 }
             }
         }
@@ -1158,12 +1161,19 @@ public class GardsSampleDataWebServiceImpl extends ServiceImpl<GardsSampleDataWe
             if (StringUtils.isNotBlank(nuclideName)) {
                 String nuclideSql = "(SELECT DISTINCT\n" +
                         "D.CONCENTRATION\n" +
-                        "FROM\n" +
-                        ""+dbName+".GARDS_NUCL_IDED D\n" +
+                        "FROM\n" +dbName+".GARDS_NUCL_IDED D\n" +
                         "WHERE\n" +
                         "D.NUCLIDENAME = '"+nuclideName+"'\n" +
                         "AND D.SAMPLE_ID = AA.SAMPLE_ID\n" +
-                        ") AS "+nuclideName;
+                        ") AS "+nuclideName+",\n" +
+                        "(\n" +
+                        "SELECT DISTINCT\n" +
+                        "D.MDC\n" +
+                        "FROM\n" +dbName+".GARDS_NUCL_IDED D\n" +
+                        "WHERE\n" +
+                        "D.NUCLIDENAME = '"+nuclideName+"'\n" +
+                        "AND D.SAMPLE_ID = AA.SAMPLE_ID\n" +
+                        ") AS "+nuclideName+"MDC";
                 nuclideSqls.add(nuclideSql);
             }
         }
@@ -1250,6 +1260,7 @@ public class GardsSampleDataWebServiceImpl extends ServiceImpl<GardsSampleDataWe
                     } else if (systemType.equals("Particulate")) {
                         for (String nuclideName: nuclideNameList) {
                             List<Double> concList = (List<Double>) resultMap.get(nuclideName + "Conc");
+                            List<Double> mdcList = (List<Double>) resultMap.get(nuclideName + "MDC");
                             //将核素名称转为全部大写
                             String columnName = StringUtils.upperCase(nuclideName);
                             //读取查询出的浓度
@@ -1264,6 +1275,18 @@ public class GardsSampleDataWebServiceImpl extends ServiceImpl<GardsSampleDataWe
                             } else {
                                 concList.add(null);
                             }
+                            //读取查询出的mdc结果
+                            Object mdc = nuclideStatistics.get(columnName + "MDC");
+                            //判断如果mdc结果不为空 正常存储
+                            if (Objects.nonNull(mdc)) {
+                                if (mdc.toString().toLowerCase().contains("inf") || mdc.toString().toLowerCase().contains("nan")) {
+                                    mdcList.add(null);
+                                } else {
+                                    mdcList.add(Double.valueOf(mdc.toString()));
+                                }
+                            } else {
+                                mdcList.add(null);
+                            }
                         }
                     }
                     isHave = true;
@@ -1284,7 +1307,9 @@ public class GardsSampleDataWebServiceImpl extends ServiceImpl<GardsSampleDataWe
                         } else if (systemType.equals("Particulate")) {
                             for (String nuclideName: nuclideNameList) {
                                 List<Double> concList = (List<Double>) resultMap.get(nuclideName + "Conc");
+                                List<Double> mdcList = (List<Double>) resultMap.get(nuclideName + "MDC");
                                 concList.add(null);
+                                mdcList.add(null);
                             }
                         }
                     }