Commit 9c891da36b56be45eebb3575b1b7646bee644630
1 parent
2769754b28
Exists in
master
and in
6 other branches
产检
Showing 1 changed file with 5 additions and 5 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
9c891da
| ... | ... | @@ -2661,15 +2661,15 @@ |
| 2661 | 2661 | } |
| 2662 | 2662 | |
| 2663 | 2663 | if (null == patients) { |
| 2664 | - if (StringUtils.isNotEmpty(queryRequest.getCardNo())) { | |
| 2664 | + if (StringUtils.isNotEmpty(queryRequest.getCardNo()) && StringUtils.isNotEmpty(queryRequest.getVcCardNo())) { | |
| 2665 | 2665 | patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, currentGroupHospital, 3, false, null, og.getbStatus() == 1); |
| 2666 | 2666 | } |
| 2667 | 2667 | |
| 2668 | 2668 | //原来单机 |
| 2669 | -// if (null != patients) { | |
| 2670 | -// return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("该孕妇在系统中已分娩/已终止妊娠不能再进行产检，请重新建档"); | |
| 2671 | -// } | |
| 2672 | -// return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("该孕妇还未在本院建档不能进行产检"); | |
| 2669 | + if (null != patients) { | |
| 2670 | + return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("该孕妇在系统中已分娩/已终止妊娠不能再进行产检，请重新建档"); | |
| 2671 | + } | |
| 2672 | + return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("该孕妇还未在本院建档不能进行产检"); | |
| 2673 | 2673 | } |
| 2674 | 2674 | |
| 2675 | 2675 |