shiyang / regional-platform

Download as
Browse Code »

Commit 9a61d29bc16f5868321c5d067502ab3453735ad2

Authored by jiangjiazhi
2 parents fb853b51a5 8697c24e1d
Exists in master and in 1 other branch nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 2 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ 9a61d29
... ... @@ -268,6 +268,17 @@
268 268 br.setErrormsg("儿童就诊卡号在该医院已经建档");
269 269 return br;
270 270 }
  271 +
  272 + PatientsQuery patientsQuery = new PatientsQuery();
  273 + patientsQuery.setVcCardNo(request.getVcCardNo());
  274 + patientsQuery.setHospitalId(request.getHospitalId());
  275 + List<Patients> patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery);
  276 + if (CollectionUtils.isNotEmpty(patients))
  277 + {
  278 + br.setErrorcode(ErrorCodeConstants.DATA_EXIST);
  279 + br.setErrormsg("该就诊卡号在该医院已经建档");
  280 + return br;
  281 + }
271 282 }
272 283  
273 284 Patients patients = null;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java View file @ 9a61d29
... ... @@ -117,8 +117,6 @@
117 117 if (StringUtils.isNotEmpty(yunRequest.getVcCardNo()))
118 118 {
119 119 patientsQuery.setCardNo(null);
120   - patientsQuery.setBuildTypeEq(null);
121   - patientsQuery.setDueStatus(null);
122 120 patientsQuery.setPhone(null);
123 121 patientsQuery.setVcCardNo(yunRequest.getVcCardNo());
124 122 patientsQuery.setHospitalId(yunRequest.getHospitalId());
... ... @@ -390,8 +388,6 @@
390 388 if (StringUtils.isNotEmpty(yunRequest.getVcCardNo()))
391 389 {
392 390 patientsQuery.setCardNo(null);
393   - patientsQuery.setBuildTypeEq(null);
394   - patientsQuery.setDueStatus(null);
395 391 patientsQuery.setPhone(null);
396 392 patientsQuery.setVcCardNo(yunRequest.getVcCardNo());
397 393 patientsQuery.setHospitalId(yunRequest.getHospitalId());