jiangjiazhi / regional-platform

Commit f2577c3e7dc67bf1932b2ee5700f59407e9abba9

Authored by yangfei over 7 years ago

Exists in master and in 6 other branches

手动执行自动任务

Showing 2 changed files with 32 additions and 13 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TrackDownController.java

...	...	@@ -288,7 +288,7 @@
288	288	handSieveTrack();
289	289
290	290	//开始处理产检、产筛追访数据进入分娩追访，由于数据量比较大暂时关闭，后期进行分页处理
291		- // patientAutoFm();
	291	+ patientAutoFm();
292	292
293	293	//自动流转产后复查转出或产后访视转出
294	294	trackAutoFlow();
...	...	@@ -341,7 +341,7 @@
341	341	TrackDownRecordQuery downRecordQuery = new TrackDownRecordQuery();
342	342	downRecordQuery.setTrackTypes(Arrays.asList(TrackDownDateEnums.C.getId(), TrackDownDateEnums.D.getId(), TrackDownDateEnums.H.getId(), TrackDownDateEnums.I.getId()));
343	343	List<TrackDownRecord> records = trackDownRecordService.queryTrackDown(downRecordQuery);
344		- System.out.println("开始处理产检、产筛追访数据进入分娩追访:" + records.size());
	344	+ System.out.println("开始处理产检、产筛追访数据进入产后复查追访:" + records.size());
345	345	for (TrackDownRecord tr : records) {
346	346	Patients patients = iPatientDao.getPatient(tr.getParentId());
347	347	if (patients != null && patients.getType() == 3) {//产妇

1	1	package com.lyms.platform.operate.web.controller;
2	2
	3	+import com.lyms.platform.biz.service.PatientsService;
3	4	import com.lyms.platform.common.annotation.TokenRequired;
4	5	import com.lyms.platform.common.base.BaseController;
5	6	import com.lyms.platform.common.result.BaseResponse;
6	7
7	8
...	...	@@ -29,17 +30,21 @@
29	30	private TrackDownFacade downFacade;
30	31	@Autowired
31	32	private TrackDownJobFacade downJobFacade;
	33	+ @Autowired
	34	+ private PatientsService patientsService;
32	35
33	36	@ResponseBody
34	37	@TokenRequired
35	38	@RequestMapping(value = "/mother/{parentId}/{trackType}", method = RequestMethod.GET)
36	39	public BaseResponse mother(@PathVariable String parentId, HttpServletRequest request, @PathVariable Integer trackType) {
37	40	// return trackDownService.mother(parentId, getUserId(request));
38		- return downFacade.mother(parentId,trackType,getUserId(request));
	41	+ return downFacade.mother(parentId, trackType, getUserId(request));
39	42	}
40	43
41	44
42		- /** 追访概况查看追访详情
	45	+ /**
	46	+ * 追访概况查看追访详情
	47	+ *
43	48	* @param parentId
44	49	* @param trackType 产考TrackDownDateEnums里面的值 0代表所有
45	50	* @return
46	51
...	...	@@ -48,10 +53,12 @@
48	53	@RequestMapping(value = "/{parentId}/{trackType}/{buildType}", method = RequestMethod.GET)
49	54	@TokenRequired
50	55	public BaseResponse info(@PathVariable String parentId, @PathVariable Integer trackType, @PathVariable Integer buildType) {
51		- return trackDownService.info(parentId, trackType,buildType);
	56	+ return trackDownService.info(parentId, trackType, buildType);
52	57	}
53	58
54		- /** 其他追访模块查看追访详情
	59	+ /**
	60	+ * 其他追访模块查看追访详情
	61	+ *
55	62	* @param parentId
56	63	* @param trackType 产考TrackDownDateEnums里面的值 0代表所有
57	64	* @return
...	...	@@ -60,7 +67,7 @@
60	67	@RequestMapping(value = "/{parentId}/{trackType}", method = RequestMethod.GET)
61	68	@TokenRequired
62	69	public BaseResponse info(@PathVariable String parentId, @PathVariable Integer trackType) {
63		- return trackDownService.info(parentId, trackType,0);
	70	+ return trackDownService.info(parentId, trackType, 0);
64	71	}
65	72
66	73	@ResponseBody
67	74
...	...	@@ -71,13 +78,14 @@
71	78
72	79	/**
73	80	* 获取追访概况数据
	81	+ *
74	82	* @return
75	83	*/
76	84	@ResponseBody
77	85	@TokenRequired
78	86	@RequestMapping(value = "/all", method = RequestMethod.GET)
79		- public BaseResponse all(Date buildStart, Date buildEnd, Date checkStart, Date checkEnd, Date fmStart, Date fmEnd, String key,Integer type, @RequestParam Integer page, @RequestParam Integer limit, HttpServletRequest request) {
80		- return trackDownService.all(buildStart, buildEnd, checkStart, checkEnd, fmStart, fmEnd, key, page, limit, getUserId(request),type);
	87	+ public BaseResponse all(Date buildStart, Date buildEnd, Date checkStart, Date checkEnd, Date fmStart, Date fmEnd, String key, Integer type, @RequestParam Integer page, @RequestParam Integer limit, HttpServletRequest request) {
	88	+ return trackDownService.all(buildStart, buildEnd, checkStart, checkEnd, fmStart, fmEnd, key, page, limit, getUserId(request), type);
81	89	}
82	90
83	91	@ResponseBody
84	92
...	...	@@ -89,9 +97,9 @@
89	97
90	98	@TokenRequired
91	99	@RequestMapping(value = "/export", method = RequestMethod.GET)
92		- public void export(TrackDownQueryRequest downQueryRequest,HttpServletRequest request, HttpServletResponse response) {
	100	+ public void export(TrackDownQueryRequest downQueryRequest, HttpServletRequest request, HttpServletResponse response) {
93	101	// trackDownService.export(provinceId, cityId, areaId, streetId, key, trackType, getUserId(request), response);
94		- downFacade.export(downQueryRequest,getUserId(request),response);
	102	+ downFacade.export(downQueryRequest, getUserId(request), response);
95	103	}
96	104
97	105
98	106
99	107
...	...	@@ -101,11 +109,22 @@
101	109	return downJobFacade.doBatchExecute(1);
102	110	}
103	111
	112	+ /**
	113	+ * 手动执行自动任务
	114	+ * @return
	115	+ */
104	116	@ResponseBody
	117	+ @RequestMapping(value = "/dandleAutoReachDue", method = RequestMethod.GET)
	118	+ public BaseResponse dandleAutoReachDue() {
	119	+ patientsService.dandleAutoReachDue();
	120	+ return new BaseResponse();
	121	+ }
	122	+
	123	+ @ResponseBody
105	124	@TokenRequired
106	125	@RequestMapping(method = RequestMethod.GET)
107		- public BaseResponse list(TrackDownQueryRequest downQueryRequest,HttpServletRequest request){
108		- return downFacade.list(downQueryRequest,getUserId(request));
	126	+ public BaseResponse list(TrackDownQueryRequest downQueryRequest, HttpServletRequest request) {
	127	+ return downFacade.list(downQueryRequest, getUserId(request));
109	128	}
110	129
111	130	}