jiangjiazhi / regional-platform

Authored by yangfei about 8 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 4 additions and 7 deletions

...	...	@@ -75,7 +75,7 @@
75	75	}
76	76	Document doc = null;// 原始word路径
77	77	try {
78		- doc = new Document("D:\\经济开发区乡镇涉及妇幼公卫表格(外联部).dotx");
	78	+ doc = new Document("D:\\经济开发区乡镇涉及妇幼公卫表格(外联部)_初诊.dotx");
79	79	specialData(doc, map);//特殊数据
80	80	markData(doc, map);//普通数据
81	81	sendToBrowser(doc, "导出", "doc", true, response);
...	...	@@ -97,7 +97,7 @@
97	97	*/
98	98	@RequestMapping(value = "/downExFuData", method = RequestMethod.GET)
99	99	// @TokenRequired
100		- public void downExFuData(@RequestParam("id") String id,int num, HttpServletRequest request, HttpServletResponse response) {
	100	+ public void downExFuData(@RequestParam("id") String id,@RequestParam("num") int num, HttpServletRequest request, HttpServletResponse response) {
101	101	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
102	102
103	103	Map<String, Object> map = viewFacade.exFuData(id, num);
...	...	@@ -113,7 +113,7 @@
113	113	}
114	114	Document doc = null;// 原始word路径
115	115	try {
116		- doc = new Document("D:\\经济开发区乡镇涉及妇幼公卫表格(外联部).dotx");
	116	+ doc = new Document("D:\\经济开发区乡镇涉及妇幼公卫表格(外联部)_复诊.dotx");
117	117	specialData(doc, map);//特殊数据
118	118	markData(doc, map);//普通数据
119	119	sendToBrowser(doc, "导出", "doc", true, response);

...	...	@@ -257,12 +257,9 @@
257	257	*/
258	258	public Map<String, Object> exFuData(String id, int num) {
259	259	Map<String, Object> map = new HashedMap();
260		- Patients patients = patientsService.findOnePatientById("");
261		-
262		-
263	260	AntenatalExaminationModel[] exData = new AntenatalExaminationModel[4];
264		-
265	261	AntenatalExaminationModel antenatalExaminationModel = antExService.findOneById(id);
	262	+ Patients patients = patientsService.findOnePatientById(antenatalExaminationModel.getParentId());
266	263	if (num < 3) {
267	264	exData[num - 1] = antenatalExaminationModel;
268	265	} else {//全部