From 6965a49783a038b6828a6ad6ecb6e7fbd8f78a93 Mon Sep 17 00:00:00 2001 From: wtt Date: Thu, 11 Jun 2020 13:56:36 +0800 Subject: [PATCH] update --- .../com/lyms/platform/operate/web/facade/ApplyOrderFacade.java | 9 +++++---- .../java/com/lyms/platform/operate/web/facade/SieveFacade.java | 4 ++++ 2 files changed, 9 insertions(+), 4 deletions(-) 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 f4b4158..83dbe19 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 @@ -492,12 +492,11 @@ public class ApplyOrderFacade { sieveModel.setSieveType(sieveApplyOrderModel.getSieveType()); sieveModel.setCostType(sieveApplyOrderModel.getCostType()); sieveService.addChanQianSieve(sieveModel); - + map.put("sieveModelid", sieveModel.getId()); operateLogFacade.addAddOptLog(userId, Integer.parseInt(hospitalId), sieveModel, OptActionEnums.ADD.getId(), "增加产筛申请单"); } } map.put("orderModelid", orderModel.getId()); - map.put("sieveModelid", sieveModel.getId()); idList.add(map); } } @@ -507,12 +506,14 @@ public class ApplyOrderFacade { sieveApplyOrderModel1.setId(str.get("orderModelid").toString()); sieveApplyOrderModel1.setModified(new Date()); sieveApplyOrderModel1.setStatus(1); - sieveApplyOrderModel1.setLymsSieveId(str.get("sieveModelid").toString()); + if(str.containsKey("sieveModelid")){ + sieveApplyOrderModel1.setLymsSieveId(str.get("sieveModelid").toString()); + } SieveApplyOrderQuery sieveApplyOrderQuery2 = new SieveApplyOrderQuery(); sieveApplyOrderQuery2.setId(str.get("orderModelid").toString()); List list2 = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery2); applyOrderService.updateSieve(sieveApplyOrderModel1); - operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospitalId), list2.get(0), sieveApplyOrderModel1, OptActionEnums.UPDATE.getId(), "更新产晒申请"); + operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospitalId), list2.size() > 0 ? list2.get(0) : null, sieveApplyOrderModel1, OptActionEnums.UPDATE.getId(), "更新产晒申请"); } } SieveQuery sieveQuery = new SieveQuery(); 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 dce0444..a7139ff 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 @@ -852,6 +852,10 @@ public class SieveFacade { } else { //1.2.1 查看申请单 List sieveApplyOrderModels = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery1); + if(CollectionUtils.isEmpty(sieveApplyOrderModels)){ + sieveApplyOrderQuery1.setLymsSieveId(null); + sieveApplyOrderModels = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery1); + } if (CollectionUtils.isNotEmpty(sieveApplyOrderModels)) { Map result = new HashMap<>(); -- 1.8.3.1