jiangjiazhi / regional-platform | GitLab

Commit 4a3bca5c800e63f59c59654faaa2f3d7404a07c1

Authored by tranny over 4 years ago

1 parent 82616a7c06

Exists in master and in 6 other branches

短信保存

Showing 3 changed files with 18 additions and 1 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/ResidentsArchiveModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java

...	...	@@ -199,6 +199,17 @@
199	199	//婚检时间
200	200	private Date checkupTime;
201	201
	202	+
	203	+ private FilePathModel filePath;
	204	+
	205	+ public FilePathModel getFilePath() {
	206	+ return filePath;
	207	+ }
	208	+
	209	+ public void setFilePath(FilePathModel filePath) {
	210	+ this.filePath = filePath;
	211	+ }
	212	+
202	213	public Date getCheckupTime() {
203	214	return checkupTime;
204	215	}

...	...	@@ -2164,7 +2164,7 @@
2164	2164	map.put("hisPatient", fnfyHisService.getPatientInfoList(param.getVcCardNo()));
2165	2165	} else if ("4".equals(HIS_VERSION)) {
2166	2166
2167		- List <Map <String, Object>> hisPatient = qhdfyHisService.getPatientInfoList(param.getVcCardNo());
	2167	+ List <Map <String, Object>> hisPatient = qhdfyHisService.getPatientInfoList(StringUtils.isNotEmpty(param.getVcCardNo()) ? param.getVcCardNo() : param.getsINCard());
2168	2168	if (CollectionUtils.isNotEmpty(hisPatient)) {
2169	2169	Map <String, Object> babyHis = hisPatient.get(0);
2170	2170	if (babyHis != null && babyHis.get("phone") != null && StringUtils.isNotEmpty(babyHis.get("phone").toString())) {

...	...	@@ -122,6 +122,12 @@
122	122	if (archiveModel == null && residents.size() != 0) {
123	123	archiveModel = residents.get(0);
124	124	}
	125	+ if (archiveModel != null)
	126	+ {
	127	+ FilePathModel filePath = yunBookbuildingService.findFilePath(archiveModel.getId());
	128	+ archiveModel.setFilePath(filePath);
	129	+ }
	130	+
125	131	return new BaseObjectResponse().setData(archiveModel).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
126	132	}
127	133