From db9418d58f9154a22cbf019bea1d78f3f9dfc68c Mon Sep 17 00:00:00 2001 From: wtt Date: Fri, 19 Jun 2020 18:40:21 +0800 Subject: [PATCH] update --- .../com/lyms/platform/operate/web/facade/SieveFacade.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java index 55c0ad3..61c3ba7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java @@ -519,6 +519,7 @@ public class SieveFacade { } else { sieveQuery.setHospitalId(hospitalId); } + List lymsSieveIds = new ArrayList<>(); if (StringUtils.isNotEmpty(cqSieveQueryRequest.getNumber())) { List parentIds = new ArrayList<>(); @@ -530,9 +531,14 @@ public class SieveFacade { if (CollectionUtils.isNotEmpty(sieveApplyOrderModels)) { for (SieveApplyOrderModel model : sieveApplyOrderModels) { parentIds.add(model.getParentId()); + if (StringUtils.isNotEmpty(model.getLymsSieveId())) { + lymsSieveIds.add(model.getLymsSieveId()); + } } } - if (CollectionUtils.isNotEmpty(parentIds)) { + if (CollectionUtils.isNotEmpty(lymsSieveIds)) { + sieveQuery.setLymsSieveIds(lymsSieveIds);//以前产筛表没有这个管理会漏掉，后面修改过就不会，这里有可能会有个问题 + } else if (CollectionUtils.isNotEmpty(parentIds)) { sieveQuery.setParentIds(parentIds); } else { return new BaseListResponse().setData(data).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(sieveQuery.getPageInfo()); @@ -2717,8 +2723,7 @@ public class SieveFacade { } } //1.1 修改产筛申请内容,先暂时修改B超孕天 - sieveApplyOrderModel1.setStatus(2); - applyOrderService.updateSieve(sieveApplyOrderModel1); + //applyOrderService.updateSieve(sieveApplyOrderModel1); SieveAddRequest sieveAddRequest = new SieveAddRequest(); sieveAddRequest.setPublishName(String.valueOf(id));//录入人员 -- 1.8.3.1