liquanyu / regional-platform

Commit b733801b1d3ceb06fe1230e429b4e5773c3a3f05

Authored by yangfei almost 8 years ago

服务同步

Showing 4 changed files with 32 additions and 13 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/MatDeliverFollowService.java
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/facade/MatdeliverFollowFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatdeliverFollowListResult.java

...	...	@@ -31,7 +31,7 @@
31	31	}
32	32
33	33	public List<MatdeliverFollowModel> query(MatDeliverFollowQuery deliverQuery){
34		- return iMatdeliverFollowModelDao.queryMatdeliverFollowModel(deliverQuery.convertToQuery().addOrder(Sort.Direction.DESC, "updateDate"));
	34	+ return iMatdeliverFollowModelDao.queryMatdeliverFollowModel(deliverQuery.convertToQuery().addOrder(Sort.Direction.ASC, "updateDate"));
35	35	}
36	36	public void deleteOne(String id){
37	37	iMatdeliverFollowModelDao.deleteMatdeliverFollowModel(id);

...	...	@@ -1217,6 +1217,10 @@
1217	1217
1218	1218	for(MaternalDeliverModel deliverModel : maternalDeliverModelList){
1219	1219	MatdeliverFollowListResult matdeliverFollowListResult = patientsMap.get(deliverModel.getParentId());
	1220	+
	1221	+ //最后一次随访Id
	1222	+ matdeliverFollowListResult.setMatFollowId(deliverModel.getMatFollowId());
	1223	+
1220	1224	matdeliverFollowListResult.setId(deliverModel.getId());
1221	1225	//机构信息
1222	1226	Organization organization = organizationService.getOrganization(Integer.valueOf(deliverModel.getFmHospital()));

...	...	@@ -141,23 +141,25 @@
141	141
142	142	//如果修改的是最后一次随访记录，则进行同步修改分娩记录里的随访信息
143	143	if (matDeliverFollowAddRequest.getId().equals(maternalDeliverModel.getMatFollowId())) {
144		- //获取随访详情
145		- MatdeliverFollowModel matdeliverFollowModel = matDeliverFollowService.getOneMatDeliverFollow(matDeliverFollowAddRequest.getId());
146	144
147	145	//在分娩记录上记录随访部分信息
148		- maternalDeliverModel.setMatFollowId(matdeliverFollowModel.getId());
149		- maternalDeliverModel.setContactResult(matdeliverFollowModel.getContactResult());
150		- maternalDeliverModel.setContactReason(matdeliverFollowModel.getContactReason());
151		- maternalDeliverModel.setVisitAffirm(matdeliverFollowModel.getVisitAffirm());
152		- maternalDeliverModel.setVisitStatus(matdeliverFollowModel.getVisitStatus());
153		- maternalDeliverModel.setMakeType(matdeliverFollowModel.getMakeType());
154		- maternalDeliverModel.setVisitResult(matdeliverFollowModel.getVisitResult());
155		- maternalDeliverModel.setNextVisitDate(matdeliverFollowModel.getNextVisitDate());
156		- maternalDeliverModel.setIsClose(matdeliverFollowModel.getIsClose());
	146	+ maternalDeliverModel.setContactResult(matDeliverFollowAddRequest.getContactResult());
	147	+ maternalDeliverModel.setContactReason(matDeliverFollowAddRequest.getContactReason());
	148	+ maternalDeliverModel.setVisitAffirm(matDeliverFollowAddRequest.getVisitAffirm());
	149	+ maternalDeliverModel.setVisitStatus(matDeliverFollowAddRequest.getVisitStatus());
	150	+ maternalDeliverModel.setMakeType(matDeliverFollowAddRequest.getMakeType());
	151	+ maternalDeliverModel.setVisitResult(matDeliverFollowAddRequest.getVisitResult());
	152	+ maternalDeliverModel.setNextVisitDate(matDeliverFollowAddRequest.getNextVisitDate());
	153	+ maternalDeliverModel.setIsClose(matDeliverFollowAddRequest.getIsClose());
157	154	//修改分娩记录
158	155	matDeliverService.updateOne(maternalDeliverModel, maternalDeliverModel.getId());
	156	+ baseResponse.setObject(matDeliverFollowAddRequest.getId());
159	157	}
	158	+ //获取随访详情
	159	+ MatdeliverFollowModel matdeliverFollowModel = matDeliverFollowService.getOneMatDeliverFollow(matDeliverFollowAddRequest.getId());
	160	+
160	161	} else {//新增随访记录，并同步更新分娩记录里的随访信息
	162	+ matDeliverFollowAddRequest.setId(null);
161	163	//新增随访记录
162	164	MatdeliverFollowModel matdeliverFollowModel = matDeliverFollowService.addMatDeliverFollow(matDeliverFollowAddRequest.convertToDataModel());
163	165
164	166
...	...	@@ -179,7 +181,9 @@
179	181	}else{
180	182	log.error("分娩记录随访没有找到随访记录，传入随访id："+matDeliverFollowAddRequest.getDeliverId());
181	183	}
	184	+ baseResponse.setObject(matdeliverFollowModel.getId());
182	185	}
	186	+
183	187	baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
184	188	baseResponse.setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION);
185	189	return baseResponse;

...	...	@@ -14,8 +14,11 @@
14	14	private String patientId;
15	15
16	16	private String pid;
17		-
18	17	/**
	18	+ * 最后一次随访id
	19	+ */
	20	+ private String matFollowId;
	21	+ /**
19	22	* @discription 姓名
20	23	*/
21	24	private String name;
...	...	@@ -77,6 +80,14 @@
77	80	* 是否结案 1-未结案、2-已结案
78	81	*/
79	82	private Integer isClose;
	83	+
	84	+ public String getMatFollowId() {
	85	+ return matFollowId;
	86	+ }
	87	+
	88	+ public void setMatFollowId(String matFollowId) {
	89	+ this.matFollowId = matFollowId;
	90	+ }
80	91
81	92	public String getId() {
82	93	return id;