Commit e4663ec2f8b75ec999af6d6c6caafb63fdb20f82
1 parent
f00015e7b8
Exists in
master
and in
1 other branch
code update
Showing 2 changed files with 17 additions and 11 deletions
platform-common/src/main/java/com/lyms/platform/common/utils/ExcelUtil.java
View file @
e4663ec
| ... | ... | @@ -47,6 +47,9 @@ |
| 47 | 47 | WritableFont wf = new WritableFont(WritableFont.ARIAL, 12, WritableFont.BOLD, false, UnderlineStyle.NO_UNDERLINE, Colour.BLACK); |
| 48 | 48 | WritableCellFormat wcf = new WritableCellFormat(wf); |
| 49 | 49 | ws.setRowView(0, 300); // 设置指定行高 |
| 50 | + | |
| 51 | + ws.mergeCells(5, 0, 5, 0); | |
| 52 | + | |
| 50 | 53 | // 设置列宽 |
| 51 | 54 | for (int j = 0, columLen = columName.size(); j < columLen; j++) |
| 52 | 55 | { |
| ... | ... | @@ -69,7 +72,8 @@ |
| 69 | 72 | keyORvalue = map.get(keyName) == null?"": map.get(keyName).toString(); |
| 70 | 73 | } |
| 71 | 74 | else |
| 72 | - { // 第一行列名 | |
| 75 | + { | |
| 76 | + // 第一行列名 | |
| 73 | 77 | keyORvalue = map.get(keyName) == null?"": map.get(keyName).toString(); |
| 74 | 78 | keyName = columName.get(keyName); |
| 75 | 79 | ws.addCell(new Label(j, 0, keyName, wcf)); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
View file @
e4663ec
| ... | ... | @@ -1334,22 +1334,24 @@ |
| 1334 | 1334 | sql+=" order by A.EXAMINE_DATE DESC,A.Name ASC "; |
| 1335 | 1335 | |
| 1336 | 1336 | try { |
| 1337 | - List<Map<String,Object>> datas = JdbcUtil.getListDataBySql(sql); | |
| 1337 | +// List<Map<String,Object>> datas = JdbcUtil.getListDataBySql(sql); | |
| 1338 | + List<Map<String,Object>> datas = new ArrayList<>(); | |
| 1338 | 1339 | OutputStream out = httpServletResponse.getOutputStream(); |
| 1339 | - Map<String,String> cnames = new HashMap<>(); | |
| 1340 | + Map<String,String> cnames = new LinkedHashMap<>(); | |
| 1340 | 1341 | cnames.put("EXAMINE_DATE", "产检日期"); |
| 1341 | 1342 | cnames.put("NAME", "姓名"); |
| 1342 | 1343 | cnames.put("AGE", "年龄"); |
| 1343 | 1344 | cnames.put("NOW_WEEKS", "孕周"); |
| 1344 | 1345 | cnames.put("EDD_DATE", "预产期"); |
| 1345 | - cnames.put("HBEAG", "乙肝表面抗原"); | |
| 1346 | - cnames.put("HBSAB", "乙肝表面抗体"); | |
| 1347 | - cnames.put("HBEAG", "乙肝e抗原"); | |
| 1348 | - cnames.put("HBEAB", "乙肝e抗体"); | |
| 1349 | - cnames.put("HBCAB", "乙肝核心抗体"); | |
| 1350 | - cnames.put("SYPHILIS", "梅毒"); | |
| 1351 | - cnames.put("HIV", "HIV"); | |
| 1352 | - cnames.put("HCV", "丙肝"); | |
| 1346 | + cnames.put("TITLE", "母婴阻断项目检查结果"); | |
| 1347 | +// cnames.put("HBEAG", "乙肝表面抗原"); | |
| 1348 | +// cnames.put("HBSAB", "乙肝表面抗体"); | |
| 1349 | +// cnames.put("HBEAG", "乙肝e抗原"); | |
| 1350 | +// cnames.put("HBEAB", "乙肝e抗体"); | |
| 1351 | +// cnames.put("HBCAB", "乙肝核心抗体"); | |
| 1352 | +// cnames.put("SYPHILIS", "梅毒"); | |
| 1353 | +// cnames.put("HIV", "HIV"); | |
| 1354 | +// cnames.put("HCV", "丙肝"); | |
| 1353 | 1355 | cnames.put("HIGH_RISK_GRADE", "高危等级"); |
| 1354 | 1356 | cnames.put("HIGH_RISK_FACTOR", "高危因素"); |
| 1355 | 1357 | cnames.put("NEXT_EXAMINE_DATE", "预约产检日期"); |