shiyang / regional-platform

Download as
Browse Code »

Commit 7773f6eb1ff685a36e51cb24f7e20e7e6c8ace20

Authored by liquanyu
2 parents 5cf7798257 74b6163190
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/AntenatalExaminationFacade.java View file @ 7773f6e
... ... @@ -307,7 +307,7 @@
307 307 data.add(new AntData(modelList.get(0), patients.getLastMenses(), null != organization ? organization.getName() : ""));
308 308 } else if (CollectionUtils.isNotEmpty(stopPregs)) {
309 309 //终止妊娠记录
310   - organization = organizationService.getOrganization(Integer.valueOf(modelList.get(0).getHospitalId()));
  310 + organization = organizationService.getOrganization(Integer.valueOf(stopPregs.get(0).getHospitalId()));
311 311 data.add(new AntData(stopPregs.get(0), patients.getLastMenses(), null != organization ? organization.getName() : ""));
312 312 }
313 313 //产后复查记录
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ 7773f6e
... ... @@ -251,7 +251,7 @@
251 251 hospital= list1.get(0) + "";
252 252 }
253 253 //获取
254   - Patients patients = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null,hospital,3);
  254 + Patients patients = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null,hospital,1);
255 255 if (null == patients) {
256 256 return new BaseResponse().setErrormsg("没有相关的产妇记录").setErrorcode(ErrorCodeConstants.BUSINESS_ERROR);
257 257 }