From f2577c3e7dc67bf1932b2ee5700f59407e9abba9 Mon Sep 17 00:00:00 2001 From: yangfei Date: Tue, 5 Jun 2018 00:19:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E5=8A=A8=E6=89=A7=E8=A1=8C=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/biz/service/PatientsService.java | 4 +-- .../web/controller/TrackDownController.java | 41 ++++++++++++++++------ 2 files changed, 32 insertions(+), 13 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java index 6bc3bc4..54d3993 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java @@ -288,7 +288,7 @@ public class PatientsService { handSieveTrack(); //开始处理产检、产筛追访数据进入分娩追访，由于数据量比较大暂时关闭，后期进行分页处理 - // patientAutoFm(); + patientAutoFm(); //自动流转产后复查转出或产后访视转出 trackAutoFlow(); @@ -341,7 +341,7 @@ public class PatientsService { TrackDownRecordQuery downRecordQuery = new TrackDownRecordQuery(); downRecordQuery.setTrackTypes(Arrays.asList(TrackDownDateEnums.C.getId(), TrackDownDateEnums.D.getId(), TrackDownDateEnums.H.getId(), TrackDownDateEnums.I.getId())); List records = trackDownRecordService.queryTrackDown(downRecordQuery); - System.out.println("开始处理产检、产筛追访数据进入分娩追访:" + records.size()); + System.out.println("开始处理产检、产筛追访数据进入产后复查追访:" + records.size()); for (TrackDownRecord tr : records) { Patients patients = iPatientDao.getPatient(tr.getParentId()); if (patients != null && patients.getType() == 3) {//产妇 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TrackDownController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TrackDownController.java index 1ef8b92..06aed45 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TrackDownController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TrackDownController.java @@ -1,5 +1,6 @@ package com.lyms.platform.operate.web.controller; +import com.lyms.platform.biz.service.PatientsService; import com.lyms.platform.common.annotation.TokenRequired; import com.lyms.platform.common.base.BaseController; import com.lyms.platform.common.result.BaseResponse; @@ -29,17 +30,21 @@ public class TrackDownController extends BaseController { private TrackDownFacade downFacade; @Autowired private TrackDownJobFacade downJobFacade; + @Autowired + private PatientsService patientsService; @ResponseBody @TokenRequired @RequestMapping(value = "/mother/{parentId}/{trackType}", method = RequestMethod.GET) public BaseResponse mother(@PathVariable String parentId, HttpServletRequest request, @PathVariable Integer trackType) { // return trackDownService.mother(parentId, getUserId(request)); - return downFacade.mother(parentId,trackType,getUserId(request)); + return downFacade.mother(parentId, trackType, getUserId(request)); } - /** 追访概况查看追访详情 + /** + * 追访概况查看追访详情 + * * @param parentId * @param trackType 产考TrackDownDateEnums里面的值 0代表所有 * @return @@ -48,10 +53,12 @@ public class TrackDownController extends BaseController { @RequestMapping(value = "/{parentId}/{trackType}/{buildType}", method = RequestMethod.GET) @TokenRequired public BaseResponse info(@PathVariable String parentId, @PathVariable Integer trackType, @PathVariable Integer buildType) { - return trackDownService.info(parentId, trackType,buildType); + return trackDownService.info(parentId, trackType, buildType); } - /** 其他追访模块查看追访详情 + /** + * 其他追访模块查看追访详情 + * * @param parentId * @param trackType 产考TrackDownDateEnums里面的值 0代表所有 * @return @@ -60,7 +67,7 @@ public class TrackDownController extends BaseController { @RequestMapping(value = "/{parentId}/{trackType}", method = RequestMethod.GET) @TokenRequired public BaseResponse info(@PathVariable String parentId, @PathVariable Integer trackType) { - return trackDownService.info(parentId, trackType,0); + return trackDownService.info(parentId, trackType, 0); } @ResponseBody @@ -71,13 +78,14 @@ public class TrackDownController extends BaseController { /** * 获取追访概况数据 + * * @return */ @ResponseBody @TokenRequired @RequestMapping(value = "/all", method = RequestMethod.GET) - 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) { - return trackDownService.all(buildStart, buildEnd, checkStart, checkEnd, fmStart, fmEnd, key, page, limit, getUserId(request),type); + 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) { + return trackDownService.all(buildStart, buildEnd, checkStart, checkEnd, fmStart, fmEnd, key, page, limit, getUserId(request), type); } @ResponseBody @@ -89,9 +97,9 @@ public class TrackDownController extends BaseController { @TokenRequired @RequestMapping(value = "/export", method = RequestMethod.GET) - public void export(TrackDownQueryRequest downQueryRequest,HttpServletRequest request, HttpServletResponse response) { + public void export(TrackDownQueryRequest downQueryRequest, HttpServletRequest request, HttpServletResponse response) { // trackDownService.export(provinceId, cityId, areaId, streetId, key, trackType, getUserId(request), response); - downFacade.export(downQueryRequest,getUserId(request),response); + downFacade.export(downQueryRequest, getUserId(request), response); } @@ -101,11 +109,22 @@ public class TrackDownController extends BaseController { return downJobFacade.doBatchExecute(1); } + /** + * 手动执行自动任务 + * @return + */ + @ResponseBody + @RequestMapping(value = "/dandleAutoReachDue", method = RequestMethod.GET) + public BaseResponse dandleAutoReachDue() { + patientsService.dandleAutoReachDue(); + return new BaseResponse(); + } + @ResponseBody @TokenRequired @RequestMapping(method = RequestMethod.GET) - public BaseResponse list(TrackDownQueryRequest downQueryRequest,HttpServletRequest request){ - return downFacade.list(downQueryRequest,getUserId(request)); + public BaseResponse list(TrackDownQueryRequest downQueryRequest, HttpServletRequest request) { + return downFacade.list(downQueryRequest, getUserId(request)); } } -- 1.8.3.1