From 9f78882321b81b6deed9a8097b0d4dd66e89de4c Mon Sep 17 00:00:00 2001 From: liquanyu Date: Mon, 10 Oct 2016 13:33:19 +0800 Subject: [PATCH] code update --- .../src/main/java/com/lyms/platform/common/utils/ExcelUtil.java | 9 ++++++--- .../com/lyms/platform/operate/web/facade/ApplyOrderFacade.java | 4 ++-- .../lyms/platform/operate/web/facade/BabyBookbuildingFacade.java | 4 ++-- .../java/com/lyms/platform/operate/web/facade/PatientFacade.java | 2 +- .../java/com/lyms/platform/operate/web/facade/SieveFacade.java | 2 +- 5 files changed, 12 insertions(+), 9 deletions(-) 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 b971360..52ccfa8 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 @@ -54,6 +54,10 @@ public class ExcelUtil WritableCellFormat title1 = new WritableCellFormat(font1); title1.setAlignment(jxl.format.Alignment.CENTRE); + WritableFont contentFont = new WritableFont(WritableFont.ARIAL, 12, WritableFont.NO_BOLD, false, UnderlineStyle.NO_UNDERLINE, Colour.BLACK); + WritableCellFormat contentFormt = new WritableCellFormat(contentFont); + contentFormt.setAlignment(jxl.format.Alignment.CENTRE); + // 设置列宽 for (int j = 0, columLen = columName.size(); j < columLen; j++) @@ -79,7 +83,7 @@ public class ExcelUtil ws.addCell(new Label(22, 0, "居住地", wcf)); ws.mergeCells(5, 0, 12, 0); - + ws.addCell(new Label(5, 1, "乙肝表面抗原", title1)); ws.addCell(new Label(6, 1, "乙肝表面抗体", title1)); ws.addCell(new Label(7, 1, "乙肝e抗原", title1)); ws.addCell(new Label(8, 1, "乙肝e抗体", title1)); @@ -102,8 +106,7 @@ public class ExcelUtil keyName = ite.next(); // 第一行列名 keyORvalue = map.get(keyName) == null?"": map.get(keyName).toString(); - keyName = columName.get(keyName); - ws.addCell(new Label(j, 2 + i, keyORvalue)); + ws.addCell(new Label(j, 2 + i, keyORvalue,contentFormt)); j++; } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java index 8195149..d22630b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java @@ -783,7 +783,7 @@ public class ApplyOrderFacade { } } out = response.getOutputStream(); - Map cnames = new HashMap<>(); + Map cnames = new LinkedHashMap<>(); //1转入 if ("1".equals(applyOrderQueryRequest.getAction())) @@ -871,7 +871,7 @@ public class ApplyOrderFacade { } } out = response.getOutputStream(); - Map cnames = new HashMap<>(); + Map cnames = new LinkedHashMap<>(); //1转入 if ("1".equals(orderQueryRequest.getAction())) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index ae44c07..1b1714c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -1903,8 +1903,7 @@ public class BabyBookbuildingFacade { } } OutputStream out = httpServletResponse.getOutputStream(); - Map cnames = new HashMap<>(); - cnames.put("highRisk", "是否健康"); + Map cnames = new LinkedHashMap<>(); cnames.put("sex","性别"); cnames.put("babyName","儿童姓名"); cnames.put("birthday", "儿童生日"); @@ -1914,6 +1913,7 @@ public class BabyBookbuildingFacade { cnames.put("nextDate","下次预约时间"); cnames.put("monthAge","月龄"); cnames.put("diagnose","高危诊断"); + cnames.put("highRisk", "是否健康"); httpServletResponse.setContentType("application/octet-stream"); httpServletResponse.setCharacterEncoding("UTF-8"); httpServletResponse.setHeader("Content-Disposition", "attachment;fileName="+"childDatas.xls"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index e475cf6..85aaa60 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -648,7 +648,7 @@ public class PatientFacade { try { BaseListResponse listResponse = null; List> datas = new ArrayList<>(); - Map cnames = new HashMap<>(); + Map cnames = new LinkedHashMap<>(); if (patientsQueryRequest.getQueryType() != null) { // 0 高危孕妇 1 全部孕妇 2全部产妇 if (patientsQueryRequest.getQueryType() == 0) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java index b3393b2..e30ecc5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java @@ -261,7 +261,7 @@ public class SieveFacade { } } OutputStream out = response.getOutputStream(); - Map cnames = new HashMap<>(); + Map cnames = new LinkedHashMap<>(); cnames.put("name", "姓名"); cnames.put("cDueWeek","当前孕周"); cnames.put("tireNumber","胎数"); -- 1.8.3.1