jiangjiazhi / regional-platform

Commit 8f0a2c0c7eb154af3227b6fc5b8699598930e0c6

Authored by liquanyu over 6 years ago

Exists in master and in 6 other branches

产筛统计报表

Showing 3 changed files with 43 additions and 6 deletions

platform-operate-api/src/main/java/com/lyms/hospitalapi/rcfy/RcGlxtService.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java

...	...	@@ -87,6 +87,7 @@
87	87	hospitalsMap.put("2100001785","371082007011");//荣成市人民医院
88	88	// hospitalsMap.put("216","216");//测试用的秦皇岛医院
89	89	hospitalsMap.put("2100001818","371082006011");//荣成市石岛人民医院
	90	+ hospitalsMap.put("2100001773","371082006011");//荣成市石岛人民医院
90	91	hospitalsMap.put("2100001772","371082007001");//荣成市中医院
91	92	hospitalsMap.put("2100001750","371082000011");//荣成市妇幼保健院
92	93
...	...	@@ -331,7 +332,7 @@
331	332	}
332	333	}
333	334	ps.setString(12, status);
334		- ps.setString(13, CommonsHelper.getHospitalName(model.getHospitalId(), organizationService));
	335	+ ps.setString(13, hospitalsMap.get(model.getHospitalId()));
335	336	ps.setString(14, StringUtils.isNum(model.getCheckDoctor()) ? CommonsHelper.getUserName(model.getCheckDoctor(), usersService) : model.getCheckDoctor());
336	337	ps.setString(15, StringUtils.isNum(model.getBuildDoctor()) ? CommonsHelper.getUserName(model.getBuildDoctor(), usersService) : model.getBuildDoctor());
337	338	ps.setTimestamp(16, model.getBuildTime()== null ? new Timestamp(model.getCreated().getTime()) : new Timestamp(model.getBuildTime().getTime()));
...	...	@@ -393,7 +394,7 @@
393	394	}
394	395	}
395	396	ps.setString(12, status);
396		- ps.setString(13, CommonsHelper.getHospitalName(model.getHospitalId(), organizationService));
	397	+ ps.setString(13, hospitalsMap.get(model.getHospitalId()));
397	398	ps.setString(14, StringUtils.isNum(model.getCheckDoctor()) ? CommonsHelper.getUserName(model.getCheckDoctor(), usersService) : model.getCheckDoctor());
398	399	ps.setString(15, StringUtils.isNum(model.getBuildDoctor()) ? CommonsHelper.getUserName(model.getBuildDoctor(), usersService) : model.getBuildDoctor());
399	400	ps.setTimestamp(16, model.getBuildTime()== null ? new Timestamp(model.getCreated().getTime()) : new Timestamp(model.getBuildTime().getTime()));

...	...	@@ -7,10 +7,21 @@
7	7	import com.lyms.platform.common.enums.*;
8	8	import com.lyms.platform.common.result.BaseObjectResponse;
9	9	import com.lyms.platform.common.result.BaseResponse;
	10	+import com.lyms.platform.common.utils.ExcelUtil;
	11	+import com.lyms.platform.common.utils.ExceptionUtils;
10	12	import com.lyms.platform.operate.web.facade.SieveFacade;
11	13	import com.lyms.platform.operate.web.request.ChanQianDiaAddRequest;
	14	+import com.lyms.platform.operate.web.request.ChildbirthManagerRequest;
12	15	import com.lyms.platform.operate.web.request.CqSieveQueryRequest;
13	16	import com.lyms.platform.operate.web.request.SieveAddRequest;
	17	+import com.lyms.platform.operate.web.result.ChildbirthManagerQueryModel;
	18	+import com.lyms.platform.operate.web.result.HighScoreResult;
	19	+import com.lyms.platform.operate.web.utils.CollectionUtils;
	20	+import com.lyms.platform.operate.web.utils.CommonsHelper;
	21	+import com.lyms.platform.pojo.AntExChuModel;
	22	+import com.lyms.platform.pojo.Patients;
	23	+import com.lyms.platform.query.AntExChuQuery;
	24	+import org.apache.commons.lang.StringUtils;
14	25	import org.springframework.beans.factory.annotation.Autowired;
15	26	import org.springframework.stereotype.Controller;
16	27	import org.springframework.web.bind.annotation.*;
...	...	@@ -18,10 +29,7 @@
18	29	import javax.servlet.http.HttpServletRequest;
19	30	import javax.servlet.http.HttpServletResponse;
20	31	import javax.validation.Valid;
21		-import java.util.ArrayList;
22		-import java.util.HashMap;
23		-import java.util.List;
24		-import java.util.Map;
	32	+import java.util.*;
25	33
26	34	/**
27	35	* 产筛接口
...	...	@@ -287,6 +295,20 @@
287	295	public BaseResponse queryCqsievesReport(@Valid CqSieveQueryRequest cqSieveQueryRequest,HttpServletRequest request,HttpServletResponse response){
288	296	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
289	297	return sieveFacade.queryCqsievesReport(cqSieveQueryRequest, loginState.getId());
	298	+ }
	299	+
	300	+ /**
	301	+ * 导出威海市孕妇产前筛查和诊断情况月报表
	302	+ * @param cqSieveQueryRequest
	303	+ * @param request
	304	+ * @param response
	305	+ */
	306	+ @TokenRequired
	307	+ @RequestMapping(value = "exportSieveReportExcl", method = RequestMethod.POST)
	308	+ public void exportSieveReportExcl(@Valid CqSieveQueryRequest cqSieveQueryRequest,HttpServletRequest request,HttpServletResponse response) {
	309	+
	310	+ sieveFacade.exportSieveReportExcl(cqSieveQueryRequest, getUserId(request), response);
	311	+
290	312	}
291	313
292	314	}

...	...	@@ -1327,5 +1327,19 @@
1327	1327
1328	1328	@Autowired
1329	1329	private AreaCountFacade areaCountFacade;
	1330	+
	1331	+ public void exportSieveReportExcl(CqSieveQueryRequest cqSieveQueryRequest, Integer userId,HttpServletResponse response) {
	1332	+
	1333	+// try {
	1334	+//
	1335	+// response.setContentType("application/force-download");
	1336	+// response.setHeader("Content-Disposition", "attachment;filename=" + new String(("威海市孕妇产前筛查和诊断情况月报表.xls").getBytes("UTF-8"), "ISO-8859-1"));
	1337	+// String path = this.getClass().getResource("/").getPath()+ "whfy_sieve.xls";
	1338	+// ExcelUtil.writeWhExclFile(path, response.getOutputStream(), list);
	1339	+//
	1340	+// } catch (Exception e) {
	1341	+// ExceptionUtils.catchException(e, "fmRecordExportExcl异常");
	1342	+// }
	1343	+ }
1330	1344	}