Commit aa80cded2b8883ca6c9d14041e62b020391f966e
1 parent
8da58d6ba1
Exists in
master
and in
6 other branches
产检
Showing 1 changed file with 17 additions and 12 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
aa80cde
| ... | ... | @@ -3497,6 +3497,7 @@ |
| 3497 | 3497 | */ |
| 3498 | 3498 | public Patients findOnePatient(String cardNo, String vcCardNo, String id, List <String> hospitalId, Integer |
| 3499 | 3499 | type, boolean outHospital, String pid, boolean isEnable) { |
| 3500 | + //queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, currentGroupHospital, 3, false, null, og.getbStatus() == 1 | |
| 3500 | 3501 | PatientsQuery patientsQuery = new PatientsQuery(); |
| 3501 | 3502 | if (StringUtils.isNotEmpty(cardNo)) { |
| 3502 | 3503 | patientsQuery.setCardNo(cardNo); |
| 3503 | 3504 | |
| ... | ... | @@ -3506,15 +3507,18 @@ |
| 3506 | 3507 | patientsQuery.setPid(pid); |
| 3507 | 3508 | } |
| 3508 | 3509 | |
| 3509 | - if (StringUtils.isNotEmpty(vcCardNo)) { | |
| 3510 | - //德州市妇幼保健院医院通过（就诊卡号、银行卡号，社保卡号） 查询出对应的用过的卡号 add lqy | |
| 3511 | - if (CollectionUtils.isNotEmpty(hospitalId) && hospitalId.contains("1000000114")) { | |
| 3512 | - patientsQuery.setVcCardNos(dzfyHisService.getDzVcCardNos(vcCardNo)); | |
| 3513 | - } else { | |
| 3514 | - patientsQuery.setVcCardNo(vcCardNo); | |
| 3510 | + if (StringUtils.isNotEmpty(cardNo)) { | |
| 3511 | + if (StringUtils.isNotEmpty(vcCardNo)) { | |
| 3512 | + //德州市妇幼保健院医院通过（就诊卡号、银行卡号，社保卡号） 查询出对应的用过的卡号 add lqy | |
| 3513 | + if (CollectionUtils.isNotEmpty(hospitalId) && hospitalId.contains("1000000114")) { | |
| 3514 | + patientsQuery.setVcCardNos(dzfyHisService.getDzVcCardNos(vcCardNo)); | |
| 3515 | + } else { | |
| 3516 | + patientsQuery.setVcCardNo(vcCardNo); | |
| 3517 | + } | |
| 3515 | 3518 | } |
| 3516 | 3519 | } |
| 3517 | 3520 | |
| 3521 | + | |
| 3518 | 3522 | patientsQuery.setType(type); |
| 3519 | 3523 | patientsQuery.setHospitalList(hospitalId); |
| 3520 | 3524 | patientsQuery.setYn(YnEnums.YES.getId()); |
| 3521 | 3525 | |
| ... | ... | @@ -3742,13 +3746,14 @@ |
| 3742 | 3746 | e.printStackTrace(); |
| 3743 | 3747 | } |
| 3744 | 3748 | |
| 3745 | - } else { | |
| 3746 | - //原来单机 | |
| 3747 | - if (null != patients) { | |
| 3748 | - return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("该孕妇在系统中已分娩/已终止妊娠不能再进行产检，请重新建档"); | |
| 3749 | - } | |
| 3750 | - return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("该孕妇还未在本院建档不能进行产检"); | |
| 3751 | 3749 | } |
| 3750 | +// else { | |
| 3751 | +// //原来单机 | |
| 3752 | +// if (null != patients) { | |
| 3753 | +// return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("该孕妇在系统中已分娩/已终止妊娠不能再进行产检，请重新建档"); | |
| 3754 | +// } | |
| 3755 | +// return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("该孕妇还未在本院建档不能进行产检"); | |
| 3756 | +// } | |
| 3752 | 3757 | |
| 3753 | 3758 | } |
| 3754 | 3759 | } |