From 1c946a079e5a628445ccc72564fbde35c3b1a2df Mon Sep 17 00:00:00 2001
From: jiangs <373297395@qq.com>
Date: Mon, 27 Oct 2025 18:16:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E9=A1=B9=E7=9B=AE=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../czlis/common/core/domain/entity/lis/XmInfoNew.java   | 1 +
 liswork/src/main/resources/mapper/ReportItemMapper.xml   | 9 ++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmInfoNew.java b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmInfoNew.java
index 972d2f0..abb75c7 100644
--- a/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmInfoNew.java
+++ b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmInfoNew.java
@@ -69,5 +69,6 @@ public class XmInfoNew {
     private String val4;
     private String val5;
     private String isWsw;
+    private String inputcode;
 
 }
diff --git a/liswork/src/main/resources/mapper/ReportItemMapper.xml b/liswork/src/main/resources/mapper/ReportItemMapper.xml
index 0c80355..2a71d1c 100644
--- a/liswork/src/main/resources/mapper/ReportItemMapper.xml
+++ b/liswork/src/main/resources/mapper/ReportItemMapper.xml
@@ -7,10 +7,13 @@
         select * from xm_info_new
         <where>
             <if test="xmid != null and xmid != ''"> and xmid = #{xmid}</if>
-           <if test="yq != null and yq != ''"> and yq = #{yq}</if>
-           <if test="xmdh != null and xmdh != ''"> and yq = #{xmdh}</if>
-           <if test="isWsw != null and isWsw !=''"><![CDATA[and yqdl <> '细菌仪']]></if>
+            <if test="yq != null and yq != ''"> and yq = #{yq}</if>
+            <if test="xmdh != null and xmdh != ''"> and yq = #{xmdh}</if>
+            <if test="isWsw != null and isWsw !=''"><![CDATA[and yqdl <> '细菌仪']]></if>
             <if test="uflag != null and uflag !=''">and uflag = #{uflag}</if>
+            <if test="xmgl != null and xmgl !=''">and xmgl = #{xmgl}</if>
+            <if test="itemclass != null and itemclass !=''">and itemclass = #{itemclass}</if>
+            <if test="inputcode != null and inputcode !=''">and (xmdh like '%'+#{inputcode}+'%' or xmmc like '%'+#{inputcode}+'%' or zjf like '%'+#{inputcode}+'%' )</if>
         </where>
     </select>