From a5846678b2a1f40a08e352cfaa9b4daaa1830242 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Mon, 6 May 2019 10:16:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E7=AB=A5=E9=AB=98=E5=8D=B1=E7=BB=A7?= =?UTF-8?q?=E6=89=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/BabyBookbuildingFacade.java | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index aa9314e..31aff07 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -2652,12 +2652,30 @@ public class BabyBookbuildingFacade { result.setDueType(babyModel.getDueType()); result.setMalformation(babyModel.getMalformation()); result.setApgarScore(JsonUtil.str2Obj(babyModel.getApgarScore(), Map.class)); - //母亲高危因素 - result.setmHighRiskReason2(queryRisk(babyModel.getmHighRiskReason(),false).getHighRisk()); + result.setFatherProfessionTypeId(babyModel.getFproTypeId()); result.setDueWeek(babyModel.getDueWeek()); result.setDueDay(babyModel.getDueDay()); + + + if (babyModel.getmHighRiskReason() == null || babyModel.getmHighRiskReason().size() != 0) + { + if (StringUtils.isNotEmpty(babyModel.getParentId())) + { + Patients pat = patientsService.findOnePatientById(babyModel.getParentId()); + + //母亲高危因素 + result.setmHighRiskReason2(queryRisk(pat.getRiskFactorId(),false).getHighRisk()); + //母亲高危因素 + result.setmHighRiskReason(queryRisk(pat.getRiskFactorId(),false).getHighRisk()); + } + } + else + { + //母亲高危因素 + result.setmHighRiskReason2(queryRisk(babyModel.getmHighRiskReason(),false).getHighRisk()); + } } else { patientsQuery.setPhoneOrCert(cardNo); List patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); -- 1.8.3.1