Commit defc5864faebd8a07d09e177906a72f796d2965c
Exists in
master
and in
1 other branch
Merge branch 'master' of https://git.healthbaby.com.cn/jiangjiazhi/regional-platform
Showing 3 changed files
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
View file @
defc586
| ... | ... | @@ -72,19 +72,30 @@ |
| 72 | 72 | patientsQuery.setType(1); |
| 73 | 73 | patientsQuery.setHospitalId(yunRequest.getHospitalId()); |
| 74 | 74 | |
| 75 | - patientsQuery.setCardNo(yunRequest.getPregnantCertificateNum()); | |
| 76 | - | |
| 77 | 75 | if (yunRequest.getPregnantCertificateNum() != null) |
| 78 | 76 | { |
| 77 | + patientsQuery.setCardNo(yunRequest.getPregnantCertificateNum()); | |
| 79 | 78 | //判断该身份证号码是否有孕妇建档 在该医院 |
| 80 | 79 | List<Patients> patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); |
| 81 | 80 | if (CollectionUtils.isNotEmpty(patients)) |
| 82 | 81 | { |
| 83 | 82 | br.setErrorcode(ErrorCodeConstants.DATA_EXIST); |
| 84 | - br.setErrormsg("孕妇在该医院已建档"); | |
| 83 | + br.setErrormsg("该身份证在医院已经建档"); | |
| 85 | 84 | return br; |
| 86 | 85 | } |
| 87 | 86 | } |
| 87 | + if (yunRequest.getPregnantPhone() != null) | |
| 88 | + { | |
| 89 | + patientsQuery.setPhone(yunRequest.getPregnantPhone()); | |
| 90 | + //判断该手机号码在 孕期内有没有建档 | |
| 91 | + List<Patients> patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); | |
| 92 | + if (CollectionUtils.isNotEmpty(patients)) | |
| 93 | + { | |
| 94 | + br.setErrorcode(ErrorCodeConstants.DATA_EXIST); | |
| 95 | + br.setErrormsg("该手机号码已经建档"); | |
| 96 | + return br; | |
| 97 | + } | |
| 98 | + } | |
| 88 | 99 | |
| 89 | 100 | |
| 90 | 101 | |
| ... | ... | @@ -243,6 +254,7 @@ |
| 243 | 254 | } |
| 244 | 255 | result.setBookbuildDate(DateUtil.getyyyy_MM_dd(pat.getBookbuildingDate())); |
| 245 | 256 | result.setId(pat.getId()); |
| 257 | + result.setType(pat.getType()); | |
| 246 | 258 | results.add(result); |
| 247 | 259 | } |
| 248 | 260 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java
View file @
defc586
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BookbuildingRecordResult.java
View file @
defc586
| ... | ... | @@ -13,7 +13,17 @@ |
| 13 | 13 | //医院ID |
| 14 | 14 | private String hospitalId; |
| 15 | 15 | |
| 16 | - | |
| 16 | + //1孕妇 3产妇 | |
| 17 | + private Integer type; | |
| 18 | + | |
| 19 | + public Integer getType() { | |
| 20 | + return type; | |
| 21 | + } | |
| 22 | + | |
| 23 | + public void setType(Integer type) { | |
| 24 | + this.type = type; | |
| 25 | + } | |
| 26 | + | |
| 17 | 27 | public String getId() { |
| 18 | 28 | return id; |
| 19 | 29 | } |