diff --git a/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/ComReportInstr.java b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/ComReportInstr.java
index 1e0d959..6302f8d 100644
--- a/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/ComReportInstr.java
+++ b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/ComReportInstr.java
@@ -16,9 +16,9 @@ public class ComReportInstr {
   private Long reportBgdh;
   private String reportSize;
   private String reportType;
-  private Long reportRows;
-  private Long reportMinrows;
-  private Long reportMaxrows;
+  private Integer reportRows;
+  private Integer reportMinrows;
+  private Integer reportMaxrows;
   private String reportItems;
   private Long reportSort;
   private String status;
diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabReportvsitemMapper.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabReportvsitemMapper.java
index bdf231a..4b5f1ce 100644
--- a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabReportvsitemMapper.java
+++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabReportvsitemMapper.java
@@ -9,8 +9,8 @@ import java.util.List;
 public interface LabReportvsitemMapper {
     int getLabReportvsitemCount(@Param("jyrq") Date jyrq, @Param("yq")String yq, @Param("ybh")String ybh);
     int getLabReport2(@Param("jyrq") Date jyrq, @Param("yq")String yq, @Param("ybh")String ybh);
-    int getLabReportCount(@Param("jyrq") Date jyrq, @Param("yq")String yq, @Param("ybh")String ybh);
-    int getLabReportCountwithitem(@Param("jyrq") Date jyrq, @Param("yq")String yq, @Param("ybh")String ybh,@Param("items")List<String> items);
+    Integer getLabReportCount(@Param("jyrq") Date jyrq, @Param("yq")String yq, @Param("ybh")String ybh);
+    Integer getLabReportCountwithitem(@Param("jyrq") Date jyrq, @Param("yq")String yq, @Param("ybh")String ybh,@Param("items")List<String> items);
     List<ComReportInstr> getComReportInstrByInstr(String reportYq);
     String getreportCode(Long reportBgdh);
 }
diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/entity/ReportParam.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/entity/ReportParam.java
index ca6e00a..1cbf896 100644
--- a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/entity/ReportParam.java
+++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/entity/ReportParam.java
@@ -22,7 +22,8 @@ public class ReportParam {
     private String yq;
     private String ybh;
     private String hospitalName;
-    private Long ReportId;
+    private Integer resultRows;
+    private Integer reportRows;
     /**结果图片数组*/private String[] pic;
     /**检验医生签名*/private String usernopic;
     /**审核医生签名*/private String checkerpic;
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 c9656c8..36bad70 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
@@ -364,7 +364,10 @@ public class ReportUtil {
         if(comReportInstr.getReportId()==null) {
             return new Result("-1","未找到打印模板,请检查报告单设置");
         }
-        reportParam.setReportId(comReportInstr.getReportId());
+        reportParam.setReportRows(comReportInstr.getReportRows());
+        Integer count=labReportvsitemMapper.getLabReportCount(jyrq,yq,ybh);
+        if(count==null) {count=0;}
+        reportParam.setResultRows(count);
         String filename=labReportvsitemMapper.getreportCode(comReportInstr.getReportBgdh());
         return printToPdf(filename, reportParam, UUID.randomUUID().toString(), true);
 
@@ -394,8 +397,8 @@ public class ReportUtil {
         }
         int rows=labReportvsitemMapper.getLabReportCount(jyrq,yq,ybh);
         for (ComReportInstr comReportInstr : info) {
-            Long minrows=comReportInstr.getReportMinrows();
-            Long maxrows=comReportInstr.getReportMaxrows();
+            Integer minrows=comReportInstr.getReportMinrows();
+            Integer maxrows=comReportInstr.getReportMaxrows();
             if(minrows!=null&&minrows>0){
                 if(rows<minrows){continue;}
             }
diff --git a/liswork/src/main/resources/mapper/ComReportInstrMapper.xml b/liswork/src/main/resources/mapper/ComReportInstrMapper.xml
index 78c05cd..9c6ba56 100644
--- a/liswork/src/main/resources/mapper/ComReportInstrMapper.xml
+++ b/liswork/src/main/resources/mapper/ComReportInstrMapper.xml
@@ -117,21 +117,19 @@
 
     <update id="updateComReportInstr" parameterType="com.czlis.common.core.domain.entity.lis.ComReportInstr">
         update com_report_instr
-        <set>
-            <if test="reportType != null and reportType != ''">report_type = #{reportType},</if>
-            <if test="reportYq != null and reportYq != ''">report_yq = #{reportYq},</if>
-            <if test="reportBgdh != null and reportBgdh != 0">report_bgdh = #{reportBgdh},</if>
-            <if test="reportSize != null and reportSize != ''">report_size = #{reportSize},</if>
-            <if test="reportRows != null and reportRows != 0">report_rows = #{reportRows},</if>
-            <if test="reportMinrows != null and reportMinrows != 0">report_minrows = #{reportMinrows},</if>
-            <if test="reportMaxrows != null and reportMaxrows != 0">report_maxrows = #{reportMaxrows},</if>
-            <if test="reportItems != null and reportItems != ''">report_items = #{reportItems},</if>
-            <if test="reportSort != null">report_sort = #{reportSort},</if>
-            <if test="status != null and status != ''">status = #{status},</if>
-            <if test="remark != null">remark = #{remark},</if>
-            <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
-            update_time = getdate()
-        </set>
+        set report_type = #{reportType},
+        report_yq = #{reportYq},
+        report_bgdh = #{reportBgdh},
+        report_size = #{reportSize},
+        report_rows = #{reportRows},
+        report_minrows = #{reportMinrows},
+        report_maxrows = #{reportMaxrows},
+        report_items = #{reportItems},
+        report_sort = #{reportSort},
+        status = #{status},
+        remark = #{remark},
+        update_by = #{updateBy},
+        update_time = getdate()
         where report_id = #{reportId}
     </update>