Commit 6965a49783a038b6828a6ad6ecb6e7fbd8f78a93
1 parent
80c8db8c10
Exists in
master
and in
6 other branches
update
Showing 2 changed files with 9 additions and 4 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
View file @
6965a49
| ... | ... | @@ -492,12 +492,11 @@ |
| 492 | 492 | sieveModel.setSieveType(sieveApplyOrderModel.getSieveType()); |
| 493 | 493 | sieveModel.setCostType(sieveApplyOrderModel.getCostType()); |
| 494 | 494 | sieveService.addChanQianSieve(sieveModel); |
| 495 | - | |
| 495 | + map.put("sieveModelid", sieveModel.getId()); | |
| 496 | 496 | operateLogFacade.addAddOptLog(userId, Integer.parseInt(hospitalId), sieveModel, OptActionEnums.ADD.getId(), "增加产筛申请单"); |
| 497 | 497 | } |
| 498 | 498 | } |
| 499 | 499 | map.put("orderModelid", orderModel.getId()); |
| 500 | - map.put("sieveModelid", sieveModel.getId()); | |
| 501 | 500 | idList.add(map); |
| 502 | 501 | } |
| 503 | 502 | } |
| 504 | 503 | |
| ... | ... | @@ -507,12 +506,14 @@ |
| 507 | 506 | sieveApplyOrderModel1.setId(str.get("orderModelid").toString()); |
| 508 | 507 | sieveApplyOrderModel1.setModified(new Date()); |
| 509 | 508 | sieveApplyOrderModel1.setStatus(1); |
| 510 | - sieveApplyOrderModel1.setLymsSieveId(str.get("sieveModelid").toString()); | |
| 509 | + if(str.containsKey("sieveModelid")){ | |
| 510 | + sieveApplyOrderModel1.setLymsSieveId(str.get("sieveModelid").toString()); | |
| 511 | + } | |
| 511 | 512 | SieveApplyOrderQuery sieveApplyOrderQuery2 = new SieveApplyOrderQuery(); |
| 512 | 513 | sieveApplyOrderQuery2.setId(str.get("orderModelid").toString()); |
| 513 | 514 | List<SieveApplyOrderModel> list2 = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery2); |
| 514 | 515 | applyOrderService.updateSieve(sieveApplyOrderModel1); |
| 515 | - operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospitalId), list2.get(0), sieveApplyOrderModel1, OptActionEnums.UPDATE.getId(), "更新产晒申请"); | |
| 516 | + operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospitalId), list2.size() > 0 ? list2.get(0) : null, sieveApplyOrderModel1, OptActionEnums.UPDATE.getId(), "更新产晒申请"); | |
| 516 | 517 | } |
| 517 | 518 | } |
| 518 | 519 | SieveQuery sieveQuery = new SieveQuery(); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
View file @
6965a49
| ... | ... | @@ -852,6 +852,10 @@ |
| 852 | 852 | } else { |
| 853 | 853 | //1.2.1 查看申请单 |
| 854 | 854 | List<SieveApplyOrderModel> sieveApplyOrderModels = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery1); |
| 855 | + if(CollectionUtils.isEmpty(sieveApplyOrderModels)){ | |
| 856 | + sieveApplyOrderQuery1.setLymsSieveId(null); | |
| 857 | + sieveApplyOrderModels = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery1); | |
| 858 | + } | |
| 855 | 859 | if (CollectionUtils.isNotEmpty(sieveApplyOrderModels)) { |
| 856 | 860 | Map<String, Object> result = new HashMap<>(); |
| 857 | 861 |