From 3c43e68e0490617e9655f3e0f054c8cd3812dae5 Mon Sep 17 00:00:00 2001 From: "litao@lymsh.com" Date: Tue, 1 Aug 2017 14:59:40 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BF=E8=A7=86=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E5=8C=BA=E5=9F=9F=E7=9A=84=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/service/impl/NewbornServiceImpl.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java index f92fcba..06d1994 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java @@ -10,6 +10,7 @@ import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.EnumUtil; import com.lyms.platform.common.utils.MongoConvertHelper; import com.lyms.platform.common.utils.ReflectionUtils; +import com.lyms.platform.operate.web.facade.AccessPermissionFacade; import com.lyms.platform.operate.web.facade.AutoMatchFacade; import com.lyms.platform.operate.web.service.INewbornVisitService; import com.lyms.platform.operate.web.utils.CollectionUtils; @@ -64,6 +65,9 @@ public class NewbornServiceImpl extends BaseServiceImpl implements INewbornVisit @Autowired private CouponService couponService; + @Autowired + private AccessPermissionFacade accessPermissionFacade; + @Override public BaseObjectResponse init() { List> feedType = EnumUtil.toJson(FeedTypeEnums.class); @@ -156,7 +160,11 @@ public class NewbornServiceImpl extends BaseServiceImpl implements INewbornVisit @Override public BaseObjectResponse list(Date startDate, Date endDate, String doctor, Integer userId, String key, Integer page, Integer limit) { String hospitalId = autoMatchFacade.getHospitalId(userId); - Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").is(hospitalId); + List hospitalIds = accessPermissionFacade.getCurrentUserHospPermissions(userId); + if(CollectionUtils.isEmpty(hospitalIds)) { + return RespBuilder.buildSuccess(); + } + Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospitalIds); if(startDate != null && endDate != null) { criteria.and("checkTime").gte(startDate).lt(DateUtil.addDay(endDate, 1)); } -- 1.8.3.1