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 23ca69c..c7c9b19 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 @@ -39,8 +39,8 @@ public class TrackDownController extends BaseController { @ResponseBody @TokenRequired @RequestMapping(method = RequestMethod.GET) - public BaseResponse list(String provinceId, String cityId, String areaId, String streetId, @RequestParam Integer trackType, @RequestParam Integer page, @RequestParam Integer limit, HttpServletRequest request) { - return trackDownService.list(provinceId, cityId, areaId, streetId, trackType, page, limit, getUserId(request)); + 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)); } @ResponseBody diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITrackDownService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITrackDownService.java index 442516d..46e2722 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITrackDownService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITrackDownService.java @@ -9,7 +9,7 @@ public interface ITrackDownService extends IBaseService { BaseResponse add(Integer userId, TrackDown trackDown); - BaseResponse list(String provinceId, String cityId, String areaId, String streetId, Integer trackType, Integer page, Integer limit, Integer userId); + BaseResponse list(String provinceId, String cityId, String areaId, String streetId, String key, Integer trackType, Integer page, Integer limit, Integer userId); BaseResponse all(Date buildStart, Date buildEnd, Date checkStart, Date checkEnd, Date fmStart, Date fmEnd, String key, Integer page, Integer limit, Integer userId); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java index dcd3df7..b8d4fac 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java @@ -327,7 +327,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService if(flag) { for (Map dateMap : range) { if(patient.getBookbuildingDate().getTime() >= dateMap.get("start").getTime() - && patient.getBookbuildingDate().getTime() < dateMap.get("end").getTime()) { + && patient.getBookbuildingDate().getTime() <= dateMap.get("end").getTime()) { String monthKey = DateUtil.getyyyy_mm(dateMap.get("cname")); Map info = new HashMap<>(); Set hids = new HashSet<>(); 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 ed6ed58..980c0b2 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 @@ -187,7 +187,7 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS } @Override - public BaseResponse list(String provinceId, String cityId, String areaId, String streetId, Integer trackType, Integer page, Integer limit, Integer userId) { + public BaseResponse list(String provinceId, String cityId, String areaId, String streetId, String key, Integer trackType, Integer page, Integer limit, Integer userId) { PageResult pageResult = new PageResult(); List> restList = new ArrayList<>(); Criteria criteria = new Criteria();