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 368e33e..470b81a 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 @@ -47,6 +47,9 @@ public class ExcelUtil WritableFont wf = new WritableFont(WritableFont.ARIAL, 12, WritableFont.BOLD, false, UnderlineStyle.NO_UNDERLINE, Colour.BLACK); WritableCellFormat wcf = new WritableCellFormat(wf); ws.setRowView(0, 300); // 设置指定行高 + + ws.mergeCells(5, 0, 5, 0); + // 设置列宽 for (int j = 0, columLen = columName.size(); j < columLen; j++) { @@ -69,7 +72,8 @@ public class ExcelUtil keyORvalue = map.get(keyName) == null?"": map.get(keyName).toString(); } else - { // 第一行列名 + { + // 第一行列名 keyORvalue = map.get(keyName) == null?"": map.get(keyName).toString(); keyName = columName.get(keyName); ws.addCell(new Label(j, 0, keyName, wcf)); 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 2ac672d..e4be628 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 @@ -1334,22 +1334,24 @@ public class BookbuildingFacade { sql+=" order by A.EXAMINE_DATE DESC,A.Name ASC "; try { - List> datas = JdbcUtil.getListDataBySql(sql); +// List> datas = JdbcUtil.getListDataBySql(sql); + List> datas = new ArrayList<>(); OutputStream out = httpServletResponse.getOutputStream(); - Map cnames = new HashMap<>(); + Map cnames = new LinkedHashMap<>(); cnames.put("EXAMINE_DATE", "产检日期"); cnames.put("NAME", "姓名"); cnames.put("AGE", "年龄"); cnames.put("NOW_WEEKS", "孕周"); cnames.put("EDD_DATE", "预产期"); - 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", "预约产检日期");