jiangjiazhi / regional-platform

Commit 339b68b6a115bbbd773b280f4210cb8408f3ae27

Authored by liquanyu over 5 years ago

Exists in master and in 6 other branches

update

Showing 3 changed files with 103 additions and 6 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AmniocentesisFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AmnioRecordResult.java

...	...	@@ -447,13 +447,17 @@
447	447	}
448	448
449	449	public BaseResponse queryAmnioRecordView(String id, Integer userId) {
450		- AmniocentesisRecordQuery amniocentesisInfoQuery = new AmniocentesisRecordQuery();
451		- amniocentesisInfoQuery.setId(id);
452		- AmniocentesisRecordModel model = amniocentesisRecordService.queryOne(amniocentesisInfoQuery);
	450	+ AmniocentesisRecordQuery amniocentesisRecordQuery = new AmniocentesisRecordQuery();
	451	+ amniocentesisRecordQuery.setId(id);
	452	+ AmniocentesisRecordModel model = amniocentesisRecordService.queryOne(amniocentesisRecordQuery);
453	453	AmnioRecordResult resultResult = null;
454	454	if (model != null)
455	455	{
456		- resultResult = viewFacade.queryAmnioRecordView(model);
	456	+
	457	+ AmniocentesisInfoQuery amniocentesisInfoQuery = new AmniocentesisInfoQuery();
	458	+ amniocentesisInfoQuery.setId(model.getAmnioId());
	459	+ AmniocentesisInfoModel amniocentesisInfo = amniocentesisInfoService.queryOneAmniocentesis(amniocentesisInfoQuery);
	460	+ resultResult = viewFacade.queryAmnioRecordView(model,amniocentesisInfo);
457	461	}
458	462	return new BaseObjectResponse().setData(resultResult).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION);
459	463	}

...	...	@@ -216,7 +216,7 @@
216	216	}
217	217
218	218
219		- public AmnioRecordResult queryAmnioRecordView(AmniocentesisRecordModel destModel) {
	219	+ public AmnioRecordResult queryAmnioRecordView(AmniocentesisRecordModel destModel,AmniocentesisInfoModel amniocentesisInfo) {
220	220	AmnioRecordResult data = new AmnioRecordResult();
221	221	data.convertToResult(destModel);
222	222	String hospital = "";
...	...	@@ -237,7 +237,21 @@
237	237	}
238	238	}
239	239	data.setOperationUser(user);
240		- return null;
	240	+ data.setPhone(amniocentesisInfo.getPhone());
	241	+ data.setPname(amniocentesisInfo.getName());
	242	+ data.setPprofessionType(getBasicConfig(amniocentesisInfo.getProfTypeId()));
	243	+ data.setPage(String.valueOf(DateUtil.getAge(amniocentesisInfo.getBirthday())));
	244	+ data.setHname(amniocentesisInfo.getHname());
	245	+
	246	+
	247	+ data.setHprofessionType(getBasicConfig(amniocentesisInfo.getHprofTypeId()));
	248	+ data.setHage(String.valueOf(DateUtil.getAge(amniocentesisInfo.getHbirthday())));
	249	+
	250	+ data.setAddress(CommonsHelper.getResidence(amniocentesisInfo.getProvinceId(), amniocentesisInfo.getCityId(),
	251	+ amniocentesisInfo.getAreaId(), amniocentesisInfo.getStreetId(), amniocentesisInfo.getAddress(),
	252	+ basicConfigService));
	253	+
	254	+ return data;
241	255	}
242	256
243	257

...	...	@@ -110,6 +110,21 @@
110	110	private String hospitalName;
111	111
112	112
	113	+ private String phone;
	114	+
	115	+ private String pname;
	116	+ private String pprofessionType;
	117	+
	118	+ private String page;
	119	+
	120	+ private String hname;
	121	+ private String hage;
	122	+ private String hprofessionType;
	123	+ private String address;
	124	+
	125	+
	126	+
	127	+
113	128	@Override
114	129	public AmnioRecordResult convertToResult(AmniocentesisRecordModel destModel) {
115	130	setAmnioId(destModel.getAmnioId());
...	...	@@ -155,6 +170,70 @@
155	170	if (StringUtils.isNotEmpty(status) && "2".equals(status))
156	171	return content;
157	172	return "";
	173	+ }
	174	+
	175	+ public String getPhone() {
	176	+ return phone;
	177	+ }
	178	+
	179	+ public void setPhone(String phone) {
	180	+ this.phone = phone;
	181	+ }
	182	+
	183	+ public String getPname() {
	184	+ return pname;
	185	+ }
	186	+
	187	+ public void setPname(String pname) {
	188	+ this.pname = pname;
	189	+ }
	190	+
	191	+ public String getPprofessionType() {
	192	+ return pprofessionType;
	193	+ }
	194	+
	195	+ public void setPprofessionType(String pprofessionType) {
	196	+ this.pprofessionType = pprofessionType;
	197	+ }
	198	+
	199	+ public String getPage() {
	200	+ return page;
	201	+ }
	202	+
	203	+ public void setPage(String page) {
	204	+ this.page = page;
	205	+ }
	206	+
	207	+ public String getHname() {
	208	+ return hname;
	209	+ }
	210	+
	211	+ public void setHname(String hname) {
	212	+ this.hname = hname;
	213	+ }
	214	+
	215	+ public String getHage() {
	216	+ return hage;
	217	+ }
	218	+
	219	+ public void setHage(String hage) {
	220	+ this.hage = hage;
	221	+ }
	222	+
	223	+ public String getHprofessionType() {
	224	+ return hprofessionType;
	225	+ }
	226	+
	227	+ public void setHprofessionType(String hprofessionType) {
	228	+ this.hprofessionType = hprofessionType;
	229	+ }
	230	+
	231	+ public String getAddress() {
	232	+ return address;
	233	+ }
	234	+
	235	+ public void setAddress(String address) {
	236	+ this.address = address;
158	237	}
159	238
160	239	public String getHospitalName() {