Commit ea21c365e5b360852b2033be0e073f60e75d36d2
1 parent
d4e1835ab8
Exists in
master
and in
6 other branches
导出添加高危因素
Showing 2 changed files with 3 additions and 1 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java
View file @
ea21c36
... | ... | @@ -112,7 +112,7 @@ |
112 | 112 | Document doc = null;// 原始word路径 |
113 | 113 | try { |
114 | 114 | // doc = new Document("D:\\经济开发区乡镇涉及妇幼公卫表格(外联部)_初诊.dotx"); |
115 | - doc = new Document(ViewController.class.getClassLoader().getResourceAsStream("cz.dotx")); | |
115 | + doc = new Document(ViewController.class.getClassLoader().getResourceAsStream("1.dotx")); | |
116 | 116 | specialData(doc, map);//特殊数据 |
117 | 117 | markData(doc, map);//普通数据 |
118 | 118 | sendToBrowser(doc, "导出", "doc", true, response); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
View file @
ea21c36
... | ... | @@ -597,6 +597,7 @@ |
597 | 597 | { |
598 | 598 | AntExChuModel antExChuModel = antExChuModels.get(0); |
599 | 599 | String riskName = getRisk(antExChuModel.getHighrisk(), antExChuModel.getOtherHighRisk()); |
600 | + map.put("riskName", riskName); | |
600 | 601 | if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(riskName)) |
601 | 602 | { |
602 | 603 | name +="("+riskName+")"; |
... | ... | @@ -604,6 +605,7 @@ |
604 | 605 | } |
605 | 606 | |
606 | 607 | map.put("name", name); |
608 | + | |
607 | 609 | Calendar calendar = Calendar.getInstance(); |
608 | 610 | calendar.setTime(data.getCheckTime()); |
609 | 611 |