Commit bbbb09b2d9bc59a78570eaa6132a8c8dda394b06

Authored by liquanyu
1 parent 4884fdb3ab

建档

Showing 1 changed file with 3 additions and 3 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java View file @ bbbb09b
... ... @@ -202,7 +202,7 @@
202 202 patientsQuery.setCardNo(yunRequest.getPregnantCertificateNum());
203 203 //判断该身份证号码是否有孕妇建档 在该医院
204 204 List<Patients> patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery);
205   - if (CollectionUtils.isNotEmpty(patients)) {
  205 + if (CollectionUtils.isNotEmpty(patients) && patients.get(0).getLastMenses().getTime() < DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod()).getTime()) {
206 206 br.setErrorcode(ErrorCodeConstants.DATA_EXIST);
207 207 br.setErrormsg("该身份证在医院已经建档");
208 208 return br;
... ... @@ -213,7 +213,7 @@
213 213 patientsQuery.setPhone(yunRequest.getPregnantPhone());
214 214 //判断该手机号码在 孕期内有没有建档
215 215 List<Patients> patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery);
216   - if (CollectionUtils.isNotEmpty(patients)) {
  216 + if (CollectionUtils.isNotEmpty(patients) && patients.get(0).getLastMenses().getTime() < DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod()).getTime()) {
217 217 br.setErrorcode(ErrorCodeConstants.DATA_EXIST);
218 218 br.setErrormsg("该手机号码已经建档");
219 219 return br;
... ... @@ -227,7 +227,7 @@
227 227 patientsQuery.setVcCardNo(yunRequest.getVcCardNo());
228 228 patientsQuery.setHospitalId(yunRequest.getHospitalId());
229 229 List<Patients> patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery);
230   - if (CollectionUtils.isNotEmpty(patients)) {
  230 + if (CollectionUtils.isNotEmpty(patients) && patients.get(0).getLastMenses().getTime() < DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod()).getTime()) {
231 231 br.setErrorcode(ErrorCodeConstants.DATA_EXIST);
232 232 br.setErrormsg("该就诊卡号在该医院已经建档");
233 233 return br;