From c335ce54c7e8dbaaeef873beee5028edb8dce076 Mon Sep 17 00:00:00 2001
From: tangw <czlis@tangw>
Date: Mon, 29 Dec 2025 16:54:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=91=8A=E6=A8=A1=E6=9D=BF=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/czlis/interfaceCommon/utils/ReportUtil.java  | 3 +++
 .../src/main/resources/mapper/LabReportvsitemMapper.xml        | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/ReportUtil.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/ReportUtil.java
index fac038c..c9656c8 100644
--- a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/ReportUtil.java
+++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/ReportUtil.java
@@ -361,6 +361,9 @@ public class ReportUtil {
         if(comReportInstr==null) {
             return new Result("-1","未找到打印模板,请检查报告单设置");
         }
+        if(comReportInstr.getReportId()==null) {
+            return new Result("-1","未找到打印模板,请检查报告单设置");
+        }
         reportParam.setReportId(comReportInstr.getReportId());
         String filename=labReportvsitemMapper.getreportCode(comReportInstr.getReportBgdh());
         return printToPdf(filename, reportParam, UUID.randomUUID().toString(), true);
diff --git a/lis-interfaceCommon/src/main/resources/mapper/LabReportvsitemMapper.xml b/lis-interfaceCommon/src/main/resources/mapper/LabReportvsitemMapper.xml
index 6eb5e02..e3f802b 100644
--- a/lis-interfaceCommon/src/main/resources/mapper/LabReportvsitemMapper.xml
+++ b/lis-interfaceCommon/src/main/resources/mapper/LabReportvsitemMapper.xml
@@ -38,7 +38,7 @@
     </select>
     <select id="getLabReportCount" resultType="int">
         SELECT sum(LEN(refs) - LEN(REPLACE(refs, '|', '')))+count(1) FROM lab_result,xm_info WHERE
-        xm_info.yq=lab_result.yq and xm_info.xmdh=lab_result.xmdh and xm_info.dylx !='3' and
+        xm_info.yq=lab_result.yq and xm_info.xmdh=lab_result.xmdh and xm_info.dylx !='3'
         AND  ( lab_result.jyrq =#{jyrq} ) AND ( lab_result.yq = #{yq}) AND  ( lab_result.ybh = #{ybh} )
     </select>
     <select id="getLabReportCountwithitem" resultType="int">