From f5c7b7a05e7188c773884d01d9d9a81a35757024 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Wed, 20 Dec 2017 18:30:49 +0800 Subject: [PATCH] 1 --- .../operate/web/service/impl/PatientWeightServiceImpl.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java index a220326..9246a88 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java @@ -10,6 +10,7 @@ import com.lyms.platform.common.result.ResponseCode; import com.lyms.platform.common.utils.*; import com.lyms.platform.operate.web.facade.AutoMatchFacade; import com.lyms.platform.operate.web.facade.OperateLogFacade; +import com.lyms.platform.operate.web.facade.OrganizationGroupsFacade; import com.lyms.platform.operate.web.service.PatientWeightService; import com.lyms.platform.operate.web.utils.CollectionUtils; import com.lyms.platform.operate.web.utils.MathUtil; @@ -55,6 +56,8 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient @Autowired private OperateLogFacade operateLogFacade; + @Autowired + private OrganizationGroupsFacade groupsFacade; /** * 最低：0~13 : 0~1.9 13~40 1.9~11.9 @@ -197,9 +200,9 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient @Override public BaseResponse list(String key, String vcCardNo, Integer currentWeekStart, Integer currentWeekEnd, Integer age, Integer page, Integer limit, Integer userId) { - String hospitalId = autoMatchFacade.getHospitalId(userId); - Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").is(hospitalId); - Criteria pCriteria = Criteria.where("yn").ne("0").and("hospitalId").is(hospitalId); + List hospital = groupsFacade.findGroupHospital(userId, true) ; + Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital); + Criteria pCriteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital); if(StringUtils.isNotBlank(key)) { pCriteria.orOperator(Criteria.where("phone").regex(key), Criteria.where("username").regex(key), Criteria.where("cardNo").is(key)); } -- 1.8.3.1