diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BloodSugarController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BloodSugarController.java index 8f254ef..0cd8b9f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BloodSugarController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BloodSugarController.java @@ -87,8 +87,8 @@ public class BloodSugarController extends BaseController { @ResponseBody @RequestMapping(method = RequestMethod.GET) @TokenRequired - public BaseResponse list(String key, String vcCardNo, Integer weekStart, Integer weekEnd, Integer age, Integer page, Integer limit, HttpServletRequest request) { - return bloodSugarService.list(key, vcCardNo, weekStart, weekEnd, age, page, limit, getUserId(request)); + public BaseResponse list(String isAll,String key, String vcCardNo, Integer weekStart, Integer weekEnd, Integer age, Integer page, Integer limit, HttpServletRequest request) { + return bloodSugarService.list(isAll,key, vcCardNo, weekStart, weekEnd, age, page, limit, getUserId(request)); } @ResponseBody diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IBloodSugarService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IBloodSugarService.java index 32ca05f..cc77115 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IBloodSugarService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IBloodSugarService.java @@ -12,7 +12,7 @@ public interface IBloodSugarService extends IBaseService { BaseResponse add(Integer userId, BloodSugar bloodSugar); - BaseResponse list(String key, String vcCardNo, Integer weekStart, Integer weekEnd, Integer age, Integer page, Integer limit, Integer userId); + BaseResponse list(String isAll,String key, String vcCardNo, Integer weekStart, Integer weekEnd, Integer age, Integer page, Integer limit, Integer userId); BaseResponse info(String parentId, Integer type, Date time); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java index d5689d2..d0e4e74 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java @@ -129,15 +129,24 @@ public class BloodSugarServiceImpl extends BaseServiceImpl implements IBloodSuga } @Override - public BaseResponse list(String key, String vcCardNo, Integer weekStart, Integer weekEnd, Integer age, Integer page, Integer limit, Integer userId) { + public BaseResponse list(String isAll,String key, String vcCardNo, Integer weekStart, Integer weekEnd, Integer age, Integer page, Integer limit, Integer userId) { boolean flag = false; if (StringUtils.isNotEmpty(key) || StringUtils.isNotEmpty(vcCardNo) || weekEnd != null || weekStart != null || age != null) { flag = true; } -// List hospitalIds = accessPermissionFacade.getCurrentUserHospPermissions(userId); List hospitalIds = groupsFacade.findGroupHospital(userId, false); + List hids = new ArrayList<>(); + if (!StringUtils.isNotEmpty(isAll) || "1".equals(isAll)) + { + String hospitalId = autoMatchFacade.getHospitalId(userId); + hids.add(hospitalId); + } + else + { + hids.addAll(hospitalIds); + } Criteria criteria = Criteria.where("yn").is(1); - criteria.and("hospitalId").in(hospitalIds); + criteria.and("hospitalId").in(hids); if (flag) { List pids = mongoUtil.getPidsByCondition2(hospitalIds, key, vcCardNo, weekStart, weekEnd, age); criteria.and("pid").in(pids);