Commit d0bc187f18b04419f00dbd7f784ff57c8a76ca97
1 parent
57e02e7ace
Exists in
master
and in
8 other branches
code update
Showing 1 changed file with 12 additions and 4 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
View file @
d0bc187
| ... | ... | @@ -529,10 +529,18 @@ |
| 529 | 529 | List<Patients> patientsVc = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); |
| 530 | 530 | if (CollectionUtils.isNotEmpty(patientsVc)) |
| 531 | 531 | { |
| 532 | - patientsQuery.setHospitalId(null); | |
| 533 | - patientsQuery.setVcCardNo(null); | |
| 534 | - patientsQuery.setCardNo(patientsVc.get(0).getCardNo()); | |
| 535 | - patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery,"bookbuildingDate", Sort.Direction.DESC); | |
| 532 | + if (patientsVc.get(0) == null || StringUtils.isEmpty(patientsVc.get(0).getCardNo())) | |
| 533 | + { | |
| 534 | + patients = patientsVc; | |
| 535 | + } | |
| 536 | + else | |
| 537 | + { | |
| 538 | + patientsQuery.setHospitalId(null); | |
| 539 | + patientsQuery.setVcCardNo(null); | |
| 540 | + patientsQuery.setCardNo(patientsVc.get(0).getCardNo()); | |
| 541 | + patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery,"bookbuildingDate", Sort.Direction.DESC); | |
| 542 | + } | |
| 543 | + | |
| 536 | 544 | } |
| 537 | 545 | // 如果为空，初次建档，根据就诊卡号从HIS库取患者信息 |
| 538 | 546 | else { |