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

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

@@ -14,9 +14,9 @@
 
     <insert id="add">
         insert into lab_reportinstr(
-        bgdh,yq,xh,yljg
+        bgdh,yq,xh,yljg,myhs
         )values(
-        #{bgdh},#{yq},#{xh},#{yljg}
+        #{bgdh},#{yq},#{xh},#{yljg},#{myhs}
         )
     </insert>
 

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

@@ -38,7 +38,7 @@
         select * from xm_inter
         <where>
             <if test="yq !=null and yq !=''"> and yq = #{yq}</if>
-            <if test="tdh !=null and tdh !=''"> and tdh = #{tdh}</if>
+            <if test="xmid !=null and xmid !=''"> and xmid = #{xmid}</if>
         </where>
     </select>
 

zybgcx/src/main/java/com/czlis/zybgcx/pojo/Web_getReportsList.java

@@ -37,5 +37,6 @@ public class Web_getReportsList {
     private String jymd;
     private String st;
     private String et;
+    private Date sqsj;
 
 }