jiangjiazhi / regional-platform

Commit c2a0646fc1f1504652a54acd5f30f2387d05406f

Authored by jiangjiazhi over 7 years ago

Exists in master and in 6 other branches

1

Showing 4 changed files with 29 additions and 7 deletions

platform-biz-patient-service/src/main/resources/database.properties
platform-common/src/main/java/com/lyms/platform/common/enums/TrackDownDateEnums.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TrackDownController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java

...	...	@@ -12,4 +12,8 @@
12	12	mongo.socketKeepAlive=true
13	13	mongo.socketTimeout=2000
14	14	mongo.slaveOk=true
	15	+
	16	+sequence.index=1
	17	+sequence.create.size=100
	18	+sequence.min.size=1

...	...	@@ -24,7 +24,7 @@
24	24	}
25	25	TrackDownDateEnums[] values = TrackDownDateEnums.values();
26	26	for (TrackDownDateEnums value : values) {
27		- if (value.getId() == null) {
	27	+ if (value.getId() == id) {
28	28	return value.getName();
29	29	}
30	30	}

...	...	@@ -3,6 +3,9 @@
3	3	import com.lyms.platform.common.annotation.TokenRequired;
4	4	import com.lyms.platform.common.base.BaseController;
5	5	import com.lyms.platform.common.result.BaseResponse;
	6	+import com.lyms.platform.operate.web.facade.TrackDownFacade;
	7	+import com.lyms.platform.operate.web.facade.TrackDownJobFacade;
	8	+import com.lyms.platform.operate.web.request.TrackDownQueryRequest;
6	9	import com.lyms.platform.operate.web.service.ITrackDownService;
7	10	import com.lyms.platform.pojo.TrackDown;
8	11	import org.springframework.beans.factory.annotation.Autowired;
9	12
...	...	@@ -50,12 +53,12 @@
50	53	return trackDownService.add(getUserId(request), trackDown);
51	54	}
52	55
53		- @ResponseBody
	56	+ /* @ResponseBody
54	57	@TokenRequired
55	58	@RequestMapping(method = RequestMethod.GET)
56	59	public BaseResponse list(String provinceId, String cityId, String areaId, String streetId, String key, @RequestParam Integer trackType, @RequestParam Integer page, @RequestParam Integer limit, HttpServletRequest request) {
57	60	return trackDownService.list(provinceId, cityId, areaId, streetId, key, trackType, page, limit, getUserId(request));
58		- }
	61	+ }*/
59	62
60	63	@TokenRequired
61	64	@RequestMapping(value = "/export", method = RequestMethod.GET)
62	65
...	...	@@ -64,9 +67,8 @@
64	67	}
65	68
66	69	/**
67		- *
68	70	* @param parentId
69		- * @param trackType 产考TrackDownDateEnums里面的值 0代表所有
	71	+ * @param trackType 产考TrackDownDateEnums里面的值 0代表所有
70	72	* @return
71	73	*/
72	74	@ResponseBody
...	...	@@ -76,5 +78,21 @@
76	78	return trackDownService.info(parentId, trackType);
77	79	}
78	80
	81	+ @ResponseBody
	82	+ @RequestMapping(value = "/run", method = RequestMethod.GET)
	83	+ public BaseResponse run() {
	84	+ return downJobFacade.doBatchExecute(1);
	85	+ }
	86	+
	87	+ @ResponseBody
	88	+ @TokenRequired
	89	+ @RequestMapping(method = RequestMethod.GET)
	90	+ public BaseResponse list(TrackDownQueryRequest downQueryRequest,HttpServletRequest request){
	91	+ return downFacade.list(downQueryRequest,getUserId(request));
	92	+ }
	93	+ @Autowired
	94	+ private TrackDownFacade downFacade;
	95	+ @Autowired
	96	+ private TrackDownJobFacade downJobFacade;
79	97	}

...	...	@@ -50,7 +50,7 @@
50	50	Criteria patientCriteria = new Criteria();
51	51	Criteria residentCriteria = new Criteria();
52	52	patientCriteria.and("yn").is(1).and("hospitalId").is(hospitalId);
53		- residentCriteria.and("yn").is(1).and("").is(hospitalId);
	53	+ residentCriteria.and("yn").is(1).and("hospitalId").is(hospitalId);
54	54	if(buildStart != null && buildEnd != null) {
55	55	residentCriteria.and("buildDay").gte(buildStart).lt(DateUtil.addDay(buildEnd, 1));
56	56	}