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 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();