diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java index fbd348b..2edac43 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java @@ -696,8 +696,19 @@ public class AntExRecordFacade { } else { - ids.add(oneRecord.getId()); - incriskMap.put(oneRecord.getId(), oneRecord.gethRisk()); + if (StringUtils.isNotEmpty(request.getRiskFactorId())) + { + if (CollectionUtils.isNotEmpty(oneRecord.gethRisk()) && getConditionRisk(request.getRiskFactorId(),oneRecord.gethRisk())) + { + ids.add(oneRecord.getId()); + incriskMap.put(oneRecord.getId(), oneRecord.gethRisk()); + } + } + else + { + ids.add(oneRecord.getId()); + incriskMap.put(oneRecord.getId(), oneRecord.gethRisk()); + } } } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java index 724963e..6575f2b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java @@ -366,6 +366,19 @@ public class ApplyOrderFacade { { sieveApplyOrderModel.setId(sieveApplyOrderAddRequest.getId()); applyOrderService.updateSieve(sieveApplyOrderModel); + + SieveQuery sieveQuery = new SieveQuery(); + sieveQuery.setYn(YnEnums.YES.getId()); + sieveQuery.setParentId(sieveApplyOrderAddRequest.getParentId()); + List sieveModels = sieveService.queryList(sieveQuery); + if (CollectionUtils.isNotEmpty(sieveModels)) { + SieveModel sieveModel = sieveModels.get(0); + if (sieveModel.getSieveHospitalId() != null && !sieveModel.getSieveHospitalId().equals(sieveApplyOrderAddRequest.getSieveHospitalId())) + { + sieveModel.setSieveHospitalId(sieveApplyOrderAddRequest.getSieveHospitalId()); + sieveService.updateOneChanQianDiaSieve(sieveModel); + } + } return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("修改成功"); }