Merge remote-tracking branch 'lis8.0/master'

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;
 
 }

liswork/src/main/resources/mapper/ReportItemMapper.xml

@@ -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>