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 eee5480..8316aec 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 @@ -9,6 +9,7 @@ import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.operate.web.request.MatDeliverAddRequest; import com.lyms.platform.operate.web.request.MatDeliverQueryRequest; +import com.lyms.platform.operate.web.result.HighScoreResult; import com.lyms.platform.operate.web.result.MatDeliverListResult; import com.lyms.platform.operate.web.result.MaternalDeliverResult; import com.lyms.platform.permission.model.Organization; @@ -268,14 +269,15 @@ public class MatDeliverFacade { antExQuery.setParentId(patients.getId()); antExQuery.setYn(YnEnums.YES.getId()); List examinationModel = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery()); + HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getId()); try { String tTireNumber = ""; List data = new ArrayList(); if (CollectionUtils.isNotEmpty(examinationModel)) { if (null != examinationModel && StringUtils.isNotEmpty(examinationModel.get(0).getRiskFactor())) { tTireNumber = examinationModel.get(0).getTireNumber(); - List l = JsonUtil.toList(examinationModel.get(0).getRiskFactor(), List.class); - findBasicConfig(l,data); + /* List l = JsonUtil.toList(examinationModel.get(0).getRiskFactor(), List.class); + findBasicConfig(l,data);*/ } } else { AntExChuQuery antExChuQuery = new AntExChuQuery(); @@ -284,12 +286,13 @@ public class MatDeliverFacade { List antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery); if (CollectionUtils.isNotEmpty(antExChuModels)) { tTireNumber = antExChuModels.get(0).getTireNumber(); - List l = JsonUtil.toList(antExChuModels.get(0).getHighrisk(), List.class); - findBasicConfig(l,data); + /* List l = JsonUtil.toList(antExChuModels.get(0).getHighrisk(), List.class); + findBasicConfig(l,data);*/ } } - matDeliverListResult.setRiskFactor(data); + matDeliverListResult.setRiskFactor(highScoreResult.getHighRisk()); + matDeliverListResult.setRiskScore(highScoreResult.getScore()+""); matDeliverListResult.setTireNumber1(tTireNumber); } catch (Exception e) { }