Commit 5784b0dc677ecb09565adc50dac2b7dfae13ad63
1 parent
fc38dd0a1c
Exists in
master
and in
6 other branches
1
Showing 2 changed files with 12 additions and 5 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
View file @
5784b0d
| ... | ... | @@ -190,7 +190,8 @@ |
| 190 | 190 | if (org.apache.commons.lang.StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId)) && org.apache.commons.lang.StringUtils.isNotEmpty(pid)) { |
| 191 | 191 | babyModelQuery.setId(null); |
| 192 | 192 | babyModelQuery.setPid(pid); |
| 193 | - babyModel= findBabyCond(babyModelQuery,li, false); | |
| 193 | + babyModelQuery.setEnable(null); | |
| 194 | + babyModel= findBabyCond(babyModelQuery,groupsFacade.findGroupHospital(userId, false), false); | |
| 194 | 195 | babyModel.setSource(babyModel.getId()); |
| 195 | 196 | babyModel.setId(null); |
| 196 | 197 | babyModel.setHospitalId(hospitalId); |
| ... | ... | @@ -216,10 +217,6 @@ |
| 216 | 217 | babyQuery.setId(babyId); |
| 217 | 218 | babyQuery.setYn(YnEnums.YES.getId()); |
| 218 | 219 | |
| 219 | - //在区域组的时候不用查询隐藏档案 | |
| 220 | - /* if (null != groupsFacade.findByCurrentUserId(autoMatchFacade.getHospitalId(userId))) { | |
| 221 | - babyQuery.setExtEnable(false); | |
| 222 | - }*/ | |
| 223 | 220 | |
| 224 | 221 | //查询建档记录 得到pid 通过pid查询所有的儿童建档记录 |
| 225 | 222 | List<BabyModel> builds = babyBookbuildingService.queryBabyBuildByCond(babyQuery); |
| ... | ... | @@ -230,6 +227,7 @@ |
| 230 | 227 | |
| 231 | 228 | String[] buildIds = null; |
| 232 | 229 | List<Map<String, String>> list = new ArrayList<>(); |
| 230 | + | |
| 233 | 231 | //查询建档记录 |
| 234 | 232 | List<BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery); |
| 235 | 233 | if (CollectionUtils.isNotEmpty(models)) { |
| ... | ... | @@ -240,6 +238,10 @@ |
| 240 | 238 | |
| 241 | 239 | BabyModel babyModel = models.get(i); |
| 242 | 240 | buildIds[i] = babyModel.getId(); |
| 241 | + //隐藏建档不显示 | |
| 242 | + if("2".equals(babyModel.getEnable())){ | |
| 243 | + continue; | |
| 244 | + } | |
| 243 | 245 | Map<String, String> checkRecord = new HashMap<>(); |
| 244 | 246 | checkRecord.put("id", babyModel.getId()); |
| 245 | 247 | checkRecord.put("pid", babyModel.getPid()); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
View file @
5784b0d
| ... | ... | @@ -724,6 +724,11 @@ |
| 724 | 724 | babyQuery.setVcCardNo(StringUtils.isEmpty(vcCardNo) ? null : vcCardNo); |
| 725 | 725 | babyQuery.setYn(YnEnums.YES.getId()); |
| 726 | 726 | |
| 727 | + //表示区域的 | |
| 728 | + if (org.apache.commons.lang.StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId))) { | |
| 729 | + babyQuery.setExtEnable(false); | |
| 730 | + } | |
| 731 | + | |
| 727 | 732 | List<String> hList = groupsFacade.findGroupHospital(userId, false); |
| 728 | 733 | babyQuery.setHospitalIdList(hList); |
| 729 | 734 |