diff --git a/platform-biz-patient-service/src/main/resources/database.properties b/platform-biz-patient-service/src/main/resources/database.properties index 07ac119..127c58d 100644 --- a/platform-biz-patient-service/src/main/resources/database.properties +++ b/platform-biz-patient-service/src/main/resources/database.properties @@ -11,4 +11,8 @@ mongo.maxWaitTime=2000 mongo.autoConnectRetry=true mongo.socketKeepAlive=true mongo.socketTimeout=2000 -mongo.slaveOk=true \ No newline at end of file +mongo.slaveOk=true + +sequence.index=1 +sequence.create.size=100 +sequence.min.size=1 \ No newline at end of file diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/TrackDownDateEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/TrackDownDateEnums.java index f499c61..31a11aa 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/TrackDownDateEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/TrackDownDateEnums.java @@ -24,7 +24,7 @@ public enum TrackDownDateEnums { } TrackDownDateEnums[] values = TrackDownDateEnums.values(); for (TrackDownDateEnums value : values) { - if (value.getId() == null) { + if (value.getId() == id) { return value.getName(); } } 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 ddbdd83..a3a6146 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 @@ -3,6 +3,9 @@ package com.lyms.platform.operate.web.controller; import com.lyms.platform.common.annotation.TokenRequired; import com.lyms.platform.common.base.BaseController; import com.lyms.platform.common.result.BaseResponse; +import com.lyms.platform.operate.web.facade.TrackDownFacade; +import com.lyms.platform.operate.web.facade.TrackDownJobFacade; +import com.lyms.platform.operate.web.request.TrackDownQueryRequest; import com.lyms.platform.operate.web.service.ITrackDownService; import com.lyms.platform.pojo.TrackDown; import org.springframework.beans.factory.annotation.Autowired; @@ -50,12 +53,12 @@ public class TrackDownController extends BaseController { return trackDownService.add(getUserId(request), trackDown); } - @ResponseBody + /* @ResponseBody @TokenRequired @RequestMapping(method = RequestMethod.GET) public BaseResponse list(String provinceId, String cityId, String areaId, String streetId, String key, @RequestParam Integer trackType, @RequestParam Integer page, @RequestParam Integer limit, HttpServletRequest request) { return trackDownService.list(provinceId, cityId, areaId, streetId, key, trackType, page, limit, getUserId(request)); - } + }*/ @TokenRequired @RequestMapping(value = "/export", method = RequestMethod.GET) @@ -64,9 +67,8 @@ public class TrackDownController extends BaseController { } /** - * * @param parentId - * @param trackType 产考TrackDownDateEnums里面的值 0代表所有 + * @param trackType 产考TrackDownDateEnums里面的值 0代表所有 * @return */ @ResponseBody @@ -76,4 +78,20 @@ public class TrackDownController extends BaseController { return trackDownService.info(parentId, trackType); } + @ResponseBody + @RequestMapping(value = "/run", method = RequestMethod.GET) + public BaseResponse run() { + return downJobFacade.doBatchExecute(1); + } + + @ResponseBody + @TokenRequired + @RequestMapping(method = RequestMethod.GET) + public BaseResponse list(TrackDownQueryRequest downQueryRequest,HttpServletRequest request){ + return downFacade.list(downQueryRequest,getUserId(request)); + } + @Autowired + private TrackDownFacade downFacade; + @Autowired + private TrackDownJobFacade downJobFacade; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java index 6db82ee..31e7db8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java @@ -50,7 +50,7 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS Criteria patientCriteria = new Criteria(); Criteria residentCriteria = new Criteria(); patientCriteria.and("yn").is(1).and("hospitalId").is(hospitalId); - residentCriteria.and("yn").is(1).and("").is(hospitalId); + residentCriteria.and("yn").is(1).and("hospitalId").is(hospitalId); if(buildStart != null && buildEnd != null) { residentCriteria.and("buildDay").gte(buildStart).lt(DateUtil.addDay(buildEnd, 1)); }