From 56453ac4097143b1b403800dbd269073a30718e3 Mon Sep 17 00:00:00 2001 From: hujiaqi Date: Fri, 13 Jan 2017 13:57:58 +0800 Subject: [PATCH] BUG --- .../platform/operate/web/facade/DischargeAbstractFacade.java | 12 ++++++++++-- .../lyms/platform/operate/web/facade/MatDeliverFacade.java | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java index f6d13a2..4aae683 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java @@ -117,7 +117,7 @@ public class DischargeAbstractFacade { typeList.add(1); typeList.add(3); patientsQuery.setBuildTypeNot(1); - patientsQuery.setHospitalId(autoMatchFacade.getHospitalId(dischargeAbstractSaveRequest.getOperatorId())); + // patientsQuery.setHospitalId(autoMatchFacade.getHospitalId(dischargeAbstractSaveRequest.getOperatorId())); patientsQuery.setTypeList(typeList); patientsQuery.setSort("lastMenses"); patientsQuery.setCardNo(StringUtils.isEmpty(dischargeAbstractSaveRequest.getCardNo()) ? null : dischargeAbstractSaveRequest.getCardNo()); @@ -144,7 +144,15 @@ public class DischargeAbstractFacade { return dischargeAbstractQueryResult; } - if (org.apache.commons.lang.StringUtils.isEmpty(patients.getFmHospital())) { + boolean flag = false; + for (Patients each : patientsList) { + if (org.apache.commons.lang.StringUtils.isNotEmpty(patients.getFmHospital())) { + patients = each; + flag = true; + break; + } + } + if (!flag) { dischargeAbstractQueryResult.setStatus("4"); dischargeAbstractQueryResult.setErrormsg("未已录入分娩信息不可进行出院小结"); return dischargeAbstractQueryResult; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 28431f9..a8f5e23 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -463,7 +463,7 @@ public class MatDeliverFacade { babyModel1.setDueWeek(day / 7); } babyModel1.setBabyHeight(baby.getBabyHeight()); - babyModel1.setBabyWeight(baby.getBabyWeight()); + babyModel1.setBabyWeight(com.lyms.platform.common.utils.StringUtils.cutBabyWeight(baby.getBabyWeight())); babyService.findAndModify(query.convertToQuery(), babyModel1); } babyList.add(babyModel); -- 1.8.3.1