jiangjiazhi / regional-platform

Authored by liquanyu over 4 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 29 additions and 12 deletions

...	...	@@ -278,7 +278,7 @@
278	278	pat.setEnable("2");
279	279	pat.setHospitalId(hospitalId);
280	280	pat.setSource(source);
281		- pat.setFmHospital(hospitalId);
	281	+ //pat.setFmHospital(hospitalId);
282	282	pat.setShortCode("1");
283	283	patientsService.addPatient(pat);
284	284	maternalDeliverModel.setParentId(uuid);
...	...	@@ -1454,6 +1454,12 @@
1454	1454	//2017年2月14日 14:15:53 王平说的分娩管理取消产程概念，有好多显示好多。
1455	1455	matDeliverQuery.setCreatedStart(patients.getLastMenses());
1456	1456	matDeliverQuery.setYn(YnEnums.YES.getId());
	1457	+
	1458	+ if (StringUtils.isNotEmpty(deliverQueryRequest.getMatDeliverId()))
	1459	+ {
	1460	+ matDeliverQuery.setId(deliverQueryRequest.getMatDeliverId());
	1461	+ }
	1462	+
1457	1463	// matDeliverQuery.setspatients.getFmDate();
1458	1464	List <MaternalDeliverModel> list = matDeliverService.query(matDeliverQuery);
1459	1465	MatDeliverListResult matDeliverListResult = new MatDeliverListResult();

...	...	@@ -97,17 +97,17 @@
97	97	//表示区域的
98	98	String hospital = autoMatchFacade.getHospitalId(userId);
99	99	String groupId = groupsFacade.findByCurrentUserId(hospital);
100		- if (StringUtils.isNotEmpty(groupId)) {
101		- OrganizationGroups gorp = groupsService.findById(groupId);
102		- if (gorp.getbType() != 1) {
103		- String parentId = examinationFacade.handHideBuild(postReviewRequest.getPid(), postReviewRequest.getParentId(), userId, 3);
104		- if (StringUtils.isEmpty(parentId)) {
105		- //打印日志
106		- }
107		- postReviewModel.setParentId(parentId);
108		- postReviewRequest.setParentId(parentId);
109		- }
110		- }
	100	+// if (StringUtils.isNotEmpty(groupId)) {
	101	+// OrganizationGroups gorp = groupsService.findById(groupId);
	102	+// if (gorp.getbType() != 1) {
	103	+// String parentId = examinationFacade.handHideBuild(postReviewRequest.getPid(), postReviewRequest.getParentId(), userId, 3);
	104	+// if (StringUtils.isEmpty(parentId)) {
	105	+// //打印日志
	106	+// }
	107	+// postReviewModel.setParentId(parentId);
	108	+// postReviewRequest.setParentId(parentId);
	109	+// }
	110	+// }
111	111	postReviewModel.setOperator(userId);
112	112	Patients patients = patientsService.findOnePatientById(postReviewRequest.getParentId());
113	113

...	...	@@ -27,6 +27,17 @@
27	27	//聊城东昌府住院号
28	28	private String zhuYuanNo;
29	29
	30	+
	31	+ private String matDeliverId;
	32	+
	33	+ public String getMatDeliverId() {
	34	+ return matDeliverId;
	35	+ }
	36	+
	37	+ public void setMatDeliverId(String matDeliverId) {
	38	+ this.matDeliverId = matDeliverId;
	39	+ }
	40	+
30	41	public String getZhuYuanNo() {
31	42	return zhuYuanNo;
32	43	}