diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index 6ba7bd7..58f64f1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -190,7 +190,8 @@ public class BabyBookbuildingFacade { if (org.apache.commons.lang.StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId)) && org.apache.commons.lang.StringUtils.isNotEmpty(pid)) { babyModelQuery.setId(null); babyModelQuery.setPid(pid); - babyModel= findBabyCond(babyModelQuery,li, false); + babyModelQuery.setEnable(null); + babyModel= findBabyCond(babyModelQuery,groupsFacade.findGroupHospital(userId, false), false); babyModel.setSource(babyModel.getId()); babyModel.setId(null); babyModel.setHospitalId(hospitalId); @@ -216,10 +217,6 @@ public class BabyBookbuildingFacade { babyQuery.setId(babyId); babyQuery.setYn(YnEnums.YES.getId()); - //在区域组的时候不用查询隐藏档案 - /* if (null != groupsFacade.findByCurrentUserId(autoMatchFacade.getHospitalId(userId))) { - babyQuery.setExtEnable(false); - }*/ //查询建档记录 得到pid 通过pid查询所有的儿童建档记录 List builds = babyBookbuildingService.queryBabyBuildByCond(babyQuery); @@ -230,6 +227,7 @@ public class BabyBookbuildingFacade { String[] buildIds = null; List> list = new ArrayList<>(); + //查询建档记录 List models = babyBookbuildingService.queryBabyBuildByCond(babyQuery); if (CollectionUtils.isNotEmpty(models)) { @@ -240,6 +238,10 @@ public class BabyBookbuildingFacade { BabyModel babyModel = models.get(i); buildIds[i] = babyModel.getId(); + //隐藏建档不显示 + if("2".equals(babyModel.getEnable())){ + continue; + } Map checkRecord = new HashMap<>(); checkRecord.put("id", babyModel.getId()); checkRecord.put("pid", babyModel.getPid()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index 8936c2f..c651325 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -724,6 +724,11 @@ public class BabyCheckFacade { babyQuery.setVcCardNo(StringUtils.isEmpty(vcCardNo) ? null : vcCardNo); babyQuery.setYn(YnEnums.YES.getId()); + //表示区域的 + if (org.apache.commons.lang.StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId))) { + babyQuery.setExtEnable(false); + } + List hList = groupsFacade.findGroupHospital(userId, false); babyQuery.setHospitalIdList(hList);