jiangjiazhi / regional-platform

Commit 983c551b652abf6b0472960fd1740b0018b57736

Authored by litao over 8 years ago

Exists in master and in 6 other branches

增加医院条件

Showing 3 changed files with 40 additions and 11 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IReportService.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java

1	1	package com.lyms.platform.operate.web.controller;
2	2
3	3	import com.lyms.platform.common.base.BaseController;
4		-import com.lyms.platform.common.base.LoginContext;
5	4	import com.lyms.platform.common.result.BaseObjectResponse;
6	5	import com.lyms.platform.operate.web.service.IReportService;
7	6	import org.springframework.beans.factory.annotation.Autowired;
8	7
...	...	@@ -69,10 +68,13 @@
69	68	* @return
70	69	*/
71	70	@RequestMapping(method = RequestMethod.GET,value = "/checkInfo")
	71	+// @TokenRequired
72	72	@ResponseBody
73	73	public BaseObjectResponse checkInfo(Integer childBirth, String startDate, String endDate, Integer startWeek, Integer endWeek, Integer number,
74		- String name, Integer currentPage, Integer pageSize) {
75		- return reportService.checkInfo(childBirth, startDate, endDate, startWeek, endWeek, number, name, currentPage, pageSize);
	74	+ String name, Integer currentPage, Integer pageSize, HttpServletRequest request) {
	75	+// LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
	76	+// reportService.checkInfo(childBirth, startDate, endDate, startWeek, endWeek, number, name, loginState.getId(), currentPage, pageSize);
	77	+ return reportService.checkInfo(childBirth, startDate, endDate, startWeek, endWeek, number, name, 753, currentPage, pageSize);
76	78	}
77	79
78	80	/**
...	...	@@ -90,9 +92,9 @@
90	92	// @TokenRequired
91	93	public void exportCheckInfo(Integer childBirth, String startDate, String endDate, Integer startWeek, Integer endWeek, Integer number,
92	94	String name, HttpServletRequest request, HttpServletResponse resp) {
93		- LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
94		-// reportService.exportCheckInfo(childBirth, startDate, endDate, startWeek, endWeek, number, name, loginState.getId());
95		- reportService.exportCheckInfo(childBirth, startDate, endDate, startWeek, endWeek, number, name, loginState.getId(), resp);
	95	+// LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
	96	+// reportService.exportCheckInfo(childBirth, startDate, endDate, startWeek, endWeek, number, name, loginState.getId(), resp);
	97	+ reportService.exportCheckInfo(childBirth, startDate, endDate, startWeek, endWeek, number, name, 753, resp);
96	98	}
97	99
98	100

...	...	@@ -41,10 +41,11 @@
41	41	* @param endWeek
42	42	* @param number
43	43	* @param name
	44	+ * @param userId
44	45	* @param currenPage
45		- *@param pageSize @return
	46	+ * @param pageSize @return
46	47	*/
47		- BaseObjectResponse checkInfo(Integer childBirth, String startDate, String endDate, Integer startWeek, Integer endWeek, Integer number, String name, Integer currenPage, Integer pageSize);
	48	+ BaseObjectResponse checkInfo(Integer childBirth, String startDate, String endDate, Integer startWeek, Integer endWeek, Integer number, String name, Integer userId, Integer currenPage, Integer pageSize);
