Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/service/ReportFormsManagerImpl.java
===================================================================
diff -u -r31206 -r31210
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/service/ReportFormsManagerImpl.java	(.../ReportFormsManagerImpl.java)	(revision 31206)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/service/ReportFormsManagerImpl.java	(.../ReportFormsManagerImpl.java)	(revision 31210)
@@ -526,7 +526,7 @@
 			htmlTable = java.net.URLDecoder.decode(htmlTable,"UTF-8");
 	        //htmlTable = "<table border=\"0\" align=\"center\" cellspacing=\"0\" cellpadding=\"0\" width=\"3990px\"><thead><tr><td width=\"80px\" rowspan=\"2\">日期</td><td colspan=\"3\" rowspan=\"2\">平面器械类</td><td colspan=\"3\" rowspan=\"2\">齿类器械类</td><td colspan=\"3\" rowspan=\"2\">剪刀器械类</td><td colspan=\"3\" rowspan=\"2\">结构复杂类</td><td colspan=\"3\" rowspan=\"2\">腔镜器械类</td><td colspan=\"3\" rowspan=\"2\">管腔器械类</td><td colspan=\"3\" rowspan=\"2\">牙科手机类</td><td colspan=\"3\" rowspan=\"2\">牙科小器械</td><td colspan=\"3\" rowspan=\"2\">电动工具类</td><td colspan=\"3\" rowspan=\"2\">外来器械类</td><td colspan=\"3\" rowspan=\"2\">其他器械类</td><td colspan=\"3\" rowspan=\"2\">未设置</td><td colspan=\"3\" rowspan=\"2\">玻璃</td><td colspan=\"3\" rowspan=\"2\">敷料</td><td colspan=\"3\" rowspan=\"2\">棉布</td><td colspan=\"3\" rowspan=\"2\">木质</td><td colspan=\"3\" rowspan=\"2\">平面类器械</td><td colspan=\"3\" rowspan=\"2\">塑料</td><td colspan=\"3\" rowspan=\"2\">橡胶</td><td colspan=\"3\" class=\"sum\">合计</td></tr><tr><td class=\"sum\" width=\"70px\">清洗数量</td><td class=\"sum\" width=\"70px\">不合格数</td><td class=\"sum\" width=\"70px\">不合格率</td></tr></thead><tbody><tr><td>2020-04-01</td><td>1948</td><td>43</td><td>0.0221%</td><td>2067</td><td>23</td><td>0.0111%</td><td>215</td><td>2</td><td>0.0093%</td><td>506</td><td>0</td><td>0.0000%</td><td>58</td><td>0</td><td>0.0000%</td><td>172</td><td>0</td><td>0.0000%</td><td>25</td><td>0</td><td>0.0000%</td><td>221</td><td>0</td><td>0.0000%</td><td>16</td><td>0</td><td>0.0000%</td><td>376</td><td>0</td><td>0.0000%</td><td>12</td><td>0</td><td>0.0000%</td><td>20</td><td>0</td><td>0.0000%</td><td>2</td><td>0</td><td>0.0000%</td><td>1406</td><td>0</td><td>0.0000%</td><td>2</td><td>0</td><td>0.0000%</td><td>3</td><td>0</td><td>0.0000%</td><td>39</td><td>0</td><td>0.0000%</td><td>266</td><td>0</td><td>0.0000%</td><td>1490</td><td>0</td><td>0.0000%</td><td class=\"sum\">8844</td><td class=\"sum\">68</td><td class=\"sum\">0.0425%</td></tr></tbody><tfoot><tr><td width=\"80px\" class=\"sum2\">合计</td><td class=\"sum2\">1948</td><td class=\"sum2\">43</td><td class=\"sum2\">0.0221%</td><td class=\"sum2\">2067</td><td class=\"sum2\">23</td><td class=\"sum2\">0.0111%</td><td class=\"sum2\">215</td><td class=\"sum2\">2</td><td class=\"sum2\">0.0093%</td><td class=\"sum2\">506</td><td class=\"sum2\">0</td><td class=\"sum2\">0.0000%</td><td class=\"sum2\">58</td><td class=\"sum2\">0</td><td class=\"sum2\">0.0000%</td><td class=\"sum2\">172</td><td class=\"sum2\">0</td><td class=\"sum2\">0.0000%</td><td class=\"sum2\">25</td><td class=\"sum2\">0</td><td class=\"sum2\">0.0000%</td><td class=\"sum2\">221</td><td class=\"sum2\">0</td><td class=\"sum2\">0.0000%</td><td class=\"sum2\">16</td><td class=\"sum2\">0</td><td class=\"sum2\">0.0000%</td><td class=\"sum2\">376</td><td class=\"sum2\">0</td><td class=\"sum2\">0.0000%</td><td class=\"sum2\">12</td><td class=\"sum2\">0</td><td class=\"sum2\">0.0000%</td><td class=\"sum2\">20</td><td class=\"sum2\">0</td><td class=\"sum2\">0.0000%</td><td class=\"sum2\">2</td><td class=\"sum2\">0</td><td class=\"sum2\">0.0000%</td><td class=\"sum2\">1406</td><td class=\"sum2\">0</td><td class=\"sum2\">0.0000%</td><td class=\"sum2\">2</td><td class=\"sum2\">0</td><td class=\"sum2\">0.0000%</td><td class=\"sum2\">3</td><td class=\"sum2\">0</td><td class=\"sum2\">0.0000%</td><td class=\"sum2\">39</td><td class=\"sum2\">0</td><td class=\"sum2\">0.0000%</td><td class=\"sum2\">266</td><td class=\"sum2\">0</td><td class=\"sum2\">0.0000%</td><td class=\"sum2\">1490</td><td class=\"sum2\">0</td><td class=\"sum2\">0.0000%</td><td class=\"sum2\">8844</td><td class=\"sum2\">68</td><td class=\"sum2\">0.0425%</td></tr></tfoot></table>";
 	        //System.out.println("htmlTable:"+htmlTable);
-	        ConvertHtml2Excel.table2Excel(row2 + 5, wb, sheet, htmlTable);
+	        ConvertHtml2Excel.table2Excel(row2 + 2, wb, sheet, htmlTable);
 	        out = response.getOutputStream();
 	        response.setContentType("application/vnd.ms-excel");
 	        response.setHeader("Content-Disposition", "attachment;filename=" + new String(fileName.getBytes("gb2312"), "ISO8859-1" ));	        
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/service/ConvertHtml2Excel.java
===================================================================
diff -u -r31208 -r31210
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/service/ConvertHtml2Excel.java	(.../ConvertHtml2Excel.java)	(revision 31208)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/service/ConvertHtml2Excel.java	(.../ConvertHtml2Excel.java)	(revision 31210)
@@ -220,6 +220,7 @@
         style.setFillForegroundColor(HSSFColor.TAN.index);
         HSSFFont font = workbook.createFont();
         font.setFontName(fontName);
+        font.setColor(HSSFColor.WHITE.index);
         font.setFontHeightInPoints(fontSize);
         font.setBoldweight(HSSFFont.BOLDWEIGHT_BOLD);
         style.setFont(font);