jiangjiazhi / regional-platform

Commit d05df80b85f0338af14f0ac4e8c53c5e27b371f3

Authored by shiyang about 3 years ago

Exists in master and in 6 other branches

核验信息update

Showing 6 changed files with 29 additions and 43 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AuthenticationService.java
platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AuthenticationController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AuthenticationFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java

...	...	@@ -68,9 +68,9 @@
68	68	}
69	69
70	70
71		- public Authentication queryById(String id) {
	71	+ public Authentication queryById(String pid) {
72	72	AuthenticationQuery tQuery = new AuthenticationQuery();
73		- tQuery.setId(id);
	73	+ tQuery.setPid(pid);
74	74	MongoQuery query = tQuery.convertToQuery();
75	75	return findOne(query.convertToMongoQuery());
76	76	}

...	...	@@ -438,18 +438,6 @@
438	438	//秦皇岛-有居住证填写字段
439	439	private String liveCardNo;
440	440
441		- /**
442		- * 建档身份信息核验
443		- */
444		- private Authentication verifyInfo;
445		-
446		- public Authentication getVerifyInfo() {
447		- return verifyInfo;
448		- }
449		-
450		- public void setVerifyInfo(Authentication verifyInfo) {
451		- this.verifyInfo = verifyInfo;
452		- }
453	441	public String getHprovinceId() {
454	442	return hprovinceId;
455	443	}

...	...	@@ -59,19 +59,6 @@
59	59	}
60	60
61	61	/**
62		- * 编辑数据获取/单个记录
63		- * @param id
64		- * @return
65		- */
66		- @ResponseBody
67		- @TokenRequired
68		- @RequestMapping(value = "/queryUpDate",method = RequestMethod.GET)
69		- public BaseResponse queryUpDate(String id) {
70		-
71		- return authenticationFacade.queryUpDate(id);
72		- }
73		-
74		- /**
75	62	* 管理列表
76	63	* @param ModelQuery
77	64	* @param request

...	...	@@ -146,26 +146,20 @@
146	146	}
147	147
148	148	/**
149		- * 编辑数据获取/单个记录
150		- * @param id
	149	+ * 编辑档案数据获取核验信息
	150	+ * @param pid
151	151	* @return
152	152	*/
153		- public BaseResponse queryUpDate(String id) {
154		- BaseObjectResponse br = new BaseObjectResponse();
	153	+ public Authentication queryUpDate(String pid) {
155	154	Authentication model = null;
156	155	try {
157		- model = authenticationService.queryById(id);
	156	+ model = authenticationService.queryById(pid);
158	157	} catch (Exception e) {
159	158	e.printStackTrace();
160		- br.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR);
161		- br.setErrormsg(ErrorCodeConstants.SYSTEM_ERROR_DESCRIPTION);
162		- return br;
	159	+ return model;
163	160	}
164	161
165		- br.setErrorcode(ErrorCodeConstants.SUCCESS);
166		- br.setData(model);
167		- br.setErrormsg("成功");
168		- return br;
	162	+ return model;
169	163	}
170	164
171	165	/**

...	...	@@ -361,7 +361,9 @@
361	361	/ 建档核验模块 /
362	362	//建档成功后保存核验结果
363	363	if(StringUtils.isNotEmpty(p.getId())){
364		- authenticationFacade.addOrUpDate(p.getVerifyInfo(), userId);
	364	+ yunRequest.getVerifyInfo().setPid(p.getId());
	365	+ yunRequest.getVerifyInfo().setVerifyDate(p.getBookbuildingDate());
	366	+ authenticationFacade.addOrUpDate(yunRequest.getVerifyInfo(), userId);
365	367	}
366	368	/------------/
367	369	/** 孕妇建档后把所有以前未使用的优惠券作废 */
...	...	@@ -1243,8 +1245,8 @@
1243	1245
1244	1246	/ 建档核验模块 /
1245	1247	//建档修改成功后修改核验结果
1246		- if(null != patient.getVerifyInfo() && StringUtils.isNotEmpty(patient.getVerifyInfo().getId())){
1247		- authenticationFacade.addOrUpDate(patient.getVerifyInfo(), userId);
	1248	+ if(null != yunRequest.getVerifyInfo() && StringUtils.isNotEmpty(yunRequest.getVerifyInfo().getId())){
	1249	+ authenticationFacade.addOrUpDate(yunRequest.getVerifyInfo(), userId);
1248	1250	}
1249	1251	/------------/
1250	1252	//如果当前是建档医院,那么需要修改其他非建档医院的数据
...	...	@@ -2047,7 +2049,6 @@
2047	2049	patient.setPatientVerifName(yunRequest.getPatientVerifName());
2048	2050	patient.setHusVerifType(yunRequest.getHusVerifType());
2049	2051	patient.setLiveCardNo(yunRequest.getLiveCardNo());
2050		- patient.setVerifyInfo(yunRequest.getVerifyInfo());
2051	2052
2052	2053	return patient;
2053	2054	}
...	...	@@ -2098,6 +2099,9 @@
2098	2099	BaseResponse baseResponse = patientServiceFacade.findPatientServiceList(id);
2099	2100	List<PatientSerResult> patientSerResults = (List<PatientSerResult>) baseResponse.getObject();
2100	2101	result.setPatientSerResults(patientSerResults);
	2102	+ //核验信息系
	2103	+ final Authentication authentication = authenticationFacade.queryUpDate(id);
	2104	+ result.setVerifyInfo(authentication);
2101	2105	BaseObjectResponse objectResponse = new BaseObjectResponse();
2102	2106	objectResponse.setData(result);
2103	2107	objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);

1	1	package com.lyms.platform.operate.web.result;
2	2
	3	+import com.lyms.platform.pojo.Authentication;
3	4	import com.lyms.platform.pojo.FilePathModel;
4	5
5	6	import java.util.List;
...	...	@@ -461,6 +462,18 @@
461	462	*/
462	463	private String villageRegister;
463	464
	465	+ /**
	466	+ * 建档身份信息核验
	467	+ */
	468	+ private Authentication verifyInfo;
	469	+
	470	+ public Authentication getVerifyInfo() {
	471	+ return verifyInfo;
	472	+ }
	473	+
	474	+ public void setVerifyInfo(Authentication verifyInfo) {
	475	+ this.verifyInfo = verifyInfo;
	476	+ }
464	477	public String getVillageRegister() {
465	478	return villageRegister;
466	479	}