Commit db9418d58f9154a22cbf019bea1d78f3f9dfc68c
1 parent
df5d14d2ec
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 8 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
View file @
db9418d
| ... | ... | @@ -519,6 +519,7 @@ |
| 519 | 519 | } else { |
| 520 | 520 | sieveQuery.setHospitalId(hospitalId); |
| 521 | 521 | } |
| 522 | + List<String> lymsSieveIds = new ArrayList<>(); | |
| 522 | 523 | |
| 523 | 524 | if (StringUtils.isNotEmpty(cqSieveQueryRequest.getNumber())) { |
| 524 | 525 | List<String> parentIds = new ArrayList<>(); |
| 525 | 526 | |
| ... | ... | @@ -530,9 +531,14 @@ |
| 530 | 531 | if (CollectionUtils.isNotEmpty(sieveApplyOrderModels)) { |
| 531 | 532 | for (SieveApplyOrderModel model : sieveApplyOrderModels) { |
| 532 | 533 | parentIds.add(model.getParentId()); |
| 534 | + if (StringUtils.isNotEmpty(model.getLymsSieveId())) { | |
| 535 | + lymsSieveIds.add(model.getLymsSieveId()); | |
| 536 | + } | |
| 533 | 537 | } |
| 534 | 538 | } |
| 535 | - if (CollectionUtils.isNotEmpty(parentIds)) { | |
| 539 | + if (CollectionUtils.isNotEmpty(lymsSieveIds)) { | |
| 540 | + sieveQuery.setLymsSieveIds(lymsSieveIds);//以前产筛表没有这个管理会漏掉，后面修改过就不会，这里有可能会有个问题 | |
| 541 | + } else if (CollectionUtils.isNotEmpty(parentIds)) { | |
| 536 | 542 | sieveQuery.setParentIds(parentIds); |
| 537 | 543 | } else { |
| 538 | 544 | return new BaseListResponse().setData(data).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(sieveQuery.getPageInfo()); |
| ... | ... | @@ -2717,8 +2723,7 @@ |
| 2717 | 2723 | } |
| 2718 | 2724 | } |
| 2719 | 2725 | //1.1 修改产筛申请内容,先暂时修改B超孕天 |
| 2720 | - sieveApplyOrderModel1.setStatus(2); | |
| 2721 | - applyOrderService.updateSieve(sieveApplyOrderModel1); | |
| 2726 | + //applyOrderService.updateSieve(sieveApplyOrderModel1); | |
| 2722 | 2727 | |
| 2723 | 2728 | SieveAddRequest sieveAddRequest = new SieveAddRequest(); |
| 2724 | 2729 | sieveAddRequest.setPublishName(String.valueOf(id));//录入人员 |