diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java index ddedd72..ff60bf6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java @@ -16,6 +16,7 @@ import com.lyms.platform.operate.web.request.MatDeliverAddRequest; import com.lyms.platform.operate.web.result.AntExManagerResult; import com.lyms.platform.operate.web.result.CjStatisticsListResult; import com.lyms.platform.operate.web.result.CjStatisticsResult; +import com.lyms.platform.operate.web.result.HighScoreResult; import com.lyms.platform.operate.web.worker.AntExRecordWorker; import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.model.OrganizationQuery; @@ -939,7 +940,28 @@ public class AntExRecordFacade { antExAddRequest.setCurrentDueDate(DateUtil.getWeekDesc(patients.getLastMenses(), new Date()));//currentDueDate: "孕29周+4天" antExAddRequest.setParentId(patients.getId()); antExAddRequest.setPid(pid); + HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getPid(), true); + if (highScoreResult != null) { + List> list = highScoreResult.getHighRisk(); + List stringList = new ArrayList<>(); + List maps = new ArrayList<>(); + for (Map map : list) { + if (null != map.get("otherId")) { + maps.add(map); + } else { + stringList.add(map.get("id").toString()); + } + } + antExAddRequest.setHighriskDesc(highScoreResult.getHighriskDesc()); + //高危因素 + antExAddRequest.setRiskFactor(stringList); + //其他高危 + antExAddRequest.setOtherRisk(maps); + } + antExAddRequest.setRiskFactor(patients.getRiskFactorId()); + + antExAddRequest.setGongGao(fuh); antExAddRequest.setAbdominalCircumference(abdominalGirth); List list = JsonUtil.jkstr2Obj(fhr, List.class);