From 294226efafa755be06d825fa7cd75630dd00bb94 Mon Sep 17 00:00:00 2001 From: "litao@lymsh.com" Date: Thu, 3 Aug 2017 09:44:09 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9A=90=E8=97=8F=E5=BB=BA=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/service/impl/NewbornServiceImpl.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java index ae3671f..c92d49e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java @@ -136,22 +136,16 @@ public class NewbornServiceImpl extends BaseServiceImpl implements INewbornVisit // 如果本院已有记录 直接走正常流程 BabyModel baby = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(pid).and("hospitalId").is(hospitalId)).with(new Sort(Sort.Direction.DESC, "created")), BabyModel.class); if(baby != null) { - babyId = baby.getId(); return true; } - DataPermissionsModelQuery dataPermissionsModelQuery = new DataPermissionsModelQuery(); - dataPermissionsModelQuery.setUserId(userId); - List permissionsModels = dataPermissionService.queryPermission(dataPermissionsModelQuery); - if (CollectionUtils.isNotEmpty(permissionsModels)) { - Set set = permissionsModels.get(0).getData().keySet(); - Iterator it = set.iterator(); - BabyModel babyModel = mongoTemplate.findOne(Query.query(Criteria.where("hospitalId").in(it) + List hospitalIds = organizationGroupsFacade.findGroupHospital(userId, true); + if (CollectionUtils.isNotEmpty(hospitalIds)) { + BabyModel babyModel = mongoTemplate.findOne(Query.query(Criteria.where("hospitalId").in(hospitalIds) .and("pid").is(pid)).with(new Sort(Sort.Direction.DESC, "created")), BabyModel.class); if(babyModel == null) { return false; // 需 要建档 } - babyId = UUID.randomUUID().toString().replace("-", ""); babyModel.setId(babyId); babyModel.setHospitalId(hospitalId); babyModel.setEnable("2"); -- 1.8.3.1