From ae62849591f51e953a10431f5a2cfb30de6b37cb Mon Sep 17 00:00:00 2001
From: qiaoqinzheng <qiaoqinzheng@hivekion.com>
Date: Mon, 4 Mar 2024 15:43:39 +0800
Subject: [PATCH] =?UTF-8?q?web=E7=BB=9F=E8=AE=A1beta=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=A0=B8=E7=B4=A0=E5=90=8D=E7=A7=B0=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E7=89=B9=E6=AE=8A=E6=A0=B8=E7=B4=A0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/GardsSampleDataWebServiceImpl.java       | 8 ++++++++
 1 file changed, 8 insertions(+)

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 0dc5ed19..c64a1e1b 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
@@ -25,6 +25,7 @@ import org.jeecg.modules.base.entity.original.GardsSampleData;
 import org.jeecg.modules.base.entity.original.GardsSampleDescription;
 import org.jeecg.modules.base.entity.postgre.SysDefaultNuclide;
 import org.jeecg.modules.base.enums.SystemType;
+import org.jeecg.modules.base.enums.XeNuclideName;
 import org.jeecg.modules.entity.GardsSampleDataWeb;
 import org.jeecg.modules.entity.data.*;
 import org.jeecg.modules.entity.dto.SampleDataDto;
@@ -992,6 +993,13 @@ public class GardsSampleDataWebServiceImpl extends ServiceImpl<GardsSampleDataWe
             nuclideSql = betaNuclideSql(dbName, nuclideNameList);
             for (int i=0; i< nuclideNameList.size(); i++) {
                 String nuclideName = nuclideNameList.get(i);
+                String upperNuclideName = nuclideName.toUpperCase();
+                if (upperNuclideName.equals(XeNuclideName.XE_131m.getType().toUpperCase())) {
+                    nuclideName = XeNuclideName.XE_131m.getType();
+                } else if (upperNuclideName.equals(XeNuclideName.XE_133m.getType().toUpperCase())) {
+                    nuclideName = XeNuclideName.XE_133m.getType();
+                }
+                nuclideNameList.set(i, nuclideName);
                 if (StringUtils.isNotBlank(nuclideName)) {
                     columnNameList.add(StringUtils.upperCase(nuclideName));
                     columnNameList.add(StringUtils.upperCase(nuclideName+"MDC"));