jiangs/lis8.0
2
0
Fork 0
Code Issues 29 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
tangw 2025-10-27 18:22:55 +08:00
commit 8c3e118566
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmInfoNew.java
View File

@ -69,5 +69,6 @@ public class XmInfoNew {
private String val4;
private String val5;
private String isWsw;
private String inputcode;
}

3
liswork/src/main/resources/mapper/ReportItemMapper.xml
View File

@ -11,6 +11,9 @@
<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>