Commit 7d0400b8af1950f81c66a3d58649a6b2d66b158d
1 parent
4488d6fd6e
Exists in
master
and in
6 other branches
修改bug
Showing 1 changed file with 12 additions and 9 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
View file @
7d0400b
| ... | ... | @@ -1913,16 +1913,19 @@ |
| 1913 | 1913 | |
| 1914 | 1914 | // 高危等级 |
| 1915 | 1915 | String highRiskLevel = matdeliverFollowRequest.getHighRiskLevel(); |
| 1916 | - List<Patients> patientGaoweis = mongoTemplate.find(Query.query(Criteria.where("riskLevelId").regex(highRiskLevel).and("yn").is("1")), Patients.class); | |
| 1917 | - List<String> patientIds = new ArrayList<>(); | |
| 1918 | - for (Patients patient : patientGaoweis) { | |
| 1919 | - patientIds.add(patient.getId()); | |
| 1916 | + if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(highRiskLevel)) { | |
| 1917 | + | |
| 1918 | + List<Patients> patientGaoweis = mongoTemplate.find(Query.query(Criteria.where("riskLevelId").regex(highRiskLevel).and("yn").is(1)), Patients.class); | |
| 1919 | + List<String> patientIds = new ArrayList<>(); | |
| 1920 | + for (Patients patient : patientGaoweis) { | |
| 1921 | + patientIds.add(patient.getId()); | |
| 1922 | + } | |
| 1923 | + List<String> parentIdList1 = matDeliverQuery.getParentIdList(); | |
| 1924 | + if (CollectionUtils.isNotEmpty(parentIdList1)) { | |
| 1925 | + patientIds.addAll(parentIdList1); | |
| 1926 | + } | |
| 1927 | + matDeliverQuery.setParentIdList(patientIds); | |
| 1920 | 1928 | } |
| 1921 | - List<String> parentIdList1 = matDeliverQuery.getParentIdList(); | |
| 1922 | - if (CollectionUtils.isNotEmpty(parentIdList1)) { | |
| 1923 | - patientIds.addAll(parentIdList1); | |
| 1924 | - } | |
| 1925 | - matDeliverQuery.setParentIdList(patientIds); | |
| 1926 | 1929 | |
| 1927 | 1930 | |
| 1928 | 1931 | if (StringUtils.isNotEmpty(matdeliverFollowRequest.getNeed())) {//是否分页 |