Commit 9ad5c664b646727bfe37d8fb92062f24cf118acf
1 parent
6eec141311
Exists in
master
and in
6 other branches
产筛
Showing 2 changed files with 26 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
View file @
9ad5c66
| ... | ... | @@ -696,8 +696,19 @@ |
| 696 | 696 | } |
| 697 | 697 | else |
| 698 | 698 | { |
| 699 | - ids.add(oneRecord.getId()); | |
| 700 | - incriskMap.put(oneRecord.getId(), oneRecord.gethRisk()); | |
| 699 | + if (StringUtils.isNotEmpty(request.getRiskFactorId())) | |
| 700 | + { | |
| 701 | + if (CollectionUtils.isNotEmpty(oneRecord.gethRisk()) && getConditionRisk(request.getRiskFactorId(),oneRecord.gethRisk())) | |
| 702 | + { | |
| 703 | + ids.add(oneRecord.getId()); | |
| 704 | + incriskMap.put(oneRecord.getId(), oneRecord.gethRisk()); | |
| 705 | + } | |
| 706 | + } | |
| 707 | + else | |
| 708 | + { | |
| 709 | + ids.add(oneRecord.getId()); | |
| 710 | + incriskMap.put(oneRecord.getId(), oneRecord.gethRisk()); | |
| 711 | + } | |
| 701 | 712 | } |
| 702 | 713 | } |
| 703 | 714 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
View file @
9ad5c66
| ... | ... | @@ -366,6 +366,19 @@ |
| 366 | 366 | { |
| 367 | 367 | sieveApplyOrderModel.setId(sieveApplyOrderAddRequest.getId()); |
| 368 | 368 | applyOrderService.updateSieve(sieveApplyOrderModel); |
| 369 | + | |
| 370 | + SieveQuery sieveQuery = new SieveQuery(); | |
| 371 | + sieveQuery.setYn(YnEnums.YES.getId()); | |
| 372 | + sieveQuery.setParentId(sieveApplyOrderAddRequest.getParentId()); | |
| 373 | + List<SieveModel> sieveModels = sieveService.queryList(sieveQuery); | |
| 374 | + if (CollectionUtils.isNotEmpty(sieveModels)) { | |
| 375 | + SieveModel sieveModel = sieveModels.get(0); | |
| 376 | + if (sieveModel.getSieveHospitalId() != null && !sieveModel.getSieveHospitalId().equals(sieveApplyOrderAddRequest.getSieveHospitalId())) | |
| 377 | + { | |
| 378 | + sieveModel.setSieveHospitalId(sieveApplyOrderAddRequest.getSieveHospitalId()); | |
| 379 | + sieveService.updateOneChanQianDiaSieve(sieveModel); | |
| 380 | + } | |
| 381 | + } | |
| 369 | 382 | return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("修改成功"); |
| 370 | 383 | } |
| 371 | 384 |