jiangjiazhi / regional-platform

Commit 632c0ea9b59c759f6fddad0a39fe11fec4341742

Authored by liquanyu over 5 years ago

Exists in master and in 6 other branches

访视

Showing 2 changed files with 20 additions and 1 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatdeliverFollowListResult.java

...	...	@@ -2094,7 +2094,13 @@
2094	2094	else
2095	2095	{
2096	2096	//产后休养地
2097		- matdeliverFollowListResult.setPostpartumAddress(CommonsHelper.getResidence(patients.getProvincePostRestId(), patients.getCityPostRestId(), patients.getAreaPostRestId(), patients.getStreetPostRestId(), patients.getAddressPostRest(), basicConfigService));
	2097	+ matdeliverFollowListResult.setPostpartumAddress(CommonsHelper.getResidence(
	2098	+ patients.getProvincePostRestId() != null ? patients.getProvincePostRestId() : patients.getProvinceRegisterId(),
	2099	+ patients.getCityPostRestId() != null ? patients.getCityPostRestId() : patients.getCityRegisterId(),
	2100	+ patients.getAreaPostRestId() != null ? patients.getAreaPostRestId() : patients.getAreaRegisterId(),
	2101	+ patients.getStreetPostRestId() != null ? patients.getStreetPostRestId() : patients.getStreetRegisterId(),
	2102	+ patients.getAddressPostRest() != null ? patients.getAddressPostRest() : patients.getAddressRegister(),
	2103	+ basicConfigService));
2098	2104	}
2099	2105
2100	2106
...	...	@@ -2133,6 +2139,8 @@
2133	2139	matdeliverFollowListResult.setMatFollowId(deliverModel.getMatFollowId());
2134	2140	matdeliverFollowListResult.setDueDate(deliverModel.getDueDate());
2135	2141	matdeliverFollowListResult.setId(deliverModel.getId());
	2142	+ matdeliverFollowListResult.setVisitStatus(PostpartumFollowMakeEnums.StatusEnum.getTitle(deliverModel.getVisitStatus()));
	2143	+
2136	2144	//机构信息
2137	2145	try {
2138	2146	Organization organization = organizationService.getOrganization(Integer.valueOf(deliverModel.getFmHospital()));

...	...	@@ -165,6 +165,17 @@
165	165	*/
166	166	private String addressZJ;
167	167
	168	+ //访视状态 DFS(1, "待访视"), YFS(2, "已访视");
	169	+ private String visitStatus;
	170	+
	171	+ public String getVisitStatus() {
	172	+ return visitStatus;
	173	+ }
	174	+
	175	+ public void setVisitStatus(String visitStatus) {
	176	+ this.visitStatus = visitStatus;
	177	+ }
	178	+
168	179	public String getAddressZJ() {
169	180	return addressZJ;
170	181	}