Commit 3fc2ccf502b185b14f0a4bd0a8a3183707634e75
1 parent
375639c625
Exists in
master
and in
6 other branches
公共卫生统计
Showing 1 changed file with 1 additions and 23 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java
View file @
3fc2ccf
| ... | ... | @@ -443,6 +443,7 @@ |
| 443 | 443 | //判断该证件号码是否在该医院建档 |
| 444 | 444 | query.setCertificateNum(addRequest.getCertificateNum()); |
| 445 | 445 | query.setCertificateTypeId(addRequest.getCertificateTypeId()); |
| 446 | + query.setType(addRequest.getType()); | |
| 446 | 447 | List<ResidentsArchiveModel> modelList = residentsArchiveService.queryResident(query); |
| 447 | 448 | if (CollectionUtils.isNotEmpty(modelList)) { |
| 448 | 449 | br.setErrorcode(ErrorCodeConstants.DATA_EXIST); |
| ... | ... | @@ -451,29 +452,6 @@ |
| 451 | 452 | } |
| 452 | 453 | } |
| 453 | 454 | |
| 454 | - if (StringUtils.isNotEmpty(addRequest.getPhone())) { | |
| 455 | - query.setCertificateTypeId(null); | |
| 456 | - query.setCertificateNum(null); | |
| 457 | - query.setPhone(addRequest.getPhone()); | |
| 458 | - List<ResidentsArchiveModel> modelList = residentsArchiveService.queryResident(query); | |
| 459 | - if (CollectionUtils.isNotEmpty(modelList)) { | |
| 460 | - br.setErrorcode(ErrorCodeConstants.DATA_EXIST); | |
| 461 | - br.setErrormsg("该手机号在医院已经建档"); | |
| 462 | - return br; | |
| 463 | - } | |
| 464 | - } | |
| 465 | - | |
| 466 | - if (StringUtils.isNotEmpty(addRequest.getVcCardNo())) { | |
| 467 | - query.setPhone(null); | |
| 468 | - //判断该就诊卡号是否在该医院建档 | |
| 469 | - query.setVcCardNo(addRequest.getVcCardNo()); | |
| 470 | - List<ResidentsArchiveModel> modelList = residentsArchiveService.queryResident(query); | |
| 471 | - if (CollectionUtils.isNotEmpty(modelList)) { | |
| 472 | - br.setErrorcode(ErrorCodeConstants.DATA_EXIST); | |
| 473 | - br.setErrormsg("该就诊卡号在医院已经建档"); | |
| 474 | - return br; | |
| 475 | - } | |
| 476 | - } | |
| 477 | 455 | |
| 478 | 456 | //保存建档数据 |
| 479 | 457 | Date now = new Date(); |