Commit f5c7b7a05e7188c773884d01d9d9a81a35757024
1 parent
7acaf14e93
Exists in
master
and in
6 other branches
1
Showing 1 changed file with 6 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java
View file @
f5c7b7a
| ... | ... | @@ -10,6 +10,7 @@ |
| 10 | 10 | import com.lyms.platform.common.utils.*; |
| 11 | 11 | import com.lyms.platform.operate.web.facade.AutoMatchFacade; |
| 12 | 12 | import com.lyms.platform.operate.web.facade.OperateLogFacade; |
| 13 | +import com.lyms.platform.operate.web.facade.OrganizationGroupsFacade; | |
| 13 | 14 | import com.lyms.platform.operate.web.service.PatientWeightService; |
| 14 | 15 | import com.lyms.platform.operate.web.utils.CollectionUtils; |
| 15 | 16 | import com.lyms.platform.operate.web.utils.MathUtil; |
| ... | ... | @@ -55,6 +56,8 @@ |
| 55 | 56 | |
| 56 | 57 | @Autowired |
| 57 | 58 | private OperateLogFacade operateLogFacade; |
| 59 | + @Autowired | |
| 60 | + private OrganizationGroupsFacade groupsFacade; | |
| 58 | 61 | |
| 59 | 62 | /** |
| 60 | 63 | * 最低:0~13 : 0~1.9 13~40 1.9~11.9 |
| ... | ... | @@ -197,9 +200,9 @@ |
| 197 | 200 | |
| 198 | 201 | @Override |
| 199 | 202 | public BaseResponse list(String key, String vcCardNo, Integer currentWeekStart, Integer currentWeekEnd, Integer age, Integer page, Integer limit, Integer userId) { |
| 200 | - String hospitalId = autoMatchFacade.getHospitalId(userId); | |
| 201 | - Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").is(hospitalId); | |
| 202 | - Criteria pCriteria = Criteria.where("yn").ne("0").and("hospitalId").is(hospitalId); | |
| 203 | + List<String> hospital = groupsFacade.findGroupHospital(userId, true) ; | |
| 204 | + Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital); | |
| 205 | + Criteria pCriteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital); | |
| 203 | 206 | if(StringUtils.isNotBlank(key)) { |
| 204 | 207 | pCriteria.orOperator(Criteria.where("phone").regex(key), Criteria.where("username").regex(key), Criteria.where("cardNo").is(key)); |
| 205 | 208 | } |