diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index d940c51..0cf9bad 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -328,11 +328,13 @@ public class MatDeliverFacade { MatDeliverQuery query = new MatDeliverQuery(); query.setId(deliverAddRequest.getId()); query.setYn(YnEnums.YES.getId()); - List results = matDeliverService.query(matDeliverQuery); + List results = matDeliverService.query(query); matDeliverService.updateOne(maternalDeliverModel, maternalDeliverModel.getId()); - - operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospitalId), maternalDeliverModel, results.get(0), OptActionEnums.UPDATE.getId(), "修改分娩"); + if (CollectionUtils.isNotEmpty(results)) + { + operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospitalId), maternalDeliverModel, results.get(0), OptActionEnums.UPDATE.getId(), "修改分娩"); + } if (null != deliverAddRequest.getDueDate()) { Date fmDate = DateUtil.parseYMD(deliverAddRequest.getDueDate()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java index e0155e0..9bc3ce2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java @@ -305,10 +305,6 @@ public class RiskReportFacade { //用于存在没有机构的区域Id List addrId = new ArrayList<>(); - //区域权限id -// List childsId = getAreaPermission(userId, addrType); -// basicQuery.setIds(childsId); - //获取地址列表 List configList = basicConfigService.queryBasicConfig(basicQuery);