diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/ExcelUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/ExcelUtil.java index ac7ce7f..238c1eb 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/ExcelUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/ExcelUtil.java @@ -34,7 +34,7 @@ public class ExcelUtil static WritableWorkbook to_wwb; // 创建可写入workbook对象 - public static OutputStream toExcel(OutputStream out, List> data, Map columName) + public static OutputStream toChanExcel(OutputStream out, List> data, Map columName) { WritableWorkbook wwb; try @@ -57,19 +57,19 @@ public class ExcelUtil } Iterator ite = columName.keySet().iterator(); int j = 0; - String keyORvalue = ""; - String keyName = ""; - while (ite.hasNext()) + String keyName = ""; + while (ite.hasNext()) + { + if (j > 5 && j < 13) { - keyName = ite.next(); - - keyName = columName.get(keyName); - ws.addCell(new Label(j, 0, keyName, wcf)); - - ws.addCell(new Label(j, 1 + 0, keyORvalue)); - j++; + continue; } - ws.mergeCells(5, 1, 5, 1); + keyName = ite.next(); + keyName = columName.get(keyName); + ws.addCell(new Label(j, 0, keyName, wcf)); + j++; + } + ws.mergeCells(5, 0, 5, 0); // // 填充数据的内容 // Map map; @@ -118,7 +118,7 @@ public class ExcelUtil } - public static OutputStream toChanExcel(OutputStream out, List> data, Map columName) + public static OutputStream toExcel(OutputStream out, List> data, Map columName) { WritableWorkbook wwb; try diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index e4be628..23c77ea 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -1343,15 +1343,15 @@ public class BookbuildingFacade { cnames.put("AGE", "年龄"); cnames.put("NOW_WEEKS", "孕周"); cnames.put("EDD_DATE", "预产期"); - cnames.put("TITLE", "母婴阻断项目检查结果"); -// cnames.put("HBEAG", "乙肝表面抗原"); -// cnames.put("HBSAB", "乙肝表面抗体"); -// cnames.put("HBEAG", "乙肝e抗原"); -// cnames.put("HBEAB", "乙肝e抗体"); -// cnames.put("HBCAB", "乙肝核心抗体"); -// cnames.put("SYPHILIS", "梅毒"); -// cnames.put("HIV", "HIV"); -// cnames.put("HCV", "丙肝"); +// cnames.put("TITLE", "母婴阻断项目检查结果"); + cnames.put("HBEAG", "乙肝表面抗原"); + cnames.put("HBSAB", "乙肝表面抗体"); + cnames.put("HBEAG", "乙肝e抗原"); + cnames.put("HBEAB", "乙肝e抗体"); + cnames.put("HBCAB", "乙肝核心抗体"); + cnames.put("SYPHILIS", "梅毒"); + cnames.put("HIV", "HIV"); + cnames.put("HCV", "丙肝"); cnames.put("HIGH_RISK_GRADE", "高危等级"); cnames.put("HIGH_RISK_FACTOR", "高危因素"); cnames.put("NEXT_EXAMINE_DATE", "预约产检日期"); @@ -1365,7 +1365,7 @@ public class BookbuildingFacade { httpServletResponse.setContentType("application/octet-stream"); httpServletResponse.setCharacterEncoding("UTF-8"); httpServletResponse.setHeader("Content-Disposition", "attachment;fileName=datas.xls"); - ExcelUtil.toExcel(out,datas,cnames); + ExcelUtil.toChanExcel(out, datas, cnames); }catch (Exception e) { logger.error(e +"",e);