jiangjiazhi / regional-platform

Authored by hujiaqi almost 9 years ago

Exists in master and in 7 other branches

Showing 2 changed files with 11 additions and 3 deletions

...	...	@@ -117,7 +117,7 @@
117	117	typeList.add(1);
118	118	typeList.add(3);
119	119	patientsQuery.setBuildTypeNot(1);
120		- patientsQuery.setHospitalId(autoMatchFacade.getHospitalId(dischargeAbstractSaveRequest.getOperatorId()));
	120	+ // patientsQuery.setHospitalId(autoMatchFacade.getHospitalId(dischargeAbstractSaveRequest.getOperatorId()));
121	121	patientsQuery.setTypeList(typeList);
122	122	patientsQuery.setSort("lastMenses");
123	123	patientsQuery.setCardNo(StringUtils.isEmpty(dischargeAbstractSaveRequest.getCardNo()) ? null : dischargeAbstractSaveRequest.getCardNo());
...	...	@@ -144,7 +144,15 @@
144	144	return dischargeAbstractQueryResult;
145	145	}
146	146
147		- if (org.apache.commons.lang.StringUtils.isEmpty(patients.getFmHospital())) {
	147	+ boolean flag = false;
	148	+ for (Patients each : patientsList) {
	149	+ if (org.apache.commons.lang.StringUtils.isNotEmpty(patients.getFmHospital())) {
	150	+ patients = each;
	151	+ flag = true;
	152	+ break;
	153	+ }
	154	+ }
	155	+ if (!flag) {
148	156	dischargeAbstractQueryResult.setStatus("4");
149	157	dischargeAbstractQueryResult.setErrormsg("未已录入分娩信息不可进行出院小结");
150	158	return dischargeAbstractQueryResult;

...	...	@@ -463,7 +463,7 @@
463	463	babyModel1.setDueWeek(day / 7);
464	464	}
465	465	babyModel1.setBabyHeight(baby.getBabyHeight());
466		- babyModel1.setBabyWeight(baby.getBabyWeight());
	466	+ babyModel1.setBabyWeight(com.lyms.platform.common.utils.StringUtils.cutBabyWeight(baby.getBabyWeight()));
467	467	babyService.findAndModify(query.convertToQuery(), babyModel1);
468	468	}
469	469	babyList.add(babyModel);