jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 322db63af6e432143fb807b33947c13ef7234b76

Authored by liquanyu
1 parent 4f88b23e82
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

code update

Showing 2 changed files with 30 additions and 36 deletions

platform-common/src/main/java/com/lyms/platform/common/utils/ExcelUtil.java View file @ 322db63
... ... @@ -75,6 +75,9 @@
75 75 ws.addCell(new Label(18, 0, "高危因素", wcf));
76 76 ws.addCell(new Label(19, 0, "高危等级", wcf));
77 77 ws.addCell(new Label(20, 0, "预产期", wcf));
  78 + ws.addCell(new Label(21, 0, "产检日期", wcf));
  79 + ws.addCell(new Label(22, 0, "居住地", wcf));
  80 +
78 81 ws.mergeCells(5, 0, 12, 0);
79 82  
80 83 ws.addCell(new Label(6, 1, "乙肝表面抗体", title1));
... ... @@ -86,32 +89,24 @@
86 89 ws.addCell(new Label(12, 1, "丙肝", title1));
87 90  
88 91 // // 填充数据的内容
89   -// Map<String, Object> map;
90   -// for (int i = 0, len = data.size(); i < len; i++)
91   -// {
92   -// map = data.get(i);
93   -// Iterator<String> ite = columName.keySet().iterator();
94   -// int j = 0;
95   -// String keyORvalue = "";
96   -// String keyName = "";
97   -// while (ite.hasNext())
98   -// {
99   -// keyName = ite.next();
100   -// if (i > 0)
101   -// { // 类容数据
102   -// keyORvalue = map.get(keyName) == null?"": map.get(keyName).toString();
103   -// }
104   -// else
105   -// {
106   -// // 第一行列名
107   -// keyORvalue = map.get(keyName) == null?"": map.get(keyName).toString();
108   -// keyName = columName.get(keyName);
109   -// ws.addCell(new Label(j, 0, keyName, wcf));
110   -// }
111   -// ws.addCell(new Label(j, 1 + i, keyORvalue));
112   -// j++;
113   -// }
114   -// }
  92 + Map<String, Object> map;
  93 + for (int i = 0, len = data.size(); i < len; i++)
  94 + {
  95 + map = data.get(i);
  96 + Iterator<String> ite = columName.keySet().iterator();
  97 + int j = 0;
  98 + String keyORvalue = "";
  99 + String keyName = "";
  100 + while (ite.hasNext())
  101 + {
  102 + keyName = ite.next();
  103 + // 第一行列名
  104 + keyORvalue = map.get(keyName) == null?"": map.get(keyName).toString();
  105 + keyName = columName.get(keyName);
  106 + ws.addCell(new Label(j, 2 + i, keyORvalue));
  107 + j++;
  108 + }
  109 + }
115 110  
116 111 wwb.write();
117 112 wwb.close();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java View file @ 322db63
... ... @@ -1236,7 +1236,7 @@
1236 1236 String sql = "SELECT A.EXAMINE_DATE,\n" +
1237 1237 " A.NAME,\n" +
1238 1238 " A.AGE,\n" +
1239   - " A.NOW_WEEKS,\n" +
  1239 + " (CASE WHEN A.NOW_WEEKS_DAY<>0 THEN '孕'||A.NOW_WEEKS|| '周'||A.NOW_WEEKS_DAY||'天' ELSE '孕'||A.NOW_WEEKS|| '周' END) as NOW_WEEKS,\n" +
1240 1240 " A.NOW_WEEKS_DAY, \n" +
1241 1241 " B.EDD_DATE,\n" +
1242 1242 " A.HBSAG,\n" +
1243 1243  
1244 1244  
... ... @@ -1334,16 +1334,15 @@
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);
1338   - List<Map<String,Object>> datas = new ArrayList<>();
  1337 + List<Map<String,Object>> datas = JdbcUtil.getListDataBySql(sql);
1339 1338 OutputStream out = httpServletResponse.getOutputStream();
1340 1339 Map<String,String> cnames = new LinkedHashMap<>();
1341   - cnames.put("EXAMINE_DATE", "产检日期");
  1340 +
1342 1341 cnames.put("NAME", "姓名");
1343 1342 cnames.put("AGE", "年龄");
1344 1343 cnames.put("NOW_WEEKS", "孕周");
1345   - cnames.put("EDD_DATE", "预产期");
1346   -// cnames.put("TITLE", "母婴阻断项目检查结果");
  1344 + cnames.put("TEL_NO", "联系方式");
  1345 + cnames.put("SUGGESTION", "处理意见");
1347 1346 cnames.put("HBEAG", "乙肝表面抗原");
1348 1347 cnames.put("HBSAB", "乙肝表面抗体");
1349 1348 cnames.put("HBEAG", "乙肝e抗原");
1350 1349  
... ... @@ -1352,15 +1351,15 @@
1352 1351 cnames.put("SYPHILIS", "梅毒");
1353 1352 cnames.put("HIV", "HIV");
1354 1353 cnames.put("HCV", "丙肝");
1355   - cnames.put("HIGH_RISK_GRADE", "高危等级");
1356   - cnames.put("HIGH_RISK_FACTOR", "高危因素");
1357 1354 cnames.put("NEXT_EXAMINE_DATE", "预约产检日期");
1358 1355 cnames.put("EXAMINE_HISTORY_NUM", "本院产检次数");
1359 1356 cnames.put("DOCTOR_NAME", "产检医生");
1360 1357 cnames.put("BOOKER", "登记人");
1361 1358 cnames.put("SERVICE_STATUS", "服务类型");
1362   - cnames.put("SUGGESTION", "处理意见");
1363   - cnames.put("TEL_NO", "联系方式");
  1359 + cnames.put("HIGH_RISK_FACTOR", "高危因素");
  1360 + cnames.put("HIGH_RISK_GRADE", "高危等级");
  1361 + cnames.put("EDD_DATE", "预产期");
  1362 + cnames.put("EXAMINE_DATE", "产检日期");
1364 1363 cnames.put("HOME_ADDR", "居住地");
1365 1364 httpServletResponse.setContentType("application/octet-stream");
1366 1365 httpServletResponse.setCharacterEncoding("UTF-8");