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 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 exFuData(String id, int num) { Map 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 {//全部