diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/pihController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/pihController.java index e34ec60..3d8ec9d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/pihController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/pihController.java @@ -36,8 +36,8 @@ public class pihController extends BaseController { @RequestMapping(value = "/query", method = RequestMethod.GET) @ResponseBody @TokenRequired - public BaseResponse queryAllPih(String key, Integer age, Integer weekEnd, Integer weekStart, String type, String no, Integer page, Integer limit, HttpServletRequest request) { - return pihService.queyAll(key, weekStart, weekEnd, age, type, no, page, limit, getUserId(request)); + public BaseResponse queryAllPih(String key, Integer age, Integer weekEnd, Integer weekStart, String type, Integer page, Integer limit, HttpServletRequest request) { + return pihService.queyAll(key, weekStart, weekEnd, age, type, page, limit, getUserId(request)); } @ResponseBody diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/PihService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/PihService.java index 9c3ba94..31a9de9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/PihService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/PihService.java @@ -8,6 +8,6 @@ public interface PihService { public BaseResponse queryInfo(String cardNo); - public BaseResponse queyAll(String key, Integer weekStart, Integer weekEnd, Integer age, String type, String no, Integer page, Integer limit, Integer userId); + public BaseResponse queyAll(String key, Integer weekStart, Integer weekEnd, Integer age, String type, Integer page, Integer limit, Integer userId); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PihServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PihServiceImpl.java index bd7f29c..b2c61a8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PihServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PihServiceImpl.java @@ -60,7 +60,7 @@ public class PihServiceImpl extends BaseServiceImpl implements PihService { } @Override - public BaseResponse queyAll(String key, Integer weekStart, Integer weekEnd, Integer age, String type, String vcCardNo, Integer page, Integer limit, Integer userId) { + public BaseResponse queyAll(String key, Integer weekStart, Integer weekEnd, Integer age, String type, Integer page, Integer limit, Integer userId) { boolean flag = false; List hospital = groupsFacade.findGroupHospital(userId, false); Criteria criteria = Criteria.where("yn").is("1").and("hospitalId").in(hospital);