diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java index 0861508..f55f9b1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java @@ -570,13 +570,16 @@ public class ApplyOrderFacade { } } HighScoreResult highScoreResult = antenatalExaminationFacade.queryRisk(orderModel.getrRisk(), true); - String str = ""; - if(StringUtils.isNotEmpty(highScoreResult.gethighRiskStr())){ - str=highScoreResult.gethighRiskStr()+","+orderModel.getOtherHighRisk(); - }else{ - str=orderModel.getOtherHighRisk(); + StringBuilder stringBuilder=new StringBuilder(highScoreResult.gethighRiskStr()); + if(StringUtils.isNotEmpty(orderModel.getOtherHighRisk())){ + if(stringBuilder.length()>0&&StringUtils.isNotEmpty(orderModel.getOtherHighRisk())){ + stringBuilder.append(","); + } + if(StringUtils.isNotEmpty(orderModel.getOtherHighRisk())){ + stringBuilder.append(orderModel.getOtherHighRisk()); + } } - applyOrderResult.setrRisk(str); + applyOrderResult.setrRisk(stringBuilder.toString()); applyOrderResult.setScore(orderModel.getScore()); applyOrderResult.setrLevel(highScoreResult.getLevelStr()); data.add(applyOrderResult);