Commit 4e27079d9ff5857c06c7f4650b3088602476ef8c
1 parent
e5307c66d1
Exists in
master
and in
2 other branches
1
Showing 2 changed files with 8 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
View file @
4e27079
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
View file @
4e27079
| ... | ... | @@ -601,14 +601,20 @@ |
| 601 | 601 | Patients patients3 = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, organizationGroupsFacade.findGroupHospital(userId, false), 3, false, null, isEnable); |
| 602 | 602 | PersonModelQuery personModelQuery = new PersonModelQuery(); |
| 603 | 603 | String pid = ""; |
| 604 | + Integer buildType = null; | |
| 604 | 605 | if (null != patients1) { |
| 605 | 606 | pid = patients1.getPid(); |
| 607 | + buildType = patients1.getBuildType(); | |
| 606 | 608 | } else if (null != patients) { |
| 607 | 609 | pid = patients.getPid(); |
| 610 | + buildType = patients.getBuildType(); | |
| 608 | 611 | } else if (null != patients3) { |
| 609 | 612 | pid = patients3.getPid(); |
| 613 | + buildType = patients3.getBuildType(); | |
| 610 | 614 | } |
| 611 | - if (StringUtils.isNotEmpty(pid)) { | |
| 615 | + //http://jira.healthbaby.com.cn/browse/WEB-795 | |
| 616 | + if (StringUtils.isNotEmpty(pid) && null != buildType && | |
| 617 | + buildType != 2) { | |
| 612 | 618 | personModelQuery.setId(pid); |
| 613 | 619 | List<PersonModel> personModels = personService.queryPersons(personModelQuery); |
| 614 | 620 | if (CollectionUtils.isNotEmpty(personModels)) { |