From ab53618dea3e41835e2a5d9a885a5a621431b0aa Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Wed, 21 Jun 2017 16:28:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8F=B7bug=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lyms/platform/operate/web/controller/ViewController.java    | 6 +++---
 .../main/java/com/lyms/platform/operate/web/facade/ViewFacade.java  | 5 +----
 2 files changed, 4 insertions(+), 7 deletions(-)

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 1fbf7e6..6b9a62e 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
@@ -75,7 +75,7 @@ public class ViewController extends BaseController {
             }
             Document doc = null;// 原始word路径
             try {
-                doc = new Document("D:\\经济开发区乡镇涉及妇幼公卫表格(外联部).dotx");
+                doc = new Document("D:\\经济开发区乡镇涉及妇幼公卫表格(外联部)_初诊.dotx");
                 specialData(doc, map);//特殊数据
                 markData(doc, map);//普通数据
                 sendToBrowser(doc, "导出", "doc", true, response);
@@ -97,7 +97,7 @@ public class ViewController extends BaseController {
      */
     @RequestMapping(value = "/downExFuData", method = RequestMethod.GET)
     // @TokenRequired
-    public void downExFuData(@RequestParam("id") String id,int num, HttpServletRequest request, HttpServletResponse response) {
+    public void downExFuData(@RequestParam("id") String id,@RequestParam("num") int num, HttpServletRequest request, HttpServletResponse response) {
         LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
 
         Map<String, Object> map = viewFacade.exFuData(id, num);
@@ -113,7 +113,7 @@ public class ViewController extends BaseController {
             }
             Document doc = null;// 原始word路径
             try {
-                doc = new Document("D:\\经济开发区乡镇涉及妇幼公卫表格(外联部).dotx");
+                doc = new Document("D:\\经济开发区乡镇涉及妇幼公卫表格(外联部)_复诊.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 9b2a7bf..112d68a 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
@@ -257,12 +257,9 @@ public class ViewFacade {
      */
     public Map<String, Object> exFuData(String id, int num) {
         Map<String, Object> map = new HashedMap();
-        Patients patients = patientsService.findOnePatientById("");
-
-
         AntenatalExaminationModel[] exData = new AntenatalExaminationModel[4];
-
         AntenatalExaminationModel antenatalExaminationModel = antExService.findOneById(id);
+        Patients patients = patientsService.findOnePatientById(antenatalExaminationModel.getParentId());
         if (num < 3) {
             exData[num - 1] = antenatalExaminationModel;
         } else {//全部
-- 
1.8.3.1