diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 92cad31..f0e80b9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -939,9 +939,14 @@ public class ViewFacade { map.put("mremark", patients.getMremark()); //高危因素 +// HighScoreResult highScoreResult = null; +// if (CollectionUtils.isNotEmpty(patients.getRiskFactorId())) { +// highScoreResult = ResolveUtils.queryRisk(patients.getRiskFactorId(), true, basicConfigService); +// } + HighScoreResult highScoreResult = null; - if (CollectionUtils.isNotEmpty(patients.getRiskFactorId())) { - highScoreResult = ResolveUtils.queryRisk(patients.getRiskFactorId(), true, basicConfigService); + if (patients.getDueDate() != null) { + highScoreResult = antenatalExaminationFacade.getPatLastRiskByDate(patients.getPid(), false, patients.getLastMenses(), patients.getDueDate()); } map.put("riskFactor", ResolveUtils.queryHighRisk(highScoreResult)); @@ -1500,9 +1505,14 @@ public class ViewFacade { map.put("dueDate", DateUtil.getyyyy_MM_dd(patients.getDueDate())); map.put("mremark", patients.getMremark()); //高危因素 +// HighScoreResult highScoreResult = null; +// if (CollectionUtils.isNotEmpty(patients.getRiskFactorId())) { +// highScoreResult = ResolveUtils.queryRisk(patients.getRiskFactorId(), true, basicConfigService); +// } + HighScoreResult highScoreResult = null; - if (CollectionUtils.isNotEmpty(patients.getRiskFactorId())) { - highScoreResult = ResolveUtils.queryRisk(patients.getRiskFactorId(), true, basicConfigService); + if (patients.getFmDate() != null) { + highScoreResult = antenatalExaminationFacade.getPatLastRiskByDate(patients.getPid(), false, patients.getLastMenses(), patients.getFmDate()); } map.put("riskFactor", ResolveUtils.queryHighRisk(highScoreResult)); map.put("riskScore", patients.getRiskScore() == null || patients.getRiskScore() == 0 ? "" : UnitUtils.unitSplice(patients.getRiskScore(), UnitConstants.FEN));