jiangjiazhi / regional-platform

Commit b1a376cd9cb8b0267269beb4ef0075c52107eabb

Authored by dongqin over 6 years ago

Exists in master and in 6 other branches

修复bug

Showing 3 changed files with 52 additions and 9 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/model/ServiceListQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AreaCountController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java

1	1	package com.lyms.platform.permission.model;
2	2
3	3	import com.lyms.platform.common.dao.BaseQuery;
	4	+import org.springframework.format.annotation.DateTimeFormat;
4	5
5	6	import java.util.Date;
6	7	import java.util.List;

...	...	@@ -5,6 +5,7 @@
5	5	import com.lyms.platform.common.base.LoginContext;
6	6	import com.lyms.platform.common.constants.ErrorCodeConstants;
7	7	import com.lyms.platform.common.result.BaseResponse;
	8	+import com.lyms.platform.common.utils.DateUtil;
8	9	import com.lyms.platform.operate.web.facade.AreaCountFacade;
9	10	import com.lyms.platform.operate.web.request.HealthManagerListRequest;
10	11	import com.lyms.platform.permission.model.ServiceListQuery;
...	...	@@ -17,6 +18,7 @@
17	18	import javax.servlet.http.HttpServletRequest;
18	19	import javax.servlet.http.HttpServletResponse;
19	20	import javax.validation.Valid;
	21	+import java.util.Date;
20	22
21	23	/**
22	24	*
...	...	@@ -202,6 +204,7 @@
202	204	public BaseResponse getServiceList(@RequestBody @Valid ServiceListQuery query, HttpServletRequest request){
203	205	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
204	206	query.setUserId(loginState.getId());
	207	+ checkDate(query);
205	208	try {
206	209	return areaCountFacade.getServiceList(query);
207	210	}catch (Exception e){
...	...	@@ -224,6 +227,7 @@
224	227	public BaseResponse getServiceDetailList(@RequestBody @Valid ServiceListQuery param, HttpServletRequest request){
225	228	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
226	229	param.setUserId(loginState.getId());
	230	+ checkDate(param);
227	231	try {
228	232	return areaCountFacade.getServiceDetailList(param);
229	233	}catch (Exception e){
...	...	@@ -245,6 +249,7 @@
245	249	public void getServiceDetailExport(ServiceListQuery param, HttpServletRequest request, HttpServletResponse response){
246	250	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
247	251	param.setUserId(loginState.getId());
	252	+ checkDate(param);
248	253	try {
249	254	areaCountFacade.getServiceDetailExport(param, response);
250	255	}catch (Exception e){
...	...	@@ -263,6 +268,7 @@
263	268	public BaseResponse healthManagerList(@RequestBody @Valid HealthManagerListRequest query, HttpServletRequest request){
264	269	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
265	270	query.setUserId(loginState.getId());
	271	+ checkDate(query);
266	272	try {
267	273	return areaCountFacade.healthManagerList(query);
268	274	}catch (Exception e){
...	...	@@ -285,6 +291,7 @@
285	291	public BaseResponse healthManagerDetailList(@RequestBody @Valid HealthManagerListRequest query, HttpServletRequest request){
286	292	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
287	293	query.setUserId(loginState.getId());
	294	+ checkDate(query);
288	295	try {
289	296	return areaCountFacade.healthManagerDetailList(query);
290	297	}catch (Exception e){
291	298
...	...	@@ -307,10 +314,38 @@
307	314	public void healthManagerDetailExport(HealthManagerListRequest param, HttpServletRequest request, HttpServletResponse response){
308	315	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
309	316	param.setUserId(loginState.getId());
	317	+ checkDate(param);
310	318	try {
311	319	areaCountFacade.healthManagerDetailExport(param, response);
312	320	}catch (Exception e){
313	321	logger.error("增值服务统计导出失败", e);
	322	+ }
	323	+ }
	324	+
	325	+ /**
	326	+ * 时区
	327	+ *
	328	+ * @param object
	329	+ */
	330	+ private void checkDate(Object object) {
	331	+
	332	+ if (object instanceof ServiceListQuery){
	333	+ ServiceListQuery param = (com.lyms.platform.permission.model.ServiceListQuery) object;
	334	+ Date startTime = param.getStartTime();
	335	+ Date endTime = param.getEndTime();
	336	+ if (startTime != null && endTime != null){
	337	+ param.setStartTime(new Date(startTime.getTime() - 28800000));
	338	+ param.setEndTime(new Date(endTime.getTime() - 28800000));
	339	+ }
	340	+ }
	341	+ if (object instanceof HealthManagerListRequest){
	342	+ HealthManagerListRequest param = (HealthManagerListRequest) object;
	343	+ Date startTime = param.getStartTime();
	344	+ Date endTime = param.getEndTime();
	345	+ if (startTime != null && endTime != null){
	346	+ param.setStartTime(new Date(startTime.getTime() - 28800000));
	347	+ param.setEndTime(new Date(endTime.getTime() - 28800000));
	348	+ }
314	349	}
315	350	}
316	351

...	...	@@ -1315,25 +1315,27 @@
1315	1315	String str = "";
1316	1316	switch (serType){
1317	1317	case "1" :
1318		- str = "孕期精准医疗";
	1318	+ //str = "孕期精准医疗";
	1319	+ str = "精准医疗服务";
1319	1320	break;
1320	1321	case "2" :
1321		- str = "体重管理";
	1322	+ str = "体重管理服务";
1322	1323	break;
1323	1324	case "3" :
1324		- str = "血糖管理";
	1325	+ str = "血糖管理服务";
1325	1326	break;
1326	1327	case "4" :
1327		- str = "血压管理";
	1328	+ str = "血压管理服务";
1328	1329	break;
1329	1330	case "5" :
1330		- str = "专家咨询";
	1331	+ str = "专家咨询服务";
1331	1332	break;
1332	1333	case "6" :
1333		- str = "标准服务";
	1334	+ //str = "标准服务";
	1335	+ str = "围产小助理";
1334	1336	break;
1335	1337	case "7" :
1336		- str = "体温管理";
	1338	+ str = "体温管理服务";
1337	1339	break;
1338	1340	case "8" :
1339	1341	str = "";
1340	1342
...	...	@@ -1342,10 +1344,10 @@
1342	1344	str = "";
1343	1345	break;
1344	1346	case "10" :
1345		- str = "精准指导";
	1347	+ str = "儿保小助理服务";
1346	1348	break;
1347	1349	case "11" :
1348		- str = "标准服务";
	1350	+ str = "精准指导服务";
1349	1351	break;
1350	1352	default:
1351	1353	str = "";
...	...	@@ -1807,6 +1809,11 @@
1807	1809	}
1808	1810	}
1809	1811	return healthTypeName;
	1812	+ }
	1813	+
	1814	+ public static void main(String[] args) {
	1815	+ Date date = new Date(1554048000000L);
	1816	+ System.out.println(DateUtil.getyyyy_MM_dd(date));
1810	1817	}
1811	1818	}