diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java index 8f17fb8..57f19e8 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java @@ -409,9 +409,6 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { MongoCondition con = MongoCondition.newInstance("areaPostRestId", areaIdOrRestId, MongoOper.IS); condition = condition.orCondition(new MongoCondition[]{con1, con}); } - if(null!=buildType){ - condition=condition.and("buildType",buildType,MongoOper.NE); - } if (visitstatus != -1) { condition = condition.and("isVisit", visitstatus, MongoOper.IS); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java index e38ec4a..e4e9623 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java @@ -159,7 +159,9 @@ public class BabyBookbuildingController extends BaseController { */ @RequestMapping(value = "/queryBabyList", method = RequestMethod.GET) @ResponseBody - public BaseListResponse queryBabyList(@RequestParam(value = "mcardNo", required = false) String mcardNo, + @TokenRequired + public BaseListResponse queryBabyList(HttpServletRequest httpServletRequest, + @RequestParam(value = "mcardNo", required = false) String mcardNo, @RequestParam(value = "bcardNo", required = false) String bcardNo, @RequestParam(value = "mphone", required = false) String mphone, @RequestParam(value = "startMonthAge", required = false) Integer startMonthAge, @@ -173,7 +175,7 @@ public class BabyBookbuildingController extends BaseController { @RequestParam(value = "diagnose", required = false) String diagnose, @RequestParam("page") Integer page, @RequestParam("limit") Integer limit){ - + LoginContext loginState = (LoginContext) httpServletRequest.getAttribute("loginContext"); BabyManageRequest request = new BabyManageRequest(); request.setBcardNo(bcardNo); request.setMcardNo(mcardNo); @@ -190,7 +192,7 @@ public class BabyBookbuildingController extends BaseController { request.setLimit(limit); request.setPage(page); - return babyBookbuildingFacade.queryBabyList(request); + return babyBookbuildingFacade.queryBabyList(request,loginState.getId()); } 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 b436639..b3bb3c8 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 @@ -1239,8 +1239,22 @@ public class BabyBookbuildingFacade { * @param request * @return */ - public BaseListResponse queryBabyList(BabyManageRequest request) { + public BaseListResponse queryBabyList(BabyManageRequest request,Integer userId) { + + String hospitalId = ""; + + + //得到当前登录的医院id + if (userId != null) + { + Users dbuser = usersService.getUsers(userId); + if (dbuser != null) { + hospitalId = String.valueOf(dbuser.getOrgId()); + } + } + BabyModelQuery babyQuery = new BabyModelQuery(); + babyQuery.setHospitalId(String.valueOf(hospitalId)); List models = getBabayListByCondition(request, true, babyQuery); List list = new ArrayList<>(); if (CollectionUtils.isNotEmpty(models)) { @@ -1439,6 +1453,7 @@ public class BabyBookbuildingFacade { } else { //按条件查询发送指导短信 BabyModelQuery babyQuery = new BabyModelQuery(); + babyQuery.setHospitalId(String.valueOf(hospitalId)); sendModels = getBabayListByCondition(request.getRequest(), false, babyQuery); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index 17e1afc..6d65d61 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -77,6 +77,7 @@ public class BookbuildingFacade { patientsQuery.setYn(YnEnums.YES.getId()); patientsQuery.setType(1); patientsQuery.setHospitalId(yunRequest.getHospitalId()); + patientsQuery.setBuildType(0); if (yunRequest.getPregnantCertificateNum() != null) { @@ -341,6 +342,7 @@ public class BookbuildingFacade { PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setYn(YnEnums.YES.getId()); + patientsQuery.setBuildType(0); //如果身份证号码不为空就以身份证号码查询 if (!StringUtils.isEmpty(bookbuildingQueryRequest.getCardNo())) {