48	49
49	50	/**
50	51	* 导出Excel

...	...	@@ -140,10 +140,11 @@
140	140	}
141	141
142	142	@Override
143		- public BaseObjectResponse checkInfo(Integer childBirth, String startDate, String endDate, Integer startWeek, Integer endWeek, Integer number, String name, Integer currentPage, Integer pageSize) {
	143	+ public BaseObjectResponse checkInfo(Integer childBirth, String startDate, String endDate, Integer startWeek, Integer endWeek, Integer number, String name, Integer userId, Integer currentPage, Integer pageSize) {
144	144	BaseObjectResponse rest = new BaseObjectResponse();
145	145	List<Object> params = new ArrayList<>();
146		- PageResult page = findPage(getCheckInfoSql(childBirth, startDate, endDate, startWeek, endWeek, number, name, params), currentPage, pageSize, params);
	146	+ String hospitalId = autoMatchFacade.getHospitalId(userId);
	147	+ PageResult page = findPage(getCheckInfoSql(childBirth, startDate, endDate, startWeek, endWeek, number, name, hospitalId, params), currentPage, pageSize, params);
147	148	rest.setData(page);
148	149	return rest;
149	150	}
150	151
...	...	@@ -259,7 +260,27 @@
259	260
260	261	@Override
261	262	public void exportCheckInfo(Integer childBirth, String startDate, String endDate, Integer startWeek, Integer endWeek, Integer number, String name, Integer userId, HttpServletResponse resp) {
	263	+ List<Object> params = new ArrayList<>();
	264	+ String hospitalId = autoMatchFacade.getHospitalId(userId);
	265	+ Map<String, String> cnames = new LinkedHashMap<>();
	266	+ cnames.put("id", "#");
	267	+ cnames.put("NAME", "姓名");
	268	+ cnames.put("YUNZHOU", "当前孕周");
	269	+ cnames.put("BENYUAN_NUM", "本院产检次数");
	270	+ cnames.put("TOTAL_NUM", "总产检次数");
	271	+ cnames.put("HIGH_RISK_GRADE", "高危等级");
	272	+ cnames.put("HIGH_RISK_FACTOR", "风险因数");
	273	+ cnames.put("EDD_DATE", "预产期/分娩日期");
	274	+ cnames.put("LAST_EXAMINE_DATE", "最后产检日期");
	275	+ cnames.put("DOCTOR_NAME", "最后产检医生");
262	276
	277	+ List<Map<String,Object>> results = new ArrayList<>();
	278	+ List<Map<String, Object>> list = reportDao.findList(getCheckInfoSql(childBirth, startDate, endDate, startWeek, endWeek, number, name, hospitalId, params), params);
	279	+ for (Map<String, Object> map : list) {
	280	+ results.add(map);
	281	+ }
	282	+
	283	+ ResponseUtil.responseExcel(cnames,results, resp);
263	284	}
264	285
265	286	private String getDoctorInfoSql(String startDate, String endDate, Integer childBirth, Integer number, String name, String hospitalId, List<Object> params) {
...	...	@@ -516,7 +537,7 @@
516	537	return sql.toString();
517	538	}
518	539
519		- private String getCheckInfoSql(Integer childBirth, String startDate, String endDate, Integer startWeek, Integer endWeek, Integer number, String name, List<Object> params) {
	540	+ private String getCheckInfoSql(Integer childBirth, String startDate, String endDate, Integer startWeek, Integer endWeek, Integer number, String name, String hospitalId, List<Object> params) {
520	541	StringBuilder sql = new StringBuilder();
521	542	sql.append("SELECT A.NAME, ")
522	543	.append("(CASE WHEN A.IS_CHILDBIRTH=3 THEN '已分娩' ELSE (CASE WHEN A.NOW_WEEKS_DAY<>0 THEN '孕'\|\|A.NOW_WEEKS\|\|'周+'\|\|A.NOW_WEEKS_DAY\|\|'天' ELSE '孕'\|\|A.NOW_WEEKS\|\|'周' END) END) AS YUNZHOU, ")
...	...	@@ -538,6 +559,11 @@
538	559	if(childBirth != null) {
539	560	sql.append("AND A.IS_CHILDBIRTH = ? ");
540	561	params.add(childBirth);
	562	+ }
	563	+
	564	+ if(StringUtils.isNotBlank(hospitalId)) {
	565	+ sql.append("AND C.YCY_STSTEM_ID = ? ");
	566	+ params.add(hospitalId);
541	567	}
542	568
543	569	if(startDate != null && endDate != null) {