diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java index d9eaec1..754cc5e 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java @@ -131,6 +131,16 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { */ private Boolean isNull; + private Boolean extEnable; + + public Boolean getExtEnable() { + return extEnable; + } + + public void setExtEnable(Boolean extEnable) { + this.extEnable = extEnable; + } + public Integer[] getOrServiceStatus() { return orServiceStatus; } @@ -294,6 +304,7 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { //身长别体重 private String heightWeight; + public String getWeightEvaluate() { return weightEvaluate; } @@ -508,6 +519,10 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { if (null != source) { condition = condition.and("source", source, MongoOper.IS); } + + if(null!=extEnable){ + condition.and("enable",extEnable,MongoOper.EXISTS); + } if (-1 != yn) { condition = condition.and("yn", yn, MongoOper.IS); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java index 8a19241..f8c72d6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java @@ -297,12 +297,13 @@ public class BabyBuildController extends BaseController { */ @RequestMapping(method = RequestMethod.GET, value = "/bookBuildList") @ResponseBody - public BaseResponse bookBuildList(@RequestParam("babyId") String babyId) { + @TokenRequired + public BaseResponse bookBuildList(@RequestParam("babyId") String babyId,HttpServletRequest request) { if (org.apache.commons.lang.StringUtils.isEmpty(babyId)) { - return new BaseResponse().setErrormsg("babyid不能为空").setErrorcode(ErrorCodeConstants.PARAMETER_ERROR); } - return babyBookbuildingFacade.bookBuildList(babyId); + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + return babyBookbuildingFacade.bookBuildList(babyId,loginState.getId()); } /** @@ -399,6 +400,4 @@ public class BabyBuildController extends BaseController { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); return babyBookbuildingFacade.getBabyGrowthRightList(babyManageRequest,loginState.getId(),page,limit); } - - } \ No newline at end of file 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 31a3c52..65f37c3 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 @@ -207,7 +207,7 @@ public class BabyBookbuildingFacade { * * @return */ - public BaseResponse bookBuildList(String babyId) { + public BaseResponse bookBuildList(String babyId,Integer userId) { BaseObjectResponse br = new BaseObjectResponse(); BabyBasicResult base = new BabyBasicResult(); Map resMap = new HashMap<>(); @@ -216,6 +216,11 @@ 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); if (CollectionUtils.isNotEmpty(builds)) { @@ -1501,16 +1506,11 @@ public class BabyBookbuildingFacade { List hospitalIdList = new ArrayList<>(); String hospitalName = ""; - + BabyModelQuery babyQuery = new BabyModelQuery(); if(String.valueOf("true").equals(request.getIsArea())){ - + babyQuery.setExtEnable(false); OrganizationQuery organizationQuery = new OrganizationQuery(); - // List typeList = new ArrayList<>(); - // typeList.add(OrganizationTypeEnum.NY.getId()); - // typeList.add(OrganizationTypeEnum.FB.getId()); - // typeList.add(OrganizationTypeEnum.JMQY.getId()); - // typeList.add(OrganizationTypeEnum.TY.getId()); - // organizationQuery.setTypeList(typeList); + if(!StringUtils.isEmpty(request.getHospitalId())){ hospitalIdList.add(request.getHospitalId()); }else if(!StringUtils.isEmpty(request.getHospitalAreaId())){ @@ -1565,13 +1565,12 @@ public class BabyBookbuildingFacade { } } hospitalIdList.add(hospitalId); - hospitalName = organizationService.getOrganization(Integer.valueOf(hospitalId)).getName(); } List list = new ArrayList<>(); - BabyModelQuery babyQuery = new BabyModelQuery(); + babyQuery.setHospitalIdList(hospitalIdList); List models = getBabayListByCondition(request, true, babyQuery); if (CollectionUtils.isNotEmpty(models)) {