liquanyu / regional-platform

Download as
Browse Code »

Commit d39940737d82a2f0d413a521f5cde29ff022b358

Authored by Administrator
1 parent 209e8d907a
Exists in master and in 1 other branch dev

update14

Showing 2 changed files with 61 additions and 53 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java View file @ d399407
... ... @@ -1289,7 +1289,7 @@
1289 1289 hospitalIds.add(hdReq.getHospitalId());
1290 1290 } else {
1291 1291 //获取用户拥有的权限医院和条件筛选的医院交集
1292   - hospitalIds = areaCountFacade.getCurrentUserHospPermissions(loginState.getId(), hdReq.getOrgProvinceId(), hdReq.getOrgCityId(), hdReq.getAreaId());
  1292 + hospitalIds = areaCountFacade.getCurrentUserHospPermissions(loginState.getId(), hdReq.getOrgProvinceId(), hdReq.getOrgCityId(), hdReq.getOrgAreaId());
1293 1293 }
1294 1294 //当前登录人医院Id
1295 1295 // String hospitalId = autoMatchFacade.getHospitalId(loginState.getId());
1296 1296  
1297 1297  
1298 1298  
... ... @@ -1316,21 +1316,23 @@
1316 1316 query.setConfirmEndTime(hdReq.getConfirmEndTime());
1317 1317 }
1318 1318  
1319   - //省市区查询儿童列表信息
1320   - BabyModelQuery modelQuery = new BabyModelQuery();
1321   - modelQuery.setProvinceId(hdReq.getProvinceId());
1322   - modelQuery.setCityId(hdReq.getCityId());
1323   - modelQuery.setAreaId(hdReq.getAreaId());
1324   - modelQuery.setStreetId(hdReq.getStreetId());
1325   - modelQuery.setAreaId(hdReq.getAreaId());
1326   - List<BabyModel> babyModels = babyService.queryBabyWithQuery(modelQuery);
1327 1319 List<String> list = new ArrayList<>();
1328   - if (CollectionUtils.isNotEmpty(babyModels)) {
1329   - for (BabyModel babyModel : babyModels) {
1330   - list.add(babyModel.getId());
  1320 + if (StringUtils.isNotEmpty(hdReq.getProvinceId())) {
  1321 + //省市区查询儿童列表信息
  1322 + BabyModelQuery modelQuery = new BabyModelQuery();
  1323 + modelQuery.setProvinceId(hdReq.getProvinceId());
  1324 + modelQuery.setCityId(hdReq.getCityId());
  1325 + modelQuery.setAreaId(hdReq.getAreaId());
  1326 + modelQuery.setStreetId(hdReq.getStreetId());
  1327 + modelQuery.setAreaId(hdReq.getAreaId());
  1328 + List<BabyModel> babyModels = babyService.queryBabyWithQuery(modelQuery);
  1329 + if (CollectionUtils.isNotEmpty(babyModels)) {
  1330 + for (BabyModel babyModel : babyModels) {
  1331 + list.add(babyModel.getId());
  1332 + }
1331 1333 }
1332   - }
1333 1334  
  1335 + }
1334 1336 BabyPatientExtendEarBabyQuery babyQuery = new BabyPatientExtendEarBabyQuery();
1335 1337 babyQuery.setQueryNo(hdReq.getKeyWord());
1336 1338 babyQuery.setBirthStart(hdReq.getBirthStartTime());
1337 1339  
1338 1340  
1339 1341  
... ... @@ -1488,27 +1490,29 @@
1488 1490 hospitalIds.add(model.getHospitalId());
1489 1491 } else {
1490 1492 //获取用户拥有的权限医院和条件筛选的医院交集
1491   - hospitalIds = areaCountFacade.getCurrentUserHospPermissions(loginState.getId(), model.getOrgProvinceId(), model.getOrgCityId(), model.getAreaId());
  1493 + hospitalIds = areaCountFacade.getCurrentUserHospPermissions(loginState.getId(), model.getOrgProvinceId(), model.getOrgCityId(), model.getOrgAreaId());
1492 1494 }
1493 1495 //当前登录人医院Id
1494 1496 //String hospitalId = autoMatchFacade.getHospitalId(loginState.getId());
1495 1497  
1496 1498 List<String> babyIds = new ArrayList<>();
1497   - //省市区查询儿童列表信息
1498   - BabyModelQuery modelQuery = new BabyModelQuery();
1499   - modelQuery.setProvinceId(model.getProvinceId());
1500   - modelQuery.setCityId(model.getCityId());
1501   - modelQuery.setAreaId(model.getAreaId());
1502   - modelQuery.setStreetId(model.getStreetId());
1503   - modelQuery.setAreaId(model.getAreaId());
1504   - List<BabyModel> babyModels = babyService.queryBabyWithQuery(modelQuery);
1505 1499 List<String> list = new ArrayList<>();
1506   - if (CollectionUtils.isNotEmpty(babyModels)) {
1507   - for (BabyModel babyModel : babyModels) {
1508   - list.add(babyModel.getId());
  1500 + if (StringUtils.isNotEmpty(model.getProvinceId())) {
  1501 + //省市区查询儿童列表信息
  1502 + BabyModelQuery modelQuery = new BabyModelQuery();
  1503 + modelQuery.setProvinceId(model.getProvinceId());
  1504 + modelQuery.setCityId(model.getCityId());
  1505 + modelQuery.setAreaId(model.getAreaId());
  1506 + modelQuery.setStreetId(model.getStreetId());
  1507 + modelQuery.setAreaId(model.getAreaId());
  1508 + List<BabyModel> babyModels = babyService.queryBabyWithQuery(modelQuery);
  1509 +
  1510 + if (CollectionUtils.isNotEmpty(babyModels)) {
  1511 + for (BabyModel babyModel : babyModels) {
  1512 + list.add(babyModel.getId());
  1513 + }
1509 1514 }
1510 1515 }
1511   -
1512 1516 BabyPatientExtendEarBabyQuery babyQuery = new BabyPatientExtendEarBabyQuery();
1513 1517 babyQuery.setQueryNo(model.getKeyWord());
1514 1518 babyQuery.setBirthStart(model.getBirthStartTime());
... ... @@ -1678,7 +1682,7 @@
1678 1682 hospitalIds.add(model.getHospitalId());
1679 1683 } else {
1680 1684 //获取用户拥有的权限医院和条件筛选的医院交集
1681   - hospitalIds = areaCountFacade.getCurrentUserHospPermissions(loginState.getId(), model.getOrgProvinceId(), model.getOrgCityId(), model.getAreaId());
  1685 + hospitalIds = areaCountFacade.getCurrentUserHospPermissions(loginState.getId(), model.getOrgProvinceId(), model.getOrgCityId(), model.getOrgAreaId());
1682 1686 }
1683 1687  
1684 1688  
1685 1689  
... ... @@ -1737,18 +1741,21 @@
1737 1741 babyQuery.setBirthStart(end);
1738 1742 }
1739 1743  
1740   - //省市区查询儿童列表信息
1741   - BabyModelQuery modelQuery = new BabyModelQuery();
1742   - modelQuery.setProvinceId(model.getProvinceId());
1743   - modelQuery.setCityId(model.getCityId());
1744   - modelQuery.setAreaId(model.getAreaId());
1745   - modelQuery.setStreetId(model.getStreetId());
1746   - modelQuery.setAreaId(model.getAreaId());
1747   - List<BabyModel> baby = babyService.queryBabyWithQuery(modelQuery);
1748 1744 List<String> list = new ArrayList<>();
1749   - if (CollectionUtils.isNotEmpty(baby)) {
1750   - for (BabyModel babyModel : baby) {
1751   - list.add(babyModel.getId());
  1745 + if (StringUtils.isNotEmpty(model.getProvinceId())) {
  1746 + //省市区查询儿童列表信息
  1747 + BabyModelQuery modelQuery = new BabyModelQuery();
  1748 + modelQuery.setProvinceId(model.getProvinceId());
  1749 + modelQuery.setCityId(model.getCityId());
  1750 + modelQuery.setAreaId(model.getAreaId());
  1751 + modelQuery.setStreetId(model.getStreetId());
  1752 + modelQuery.setAreaId(model.getAreaId());
  1753 + List<BabyModel> baby = babyService.queryBabyWithQuery(modelQuery);
  1754 +
  1755 + if (CollectionUtils.isNotEmpty(baby)) {
  1756 + for (BabyModel babyModel : baby) {
  1757 + list.add(babyModel.getId());
  1758 + }
1752 1759 }
1753 1760 }
1754 1761 babyQuery.setHospitalIds(hospitalIds.toArray(new String[hospitalIds.size()]));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HighriskChangeHospitalController.java View file @ d399407
... ... @@ -626,25 +626,26 @@
626 626 hospitalIds.add(query.getHospitalId());
627 627 } else {
628 628 //获取用户拥有的权限医院和条件筛选的医院交集
629   - hospitalIds = areaCountFacade.getCurrentUserHospPermissions(loginState.getId(), query.getOrgProvinceId(), query.getOrgCityId(), query.getAreaId());
  629 + hospitalIds = areaCountFacade.getCurrentUserHospPermissions(loginState.getId(), query.getOrgProvinceId(), query.getOrgCityId(), query.getOrgAreaId());
630 630 }
631 631 String[] hospitalIdArry = new String[hospitalIds.size()];
632   -
633   - //查询省市区
634   - BabyModelQuery modelQuery = new BabyModelQuery();
635   - modelQuery.setProvinceId(query.getProvinceId());
636   - modelQuery.setCityId(query.getCityId());
637   - modelQuery.setAreaId(query.getAreaId());
638   - modelQuery.setStreetId(query.getStreetId());
639   - modelQuery.setAreaId(query.getAreaId());
640   - List<BabyModel> babyModels = babyService.queryBabyWithQuery(modelQuery);
641 632 List<String> list = new ArrayList<>();
642   - if (CollectionUtils.isNotEmpty(babyModels)) {
643   - for (BabyModel babyModel : babyModels) {
644   - list.add(babyModel.getId());
  633 + if (StringUtils.isNotEmpty(query.getProvinceId())) {
  634 + //查询省市区
  635 + BabyModelQuery modelQuery = new BabyModelQuery();
  636 + modelQuery.setProvinceId(query.getProvinceId());
  637 + modelQuery.setCityId(query.getCityId());
  638 + modelQuery.setAreaId(query.getAreaId());
  639 + modelQuery.setStreetId(query.getStreetId());
  640 + modelQuery.setAreaId(query.getAreaId());
  641 + List<BabyModel> babyModels = babyService.queryBabyWithQuery(modelQuery);
  642 + if (CollectionUtils.isNotEmpty(babyModels)) {
  643 + for (BabyModel babyModel : babyModels) {
  644 + list.add(babyModel.getId());
  645 + }
645 646 }
646   - }
647 647  
  648 + }
648 649 if (type != null && type == 1) {//转出
649 650 query.setOutOrgidArry(hospitalIds.toArray(hospitalIdArry));
650 651 } else if (type != null && type == 0) {//转入儿童
... ... @@ -663,7 +664,7 @@
663 664 if (type != null && type == 1) {//转出
664 665 babyQuery.setHospitalIds(hospitalIds.toArray(hospitalIdArry));
665 666 }
666   - babyQuery.setBabyPatientIds(list.toArray(new String[babyModels.size()]));
  667 + babyQuery.setBabyPatientIds(list.toArray(new String[list.size()]));
667 668 List<BabyPatientExtendEarBaby> models = earBabyService.queryBabyPatientExtendEarBaby(babyQuery);
668 669 //查询建档记录
669 670 if (CollectionUtils.isNotEmpty(models)) {