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);