Merge remote-tracking branch 'origin/debug' into debug

src/main/java/com/ynxbd/common/dao/lis/XBDLisDao.java

@@ -85,7 +85,7 @@ public class XBDLisDao {
     public List<XBDLisResult> getResult(String testDate, String sampleCode) {
         String sql = "SELECT" +
                 "            a.rptItemCode as reportItemCode," +
-                "            b.rptItemName as reportItemName," +
+                "            ISNULL(b.rptItemName,a.RptItemName2) as reportItemName," +
                 "            a.resultStr as result," +
                 "            a.unit," +
                 "            a.range," +
@@ -97,7 +97,7 @@ public class XBDLisDao {
                 "            dbo.Rpt_CheckResult a" +
                 "            LEFT JOIN dbo.Dict_ReportToItem b ON a.RptItemCode = b.RptItemCode" +
                 "        WHERE" +
-                "            a.TestDate = ? AND a.SampleCode = ? AND b.SampleCode = SUBSTRING(a.SampleCode, 1, 2)"
+                "            a.TestDate = ? AND a.SampleCode = ? AND (b.SampleCode = SUBSTRING(a.SampleCode, 1, 2) OR b.SampleCode IS NULL)"
                 +
                 "        ORDER BY" +
                 "            b.Seq";