diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/ResidentsArchiveModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/ResidentsArchiveModel.java index 870aeb0..3b7a2cd 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/ResidentsArchiveModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/ResidentsArchiveModel.java @@ -199,6 +199,17 @@ public class ResidentsArchiveModel extends BaseModel { //婚检时间 private Date checkupTime; + + private FilePathModel filePath; + + public FilePathModel getFilePath() { + return filePath; + } + + public void setFilePath(FilePathModel filePath) { + this.filePath = filePath; + } + public Date getCheckupTime() { return checkupTime; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index b4d8a23..5ff64c4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -2164,7 +2164,7 @@ public class BabyBookbuildingFacade { map.put("hisPatient", fnfyHisService.getPatientInfoList(param.getVcCardNo())); } else if ("4".equals(HIS_VERSION)) { - List > hisPatient = qhdfyHisService.getPatientInfoList(param.getVcCardNo()); + List > hisPatient = qhdfyHisService.getPatientInfoList(StringUtils.isNotEmpty(param.getVcCardNo()) ? param.getVcCardNo() : param.getsINCard()); if (CollectionUtils.isNotEmpty(hisPatient)) { Map babyHis = hisPatient.get(0); if (babyHis != null && babyHis.get("phone") != null && StringUtils.isNotEmpty(babyHis.get("phone").toString())) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java index c1c7179..520a4db 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java @@ -122,6 +122,12 @@ public class ResidentsArchiveFacade { if (archiveModel == null && residents.size() != 0) { archiveModel = residents.get(0); } + if (archiveModel != null) + { + FilePathModel filePath = yunBookbuildingService.findFilePath(archiveModel.getId()); + archiveModel.setFilePath(filePath); + } + return new BaseObjectResponse().setData(archiveModel).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); }