Commit 5ec7ee3b0b14bee217ac949a73fd1d9ea5240b98
Exists in
master
and in
7 other branches
Merge remote-tracking branch 'origin/master'
Showing 1 changed file
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
View file @
5ec7ee3
| ... | ... | @@ -526,14 +526,8 @@ |
| 526 | 526 | //查询主档案 |
| 527 | 527 | patientsQuery.setExtEnable(false); |
| 528 | 528 | |
| 529 | - | |
| 530 | 529 | //如果身份证号码不为空就以身份证号码查询 |
| 531 | 530 | if (!StringUtils.isEmpty(bookbuildingQueryRequest.getCardNo())) { |
| 532 | - | |
| 533 | - /* if(StringUtils.isNotEmpty(group)){ | |
| 534 | - //区域模式 | |
| 535 | - patientsQuery.setHospitalList(groupsFacade.findGroupHospital(userId, false)); | |
| 536 | - }*/ | |
| 537 | 531 | patientsQuery.setCardNo(bookbuildingQueryRequest.getCardNo()); |
| 538 | 532 | patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery, "bookbuildingDate", Sort.Direction.DESC); |
| 539 | 533 | } |
| 540 | 534 | |
| ... | ... | @@ -590,10 +584,18 @@ |
| 590 | 584 | } |
| 591 | 585 | } |
| 592 | 586 | |
| 587 | + String group = groupsFacade.findByCurrentUserId(autoMatchFacade.getHospitalId(userId)); | |
| 588 | + if(StringUtils.isNotEmpty(group)){ | |
| 589 | + //区域模式 | |
| 590 | + patientsQuery.setHospitalList(groupsFacade.findGroupHospital(userId, false)); | |
| 591 | + } | |
| 592 | + int count = patientsService.queryPatientCount(patientsQuery); | |
| 593 | + | |
| 593 | 594 | //历史建档记录 |
| 594 | 595 | List<Map> list = new ArrayList<>(); |
| 595 | 596 | List<BookbuildingRecordResult> results = new ArrayList<>(); |
| 596 | 597 | if (CollectionUtils.isNotEmpty(patients)) { |
| 598 | + | |
| 597 | 599 | for (Patients pat : patients) { |
| 598 | 600 | if (pat != null) { |
| 599 | 601 | BookbuildingRecordResult result = new BookbuildingRecordResult(); |
| ... | ... | @@ -655,6 +657,8 @@ |
| 655 | 657 | |
| 656 | 658 | Map<String, Object> mapData = new HashMap<>(); |
| 657 | 659 | mapData.put("data", results); |
| 660 | +// 是否在本医院所在区域建档 | |
| 661 | + mapData.put("rBType",count>0); | |
| 658 | 662 | mapData.put("initBuildDate", DateUtil.getyyyy_MM_dd(new Date())); |
| 659 | 663 | list.add(mapData); |
| 660 | 664 |