diff --git a/platform-dal/src/main/java/com/lyms/platform/query/SieveApplyOrderQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/SieveApplyOrderQuery.java index 386bd4f..0cc9366 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/SieveApplyOrderQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/SieveApplyOrderQuery.java @@ -20,6 +20,27 @@ public class SieveApplyOrderQuery extends BaseQuery implements IConvertToNativeQ private String id; private String hospitalId; + private String number; + + //产筛医院 + private String sieveHospitalId; + + public String getNumber() { + return number; + } + + public void setNumber(String number) { + this.number = number; + } + + public String getSieveHospitalId() { + return sieveHospitalId; + } + + public void setSieveHospitalId(String sieveHospitalId) { + this.sieveHospitalId = sieveHospitalId; + } + public String getHospitalId() { return hospitalId; } @@ -61,6 +82,9 @@ public class SieveApplyOrderQuery extends BaseQuery implements IConvertToNativeQ if(null!=hospitalId){ condition= condition.and("hospitalId",hospitalId, MongoOper.IS); } + if(null!=sieveHospitalId){ + condition= condition.and("sieveHospitalId",sieveHospitalId, MongoOper.IS); + } if(null!=yn){ condition= condition.and("yn",yn, MongoOper.IS); } 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 cc40fb5..882f528 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 @@ -340,7 +340,7 @@ public class SieveFacade { * @return */ public BaseResponse queryList(CqSieveQueryRequest cqSieveQueryRequest, Integer userId, String needPage,boolean isSieveLagManage) { - + List data = new ArrayList<>(); SieveQuery sieveQuery = new SieveQuery(); sieveQuery.setQueryNo(cqSieveQueryRequest.getQueryNo()); sieveQuery.setYn(YnEnums.YES.getId()); @@ -408,10 +408,34 @@ public class SieveFacade { sieveQuery.setHospitalId(hospitalId); } + if (StringUtils.isNotEmpty(cqSieveQueryRequest.getNumber())) + { + List parentIds = new ArrayList<>(); + SieveApplyOrderQuery sieveApplyOrderQuery = new SieveApplyOrderQuery(); + sieveApplyOrderQuery.setSieveHospitalId(hospitalId); + sieveApplyOrderQuery.setNumber(cqSieveQueryRequest.getNumber()); + sieveApplyOrderQuery.setYn(YnEnums.YES.getId()); + List sieveApplyOrderModels = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery); + if (CollectionUtils.isNotEmpty(sieveApplyOrderModels)) + { + for(SieveApplyOrderModel model : sieveApplyOrderModels) + { + parentIds.add(model.getParentId()); + } + } + if (CollectionUtils.isNotEmpty(parentIds)) + { + sieveQuery.setParentIds(parentIds); + } + else + { + return new BaseListResponse().setData(data).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(sieveQuery.getPageInfo()); + } + } //查询产筛list List list = sieveService.queryList1(sieveQuery, "order"); - List data = new ArrayList<>(); + int batchSize = 4; int end = 0; List listFuture = new ArrayList<>(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CqSieveQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CqSieveQueryRequest.java index 5965e9b..2a1c82a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CqSieveQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CqSieveQueryRequest.java @@ -60,6 +60,17 @@ public class CqSieveQueryRequest extends BasePageQueryRequest{ //申请医院 private String applyHospitalId; + //标本号 + private String number; + + public String getNumber() { + return number; + } + + public void setNumber(String number) { + this.number = number; + } + public String getApplyHospitalId() { return applyHospitalId; }