diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PredictedStatisticsFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PredictedStatisticsFacade.java index e619293..736ee01 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PredictedStatisticsFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PredictedStatisticsFacade.java @@ -84,7 +84,9 @@ public class PredictedStatisticsFacade { PredictedStatisticsQueryModel predictedStatisticsQueryModel = new PredictedStatisticsQueryModel(); BeanUtils.copy(patients, predictedStatisticsQueryModel); predictedStatisticsQueryModel.setDueDate(DateUtil.getyyyy_MM_dd(patients.getDueDate())); - predictedStatisticsQueryModel.setRiskLevelResultModelList(getRiskLevel(patients.getRiskLevelId())); + List riskLevelResultModelList = getRiskLevel(patients.getRiskLevelId()); + predictedStatisticsQueryModel.setRiskLevelResultModelList(riskLevelResultModelList); + predictedStatisticsQueryModel.setRiskLevelNameString(getRiskLevelString(riskLevelResultModelList)); predictedStatisticsQueryModel.setRiskFactor(getRiskFactor(patients.getFirstRiskFactorId())); predictedStatisticsQueryModel.setLastCheckEmployee(getLastCheckEmployee(patients.getLastCheckEmployeeId())); predictedStatisticsQueryModel.setGestationalWeeks(getGestationalWeeks(patients.getLastMenses())); @@ -181,6 +183,20 @@ public class PredictedStatisticsFacade { return riskLevelResultModelList; } + private String getRiskLevelString(List riskLevelResultModelList) { + String str = ""; + if (riskLevelResultModelList != null && riskLevelResultModelList.size() > 0) { + for (RiskLevelResultModel riskLevelResultModel : riskLevelResultModelList) { + str += riskLevelResultModel.getName(); + str += ","; + } + } + if (str.length() > 0) { + return str.substring(0, str.length() - 1); + } + return ""; + } + private String getRiskFactor(List list) { String riskFactor = ""; if (list != null && list.size() > 0) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PredictedStatisticsQueryModel.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PredictedStatisticsQueryModel.java index 5879ce9..88c18a7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PredictedStatisticsQueryModel.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PredictedStatisticsQueryModel.java @@ -41,6 +41,15 @@ public class PredictedStatisticsQueryModel { */ // 需要计算 private List riskLevelResultModelList; + + /** + * @auther HuJiaqi + * @createTime 2016年12月01日 08时47分 + * @discription 风险等级拼接字符串 + */ + // 需要计算 + private String riskLevelNameString; + /** * @auther HuJiaqi * @createTime 2016年11月29日 17时06分 @@ -57,6 +66,14 @@ public class PredictedStatisticsQueryModel { private String pid; + public String getRiskLevelNameString() { + return riskLevelNameString; + } + + public void setRiskLevelNameString(String riskLevelNameString) { + this.riskLevelNameString = riskLevelNameString; + } + public String getPid() { return pid; }