From cf29e28a46597fa5152b77e8c44cac72e3230725 Mon Sep 17 00:00:00 2001 From: "litao@lymsh.com" Date: Tue, 26 Dec 2017 11:35:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/service/impl/BloodPressureServiceImpl.java | 7 ++++++- .../platform/operate/web/service/impl/BloodSugarServiceImpl.java | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java index 5649920..bd00d24 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java @@ -13,6 +13,7 @@ import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.facade.AccessPermissionFacade; import com.lyms.platform.operate.web.facade.AutoMatchFacade; +import com.lyms.platform.operate.web.facade.OrganizationGroupsFacade; import com.lyms.platform.operate.web.service.IBloodPressureService; import com.lyms.platform.operate.web.utils.CollectionUtils; import com.lyms.platform.operate.web.utils.MongoUtil; @@ -51,6 +52,8 @@ public class BloodPressureServiceImpl extends BaseServiceImpl implements IBloodP @Autowired private PatientWeightService2 patientWeightService2; + @Autowired + private OrganizationGroupsFacade groupsFacade; public BaseResponse addOrUpdate(Integer userId, BloodPressure bloodPressure) { @@ -94,7 +97,9 @@ public class BloodPressureServiceImpl extends BaseServiceImpl implements IBloodP @Override public BaseResponse list(String key, String vcCardNo, Integer weekStart, Integer weekEnd, Integer age, Integer page, Integer limit, Integer userId) { boolean flag = false; - List hospitalIds = accessPermissionFacade.getCurrentUserHospPermissions(userId); +// List hospitalIds = accessPermissionFacade.getCurrentUserHospPermissions(userId); + + List hospitalIds = groupsFacade.findGroupHospital(userId, true); Criteria criteria = Criteria.where("yn").is(1).and("hospitalId").in(hospitalIds); Criteria pCriteria = Criteria.where("yn").is(1).and("hospitalId").in(hospitalIds); if(StringUtils.isNotEmpty(key)) { 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 863e639..3c91a96 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 @@ -14,6 +14,7 @@ import com.lyms.platform.common.utils.EnumUtil; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.facade.AccessPermissionFacade; import com.lyms.platform.operate.web.facade.AutoMatchFacade; +import com.lyms.platform.operate.web.facade.OrganizationGroupsFacade; import com.lyms.platform.operate.web.service.IBloodSugarService; import com.lyms.platform.operate.web.utils.CollectionUtils; import com.lyms.platform.operate.web.utils.MathUtil; @@ -46,6 +47,8 @@ public class BloodSugarServiceImpl extends BaseServiceImpl implements IBloodSuga @Autowired private AccessPermissionFacade accessPermissionFacade; + @Autowired + private OrganizationGroupsFacade groupsFacade; public BaseResponse add(Integer userId, BloodSugar bloodSugar) { @@ -75,9 +78,11 @@ public class BloodSugarServiceImpl extends BaseServiceImpl implements IBloodSuga 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, true); Criteria criteria = Criteria.where("yn").is(1); + criteria.and("hospitalId").in(hospitalIds); if(flag) { - List hospitalIds = accessPermissionFacade.getCurrentUserHospPermissions(userId); List pids = mongoUtil.getPidsByCondition2(hospitalIds, key, vcCardNo, weekStart, weekEnd, age); criteria.and("pid").in(pids); } -- 1.8.3.1