From ea21c365e5b360852b2033be0e073f60e75d36d2 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 16 Oct 2018 13:28:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=B7=BB=E5=8A=A0=E9=AB=98?= =?UTF-8?q?=E5=8D=B1=E5=9B=A0=E7=B4=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/operate/web/controller/ViewController.java | 2 +- .../src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java index 759c2dc..f05b832 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java @@ -112,7 +112,7 @@ public class ViewController extends BaseController { Document doc = null;// 原始word路径 try { // doc = new Document("D:\\经济开发区乡镇涉及妇幼公卫表格(外联部)_初诊.dotx"); - doc = new Document(ViewController.class.getClassLoader().getResourceAsStream("cz.dotx")); + doc = new Document(ViewController.class.getClassLoader().getResourceAsStream("1.dotx")); specialData(doc, map);//特殊数据 markData(doc, map);//普通数据 sendToBrowser(doc, "导出", "doc", true, response); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 9d1ba76..882386d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -597,6 +597,7 @@ public class ViewFacade { { AntExChuModel antExChuModel = antExChuModels.get(0); String riskName = getRisk(antExChuModel.getHighrisk(), antExChuModel.getOtherHighRisk()); + map.put("riskName", riskName); if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(riskName)) { name +="("+riskName+")"; @@ -604,6 +605,7 @@ public class ViewFacade { } map.put("name", name); + Calendar calendar = Calendar.getInstance(); calendar.setTime(data.getCheckTime()); -- 1.8.3.1