Commit 8b7a326b0cfc4bde0c6d72f63186b168eaa19bb9

Authored by liquanyu
1 parent c7bdd3d1d0

update code

Showing 1 changed file with 14 additions and 4 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ 8b7a326
... ... @@ -939,9 +939,14 @@
939 939 map.put("mremark", patients.getMremark());
940 940  
941 941 //高危因素
  942 +// HighScoreResult highScoreResult = null;
  943 +// if (CollectionUtils.isNotEmpty(patients.getRiskFactorId())) {
  944 +// highScoreResult = ResolveUtils.queryRisk(patients.getRiskFactorId(), true, basicConfigService);
  945 +// }
  946 +
942 947 HighScoreResult highScoreResult = null;
943   - if (CollectionUtils.isNotEmpty(patients.getRiskFactorId())) {
944   - highScoreResult = ResolveUtils.queryRisk(patients.getRiskFactorId(), true, basicConfigService);
  948 + if (patients.getDueDate() != null) {
  949 + highScoreResult = antenatalExaminationFacade.getPatLastRiskByDate(patients.getPid(), false, patients.getLastMenses(), patients.getDueDate());
945 950 }
946 951  
947 952 map.put("riskFactor", ResolveUtils.queryHighRisk(highScoreResult));
948 953  
... ... @@ -1500,9 +1505,14 @@
1500 1505 map.put("dueDate", DateUtil.getyyyy_MM_dd(patients.getDueDate()));
1501 1506 map.put("mremark", patients.getMremark());
1502 1507 //高危因素
  1508 +// HighScoreResult highScoreResult = null;
  1509 +// if (CollectionUtils.isNotEmpty(patients.getRiskFactorId())) {
  1510 +// highScoreResult = ResolveUtils.queryRisk(patients.getRiskFactorId(), true, basicConfigService);
  1511 +// }
  1512 +
1503 1513 HighScoreResult highScoreResult = null;
1504   - if (CollectionUtils.isNotEmpty(patients.getRiskFactorId())) {
1505   - highScoreResult = ResolveUtils.queryRisk(patients.getRiskFactorId(), true, basicConfigService);
  1514 + if (patients.getFmDate() != null) {
  1515 + highScoreResult = antenatalExaminationFacade.getPatLastRiskByDate(patients.getPid(), false, patients.getLastMenses(), patients.getFmDate());
1506 1516 }
1507 1517 map.put("riskFactor", ResolveUtils.queryHighRisk(highScoreResult));
1508 1518 map.put("riskScore", patients.getRiskScore() == null || patients.getRiskScore() == 0 ? "" : UnitUtils.unitSplice(patients.getRiskScore(), UnitConstants.FEN));