From 3f253c75b94ec5ff22fd430c5635ff88d97fdb3e Mon Sep 17 00:00:00 2001
From: wangsq <wsqrin@163.com>
Date: Wed, 13 May 2026 17:30:21 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=91=9E=E7=BE=8ELIS=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2SQL=E8=B0=83=E6=95=B4=202=E3=80=81=E6=8B=A6=E6=88=AA?=
 =?UTF-8?q?=E5=99=A8=EF=BC=8C=E6=8B=A6=E6=88=AA=E7=9A=84=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=88=A4=E6=96=AD=EF=BC=8C=E9=98=B2=E6=AD=A2?=
 =?UTF-8?q?=E5=87=BA=E7=8E=B0=E4=BA=8C=E6=AC=A1=E5=BC=82=E5=B8=B8=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ynxbd/common/config/interceptor/MethodInterceptor.java | 6 +++++-
 src/main/java/com/ynxbd/common/dao/lis/XBDLisDao.java      | 2 +-
 .../java/com/ynxbd/common/helper/common/ErrorHelper.java   | 7 +++++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ynxbd/common/config/interceptor/MethodInterceptor.java b/src/main/java/com/ynxbd/common/config/interceptor/MethodInterceptor.java
index 7b43746..575157b 100644
--- a/src/main/java/com/ynxbd/common/config/interceptor/MethodInterceptor.java
+++ b/src/main/java/com/ynxbd/common/config/interceptor/MethodInterceptor.java
@@ -138,7 +138,11 @@ public class MethodInterceptor extends org.apache.struts2.interceptor.AbstractIn
                         System.out.println("异常1");
                         Throwable cause = e.getCause();
                         if (cause != null) {
-                            ErrorHelper.println((Exception) cause);
+                            if (cause instanceof Exception) {
+                                ErrorHelper.println((Exception) cause);
+                            } else {
+                                ErrorHelper.println(cause);
+                            }
                         }
                     } else {
                         System.out.println("异常2");
diff --git a/src/main/java/com/ynxbd/common/dao/lis/XBDLisDao.java b/src/main/java/com/ynxbd/common/dao/lis/XBDLisDao.java
index 6474eaf..a9f0cc3 100644
--- a/src/main/java/com/ynxbd/common/dao/lis/XBDLisDao.java
+++ b/src/main/java/com/ynxbd/common/dao/lis/XBDLisDao.java
@@ -513,7 +513,7 @@ public class XBDLisDao {
     public List<XBDLisResult> getResult4RM(int reportId) {
         String sql = "SELECT" +
                 "    a.rpt_itemcode AS ReportItemCode" +
-                "    ,c.rpt_itemname AS ReportItemName" +
+                "    ,c.rpt_itemname + '('+c.rptcode+')' AS ReportItemName" +
                 "    ,a.result_str AS Result" +
                 "    ,a.result_unit AS Unit" +
                 "    ,a.result_ref AS Range" +
diff --git a/src/main/java/com/ynxbd/common/helper/common/ErrorHelper.java b/src/main/java/com/ynxbd/common/helper/common/ErrorHelper.java
index 68fc6f5..4df11ec 100644
--- a/src/main/java/com/ynxbd/common/helper/common/ErrorHelper.java
+++ b/src/main/java/com/ynxbd/common/helper/common/ErrorHelper.java
@@ -20,6 +20,13 @@ public class ErrorHelper {
         println(null, e);
     }
 
+    public static void println(Throwable e) {
+        if (e == null) {
+            return;
+        }
+        log.error(e.getMessage());
+    }
+
     public static void println(String message, Exception e) {
         try {
             StringBuilder sb = new StringBuilder();