jiangjiazhi / regional-platform

Download as
Browse Code »

Commit a207903fb8d84fea1c7a069cea563cb2e4cbaaed

Authored by shiyang
1 parent 3f32a1658a
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 1 changed file with 29 additions and 50 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java View file @ a207903
... ... @@ -1406,9 +1406,9 @@
1406 1406 temp.put("healthCheckTypeWhole", null!=babyEyeCheck.getHealthCheckTypeWhole()?babyEyeCheck.getHealthCheckTypeWhole():0);
1407 1407 temp.put("kindergarten", null!=babyEyeCheck.getKindergarten()?babyEyeCheck.getKindergarten():0);
1408 1408 temp.put("basicOrganization", null!=babyEyeCheck.getBasicOrganization()?babyEyeCheck.getBasicOrganization():0);
1409   - //居住地
1410   - temp.put("hospitalName", babyEyeCheck.getHospitalName());
1411 1409 //检查医院
  1410 + temp.put("hospitalName", babyEyeCheck.getCheckHospital());
  1411 + //居住地
1412 1412 temp.put("completeAddress",babyEyeCheck.getCompleteAddress());
1413 1413 CollectionUtils.removeNullValue(temp);
1414 1414 restMap.add(temp);
1415 1415  
1416 1416  
1417 1417  
... ... @@ -2427,36 +2427,31 @@
2427 2427 if(null!=basicOrganization){
2428 2428 criteria.and("basicOrganization").is(basicOrganization);
2429 2429 }
2430   - //检查医院
2431   - if(StringUtils.isNotEmpty(ckHospitalId)){
2432   - criteria.and("hospitalId").is(ckHospitalId);
2433   - }
2434 2430 //区域医院筛选条件得到机构ID集合
2435 2431 List <String> hospitalIdList = new ArrayList <>();
2436 2432 if (StringUtils.isNotEmpty(hospitalProvinceId)){
2437 2433 OrganizationQuery organizationQuery = new OrganizationQuery();
2438   - organizationQuery.setProvinceId(hospitalProvinceId);
2439   - List <Organization> organizationListP = organizationService.queryOrganization(organizationQuery);
2440   - for (Organization organization : organizationListP) {
2441   - hospitalIdList.add(String.valueOf(organization.getId()));
2442   - }
2443   - if (StringUtils.isNotEmpty(hospitalCityId)) {
  2434 + if (StringUtils.isNotEmpty(ckHospitalId)) {
  2435 + hospitalIdList.add(ckHospitalId);
  2436 + }else if(StringUtils.isNotEmpty(hospitalAreaId)){
  2437 + organizationQuery.setAreaId(hospitalAreaId);
  2438 + List <Organization> organizationListA = organizationService.queryOrganization(organizationQuery);
  2439 + for (Organization organization : organizationListA) {
  2440 + hospitalIdList.add(String.valueOf(organization.getId()));
  2441 + }
  2442 + }else if(StringUtils.isNotEmpty(hospitalCityId)){
2444 2443 organizationQuery.setCityId(hospitalCityId);
2445 2444 List <Organization> organizationListC = organizationService.queryOrganization(organizationQuery);
2446 2445 for (Organization organization : organizationListC) {
2447 2446 hospitalIdList.add(String.valueOf(organization.getId()));
2448 2447 }
2449   - }
2450   - if (StringUtils.isNotEmpty(hospitalAreaId)) {
2451   - organizationQuery.setAreaId(hospitalAreaId);
2452   - List <Organization> organizationListA = organizationService.queryOrganization(organizationQuery);
2453   - for (Organization organization : organizationListA) {
  2448 + }else if(StringUtils.isNotEmpty(hospitalProvinceId)){
  2449 + organizationQuery.setProvinceId(hospitalProvinceId);
  2450 + List <Organization> organizationListP = organizationService.queryOrganization(organizationQuery);
  2451 + for (Organization organization : organizationListP) {
2454 2452 hospitalIdList.add(String.valueOf(organization.getId()));
2455 2453 }
2456 2454 }
2457   - if (StringUtils.isNotEmpty(ckHospitalId)) {
2458   - hospitalIdList.add(ckHospitalId);
2459   - }
2460 2455  
2461 2456 List <String> permissions = new ArrayList <>();
2462 2457 DataPermissionsModelQuery dataPermissionsModelQuery = new DataPermissionsModelQuery();
... ... @@ -2575,10 +2570,6 @@
2575 2570 babyModels.getAreaId(), babyModels.getStreetId(), babyModels.getAddress(), basicConfigService);
2576 2571 //居住地
2577 2572 babyEyeCheck.setCompleteAddress(address);
2578   - //检查医院
2579   - if(StringUtils.isNotEmpty(babyEyeCheck.getHospitalId())){
2580   - babyEyeCheck.setHospitalName(organizationService.getOrganization(Integer.valueOf(babyEyeCheck.getHospitalId())).getName());
2581   - }
2582 2573 }
2583 2574 }
2584 2575 List<Map<String, Object>> maps = setDatas(babyEyeChecks);
... ... @@ -2593,10 +2584,6 @@
2593 2584 babyModels.getAreaId(), babyModels.getStreetId(), babyModels.getAddress(), basicConfigService);
2594 2585 //居住地
2595 2586 babyEyeCheck.setCompleteAddress(address);
2596   - //检查医院
2597   - if(StringUtils.isNotEmpty(babyEyeCheck.getHospitalId())){
2598   - babyEyeCheck.setHospitalName(organizationService.getOrganization(Integer.valueOf(babyEyeCheck.getHospitalId())).getName());
2599   - }
2600 2587 }
2601 2588 }
2602 2589 pageResult.setGrid(setDatas(babyEyeChecks));
2603 2590  
2604 2591  
... ... @@ -2619,28 +2606,27 @@
2619 2606 List <String> hospitalIdList = new ArrayList <>();
2620 2607 if (StringUtils.isNotEmpty(hospitalProvinceId)){
2621 2608 OrganizationQuery organizationQuery = new OrganizationQuery();
2622   - organizationQuery.setProvinceId(hospitalProvinceId);
2623   - List <Organization> organizationListP = organizationService.queryOrganization(organizationQuery);
2624   - for (Organization organization : organizationListP) {
2625   - hospitalIdList.add(String.valueOf(organization.getId()));
2626   - }
2627   - if (StringUtils.isNotEmpty(hospitalCityId)) {
  2609 + if (StringUtils.isNotEmpty(ckHospitalId)) {
  2610 + hospitalIdList.add(ckHospitalId);
  2611 + }else if(StringUtils.isNotEmpty(hospitalAreaId)){
  2612 + organizationQuery.setAreaId(hospitalAreaId);
  2613 + List <Organization> organizationListA = organizationService.queryOrganization(organizationQuery);
  2614 + for (Organization organization : organizationListA) {
  2615 + hospitalIdList.add(String.valueOf(organization.getId()));
  2616 + }
  2617 + }else if(StringUtils.isNotEmpty(hospitalCityId)){
2628 2618 organizationQuery.setCityId(hospitalCityId);
2629 2619 List <Organization> organizationListC = organizationService.queryOrganization(organizationQuery);
2630 2620 for (Organization organization : organizationListC) {
2631 2621 hospitalIdList.add(String.valueOf(organization.getId()));
2632 2622 }
2633   - }
2634   - if (StringUtils.isNotEmpty(hospitalAreaId)) {
2635   - organizationQuery.setAreaId(hospitalAreaId);
2636   - List <Organization> organizationListA = organizationService.queryOrganization(organizationQuery);
2637   - for (Organization organization : organizationListA) {
  2623 + }else if(StringUtils.isNotEmpty(hospitalProvinceId)){
  2624 + organizationQuery.setProvinceId(hospitalProvinceId);
  2625 + List <Organization> organizationListP = organizationService.queryOrganization(organizationQuery);
  2626 + for (Organization organization : organizationListP) {
2638 2627 hospitalIdList.add(String.valueOf(organization.getId()));
2639 2628 }
2640 2629 }
2641   - if (StringUtils.isNotEmpty(ckHospitalId)) {
2642   - hospitalIdList.add(ckHospitalId);
2643   - }
2644 2630  
2645 2631 List <String> permissions = new ArrayList <>();
2646 2632 DataPermissionsModelQuery dataPermissionsModelQuery = new DataPermissionsModelQuery();
... ... @@ -2826,14 +2812,7 @@
2826 2812 babyModel.getAreaId(), babyModel.getStreetId(), babyModel.getAddress(), basicConfigService);
2827 2813 mapResult.put("completeAddress",address);
2828 2814 //检查医院
2829   - String hospitalName=null;
2830   - if(StringUtils.isNotEmpty(babyModel.getId())){
2831   - List<BabyEyeCheck> babyEyeChecks=mongoTemplate.find(Query.query(new Criteria("babyId").is(babyModel.getId())).with(new Sort(Sort.Direction.DESC, "checkTime")), BabyEyeCheck.class);
2832   - if(CollectionUtils.isNotEmpty(babyEyeChecks)){
2833   - hospitalName=organizationService.getOrganization(Integer.valueOf(babyEyeChecks.get(0).getHospitalId())).getName();
2834   - }
2835   -
2836   - }
  2815 + String hospitalName=organizationService.getOrganization(Integer.valueOf(babyModel.getHospitalId())).getName();
2837 2816 mapResult.put("hospitalName",hospitalName);
2838 2817 StringBuilder positiveBaby = getYxxmBaby(babyModel);//阳性项目
2839 2818 mapResult.put("positive", positiveBaby.toString());//阳性项目