Commit b6203a5919adfac2c5987cf3636fa85c6138d614

Authored by jiangjiazhi
1 parent 9ffc6e55f6

注释掉原来老产检劵验证

Showing 1 changed file with 8 additions and 1 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PredictedStatisticsFacade.java View file @ b6203a5
... ... @@ -96,7 +96,14 @@
96 96 predictedStatisticsQueryModel.setRiskLevelResultModelList(riskLevelResultModelList);
97 97 predictedStatisticsQueryModel.setRiskLevelNameString(getRiskLevelString(riskLevelResultModelList));
98 98  
99   - predictedStatisticsQueryModel.setRiskFactor(getRiskFactor(patients.getRiskFactorId())+patients.getoRiskFactor());
  99 + String risk =getRiskFactor(patients.getRiskFactorId());
  100 + if(StringUtils.isEmpty(risk)){
  101 + risk=(StringUtils.isEmpty(patients.getoRiskFactor())?"":patients.getoRiskFactor());
  102 + }else{
  103 + risk=risk+(StringUtils.isEmpty(patients.getoRiskFactor())?"":","+patients.getoRiskFactor());
  104 + }
  105 +
  106 + predictedStatisticsQueryModel.setRiskFactor(risk);
100 107 predictedStatisticsQueryModel.setLastCheckEmployee(getLastCheckEmployee(patients.getLastCheckEmployeeId()));
101 108 predictedStatisticsQueryModel.setGestationalWeeks(getGestationalWeeks(patients.getLastMenses(), patients.getType(), patients.getDueStatus()));
102 109 predictedStatisticsQueryModel.setRiskScore(null == patients.getRiskScore() ? "" : patients.getRiskScore().toString());