Commit 95ec5051d567128c29c918345970abe441a6bc2d
1 parent
b898f4abaa
Exists in
master
修改产检删除
Showing 2 changed files with 28 additions and 1 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
View file @
95ec505
| ... | ... | @@ -487,6 +487,7 @@ |
| 487 | 487 | //查询主档案 |
| 488 | 488 | patientsQuery.setExtEnable(false); |
| 489 | 489 | |
| 490 | + | |
| 490 | 491 | //如果身份证号码不为空就以身份证号码查询 |
| 491 | 492 | if (!StringUtils.isEmpty(bookbuildingQueryRequest.getCardNo())) { |
| 492 | 493 | patientsQuery.setCardNo(bookbuildingQueryRequest.getCardNo()); |
| ... | ... | @@ -510,7 +511,6 @@ |
| 510 | 511 | patientsQuery.setCardNo(patientsVc.get(0).getCardNo()); |
| 511 | 512 | patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery, "bookbuildingDate", Sort.Direction.DESC); |
| 512 | 513 | } |
| 513 | - | |
| 514 | 514 | } |
| 515 | 515 | // 如果为空，初次建档，根据就诊卡号从HIS库取患者信息 |
| 516 | 516 | else { |
| ... | ... | @@ -527,6 +527,23 @@ |
| 527 | 527 | }else if(!StringUtils.isEmpty(bookbuildingQueryRequest.getId())){ |
| 528 | 528 | // id，HuJiaqi添加，为了建档管理里面的查看单条使用 |
| 529 | 529 | patients.add(yunBookbuildingService.findOneById(bookbuildingQueryRequest.getId())); |
| 530 | + }else if(StringUtils.isNotEmpty(bookbuildingQueryRequest.getPid())){ | |
| 531 | + patientsQuery.setPid(bookbuildingQueryRequest.getPid()); | |
| 532 | + | |
| 533 | + //区域模式 | |
| 534 | + patientsQuery.setHospitalList(groupsFacade.findGroupHospital(userId,false)); | |
| 535 | + | |
| 536 | + List<Patients> patientsVc = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); | |
| 537 | + if (CollectionUtils.isNotEmpty(patientsVc)) { | |
| 538 | + if (patientsVc.get(0) == null || StringUtils.isEmpty(patientsVc.get(0).getCardNo())) { | |
| 539 | + patients = patientsVc; | |
| 540 | + } else { | |
| 541 | + patientsQuery.setHospitalId(null); | |
| 542 | + patientsQuery.setVcCardNo(null); | |
| 543 | + patientsQuery.setCardNo(patientsVc.get(0).getCardNo()); | |
| 544 | + patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery, "bookbuildingDate", Sort.Direction.DESC); | |
| 545 | + } | |
| 546 | + } | |
| 530 | 547 | } |
| 531 | 548 | |
| 532 | 549 | //历史建档记录 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BookbuildingQueryRequest.java
View file @
95ec505